diff options
| author | bors <bors@rust-lang.org> | 2013-08-29 16:45:49 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-29 16:45:49 -0700 |
| commit | 5ef8cdb8fd1f34fd3ab51ceba7ec286cedc349d8 (patch) | |
| tree | c2bf9ab63ff4c20dbe5a43660fdd919ae822c9b9 /src/test | |
| parent | 698873e3a829d764b451f657178403c704044721 (diff) | |
| parent | 3c5a43e5b6f857c71c6f66dbbd640a47d34a0e7e (diff) | |
| download | rust-5ef8cdb8fd1f34fd3ab51ceba7ec286cedc349d8.tar.gz rust-5ef8cdb8fd1f34fd3ab51ceba7ec286cedc349d8.zip | |
auto merge of #8866 : brson/rust/rvstdrun, r=alexcrichton
...ing, r=brson" This reverts commit b8d1fa399402c71331aefd634d710004e00b73a6, reversing changes made to f22b4b169854c8a4ba86c16ee43327d6bcf94562. Conflicts: mk/rt.mk src/libuv This caused a big performance regression on the windows bots and possibly some unexpected segfaults in pretty-printing tests.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/core-run-destroy.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs index 90e63fc977d..2551d1a5cfc 100644 --- a/src/test/run-pass/core-run-destroy.rs +++ b/src/test/run-pass/core-run-destroy.rs @@ -22,15 +22,13 @@ use std::str; #[test] fn test_destroy_once() { - let p = run::Process::new("echo", [], run::ProcessOptions::new()); - let mut p = p.unwrap(); + let mut p = run::Process::new("echo", [], run::ProcessOptions::new()); p.destroy(); // this shouldn't crash (and nor should the destructor) } #[test] fn test_destroy_twice() { - let p = run::Process::new("echo", [], run::ProcessOptions::new()); - let mut p = p.unwrap(); + let mut p = run::Process::new("echo", [], run::ProcessOptions::new()); p.destroy(); // this shouldnt crash... p.destroy(); // ...and nor should this (and nor should the destructor) } @@ -76,8 +74,7 @@ fn test_destroy_actually_kills(force: bool) { } // this process will stay alive indefinitely trying to read from stdin - let p = run::Process::new(BLOCK_COMMAND, [], run::ProcessOptions::new()); - let mut p = p.unwrap(); + let mut p = run::Process::new(BLOCK_COMMAND, [], run::ProcessOptions::new()); assert!(process_exists(p.get_id())); |
