Skip to content

Commit 0e40a30

Browse files
committed
---
yaml --- r: 82535 b: refs/heads/auto c: bc34a34 h: refs/heads/master i: 82533: dcc9d9c 82531: 87f2dd9 82527: 4d3785a v: v3
1 parent cd0cc60 commit 0e40a30

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: cd2da7d5f37161ae1d8c3b1481c79275cf346999
16+
refs/heads/auto: bc34a3416bfc56e8daf8015fa10424a8f64f5e91
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)