Another round of test fixes and merge conflicts

1 files changed, 19 insertions, 8 deletions

diff --git a/src/libstd/run.rs b/src/libstd/run.rs
index 650ef491a3b..615ba60e066 100644
--- a/src/libstd/run.rs
+++ b/src/libstd/run.rs
@@ -219,16 +219,27 @@ impl Process {
         let (p, ch) = stream();
         let ch = SharedChan::new(ch);
         let ch_clone = ch.clone();
-        do task::spawn_sched(task::SingleThreaded) {
-            match error.take() {
-                Some(ref mut e) => ch.send((2, e.read_to_end())),
-                None => ch.send((2, ~[]))
+
+        // FIXME(#910, #8674): right now I/O is incredibly brittle when it comes
+        //      to linked failure, so these tasks must be spawn so they're not
+        //      affected by linked failure. If these are removed, then the
+        //      runtime may never exit because linked failure will cause some
+        //      SchedHandle structures to not get destroyed, meaning that
+        //      there's always an async watcher available.
+        do task::spawn_unlinked {
+            do io::ignore_io_error {
+                match error.take() {
+                    Some(ref mut e) => ch.send((2, e.read_to_end())),
+                    None => ch.send((2, ~[]))
+                }
             }
         }
-        do task::spawn_sched(task::SingleThreaded) {
-            match output.take() {
-                Some(ref mut e) => ch_clone.send((1, e.read_to_end())),
-                None => ch_clone.send((1, ~[]))
+        do task::spawn_unlinked {
+            do io::ignore_io_error {
+                match output.take() {
+                    Some(ref mut e) => ch_clone.send((1, e.read_to_end())),
+                    None => ch_clone.send((1, ~[]))
+                }
             }
         }