Skip to content

Commit 96c6f57

Browse files
committed
Revert "Use pipes in compiletest"
This reverts commit 2d15b6e. This seems like a likely candidate for causing the recent lock_and_signal failures. I'll revert it for now to see if it fixes it and hopefully nail down the problem better.
1 parent fec749d commit 96c6f57

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

src/compiletest/compiletest.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ import task;
88
import core::result;
99
import result::{ok, err};
1010

11+
import comm::port;
12+
import comm::chan;
13+
import comm::send;
14+
import comm::recv;
15+
1116
import common::config;
1217
import common::mode_run_pass;
1318
import common::mode_run_fail;

src/compiletest/procsrv.rs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import run::spawn_process;
22
import io::{writer_util, reader_util};
33
import libc::{c_int, pid_t};
44

5-
import pipes::chan;
6-
75
export run;
86

97
#[cfg(target_os = "win32")]
@@ -60,30 +58,29 @@ fn run(lib_path: ~str,
6058

6159

6260
writeclose(pipe_in.out, input);
63-
let p = pipes::port_set();
64-
let ch = p.chan();
61+
let p = comm::port();
62+
let ch = comm::chan(p);
6563
do task::spawn_sched(task::single_threaded) {
6664
let errput = readclose(pipe_err.in);
67-
ch.send((2, errput));
65+
comm::send(ch, (2, errput));
6866
}
69-
let ch = p.chan();
7067
do task::spawn_sched(task::single_threaded) {
7168
let output = readclose(pipe_out.in);
72-
ch.send((1, output));
69+
comm::send(ch, (1, output));
7370
}
7471
let status = run::waitpid(pid);
7572
let mut errs = ~"";
7673
let mut outs = ~"";
7774
let mut count = 2;
7875
while count > 0 {
79-
alt p.recv() {
80-
(1, s) {
81-
outs = s;
82-
}
83-
(2, s) {
84-
errs = s;
85-
}
86-
_ { fail }
76+
let stream = comm::recv(p);
77+
alt check stream {
78+
(1, s) {
79+
outs = s;
80+
}
81+
(2, s) {
82+
errs = s;
83+
}
8784
};
8885
count -= 1;
8986
};

0 commit comments

Comments
 (0)