Skip to content

Commit 4d63c78

Browse files
committed
---
yaml --- r: 30530 b: refs/heads/incoming c: 8a8ca18 h: refs/heads/master v: v3
1 parent 0cd773f commit 4d63c78

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 43924f1f9ffea44390e178a97bef283cb7efbee1
9+
refs/heads/incoming: 8a8ca1863dd91728d0e09be9775b83e4fd39a834
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/task.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,10 +2425,14 @@ fn test_tls_cleanup_on_failure() unsafe {
24252425

24262426
#[test]
24272427
fn test_sched_thread_per_core() {
2428-
let cores = rustrt::rust_num_threads();
2429-
let mut reported_threads = 0u;
2428+
let (chan, port) = pipes::stream();
2429+
24302430
do spawn_sched(ThreadPerCore) {
2431-
reported_threads = rustrt::sched_threads();
2431+
let cores = rustrt::rust_num_threads();
2432+
let reported_threads = rustrt::sched_threads();
2433+
assert(cores as uint == reported_threads as uint);
2434+
chan.send(());
24322435
}
2433-
assert(cores == reported_threads);
2436+
2437+
port.recv();
24342438
}

0 commit comments

Comments
 (0)