---

yaml
---
r: 14198
b: refs/heads/try
c: 9fde2a5
h: refs/heads/master
v: v3

Author: tedhorst

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: a7a1152db5b7f8cde82eaf3d994f93f024f4e803
+refs/heads/try: 9fde2a54f47a84f34add6994c6c90100d83247fb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/compiletest/procsrv.rs

@@ -52,10 +52,33 @@ fn run(lib_path: str, prog: str, args: [str],
 
 
     writeclose(pipe_in.out, input);
-    let errput = readclose(pipe_err.in);
-    let output = readclose(pipe_out.in);
+    let p = comm::port();
+    let ch = comm::chan(p);
+    task::spawn_sched(1u) {||
+        let errput = readclose(pipe_err.in);
+        comm::send(ch, (2, errput));
+    };
+    task::spawn_sched(1u) {||
+        let output = readclose(pipe_out.in);
+        comm::send(ch, (1, output));
+    };
     let status = run::waitpid(pid);
-    ret {status: status, out: output, err: errput};
+    let errs = "";
+    let outs = "";
+    let count = 2;
+    while count > 0 {
+        let stream = comm::recv(p);
+        alt stream {
+            (1, s) {
+                outs = s;
+            }
+            (2, s) {
+                errs = s;
+            }
+        };
+        count -= 1;
+    };
+    ret {status: status, out: outs, err: errs};
 }
 
 fn writeclose(fd: fd_t, s: option<str>) {