Skip to content

Commit 33e913d

Browse files
committed
auto merge of #9412 : thestinger/rust/no_starve_xfail, r=cmr
this is still broken on the bsd builder, perhaps because it has 1 core
2 parents cd2da7d + bc34a34 commit 33e913d

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/libstd/rt/sched.rs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,25 +1212,22 @@ mod test {
12121212
}
12131213
}
12141214

1215-
#[test]
1215+
// FIXME: #9407: xfail-test
12161216
fn dont_starve_1() {
12171217
use rt::comm::oneshot;
12181218
use unstable::running_on_valgrind;
12191219

1220-
// FIXME: #9407: should work while serialized on valgrind
1221-
if !running_on_valgrind() {
1222-
do stress_factor().times {
1223-
do run_in_mt_newsched_task {
1224-
let (port, chan) = oneshot();
1225-
1226-
// This task should not be able to starve the sender;
1227-
// The sender should get stolen to another thread.
1228-
do spawntask {
1229-
while !port.peek() { }
1230-
}
1220+
do stress_factor().times {
1221+
do run_in_mt_newsched_task {
1222+
let (port, chan) = oneshot();
12311223

1232-
chan.send(());
1224+
// This task should not be able to starve the sender;
1225+
// The sender should get stolen to another thread.
1226+
do spawntask {
1227+
while !port.peek() { }
12331228
}
1229+
1230+
chan.send(());
12341231
}
12351232
}
12361233
}

0 commit comments

Comments
 (0)