Skip to content

Commit b261868

Browse files
committed
---
yaml --- r: 145354 b: refs/heads/try2 c: bc34a34 h: refs/heads/master v: v3
1 parent ea1430e commit b261868

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: cd2da7d5f37161ae1d8c3b1481c79275cf346999
8+
refs/heads/try2: bc34a3416bfc56e8daf8015fa10424a8f64f5e91
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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