---

yaml
---
r: 31481
b: refs/heads/dist-snap
c: 5312704
h: refs/heads/master
i:
  31479: 66e2419
v: v3

Author: bblum

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: afe77575259939dbaebb2b02ae4ebab628c611bf
+refs/heads/dist-snap: 5312704904df3a088581bbe75c1f19a04671c673
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/task.rs

@@ -1219,7 +1219,7 @@ fn test_spawn_unlinked_unsup_no_fail_down() { // grandchild sends on a port
     do spawn_unlinked {
         do spawn_unlinked {
             // Give middle task a chance to fail-but-not-kill-us.
-            for iter::repeat(8192) { task::yield(); }
+            for iter::repeat(128) { task::yield(); }
             comm::send(ch, ()); // If killed first, grandparent hangs.
         }
         fail; // Shouldn't kill either (grand)parent or (grand)child.
@@ -1234,7 +1234,7 @@ fn test_spawn_unlinked_unsup_no_fail_up() { // child unlinked fails
 fn test_spawn_unlinked_sup_no_fail_up() { // child unlinked fails
     do spawn_supervised { fail; }
     // Give child a chance to fail-but-not-kill-us.
-    for iter::repeat(8192) { task::yield(); }
+    for iter::repeat(128) { task::yield(); }
 }
 #[test] #[should_fail] #[ignore(cfg(windows))]
 fn test_spawn_unlinked_sup_fail_down() {
@@ -1304,7 +1304,7 @@ fn test_spawn_failure_propagate_grandchild() {
             loop { task::yield(); }
         }
     }
-    for iter::repeat(8192) { task::yield(); }
+    for iter::repeat(128) { task::yield(); }
     fail;
 }
 
@@ -1316,7 +1316,7 @@ fn test_spawn_failure_propagate_secondborn() {
             loop { task::yield(); }
         }
     }
-    for iter::repeat(8192) { task::yield(); }
+    for iter::repeat(128) { task::yield(); }
     fail;
 }
 
@@ -1328,7 +1328,7 @@ fn test_spawn_failure_propagate_nephew_or_niece() {
             loop { task::yield(); }
         }
     }
-    for iter::repeat(8192) { task::yield(); }
+    for iter::repeat(128) { task::yield(); }
     fail;
 }
 
@@ -1340,7 +1340,7 @@ fn test_spawn_linked_sup_propagate_sibling() {
             loop { task::yield(); }
         }
     }
-    for iter::repeat(8192) { task::yield(); }
+    for iter::repeat(128) { task::yield(); }
     fail;
 }
 
@@ -1741,7 +1741,7 @@ fn test_atomically_nested() {
 fn test_child_doesnt_ref_parent() {
     // If the child refcounts the parent task, this will stack overflow when
     // climbing the task tree to dereference each ancestor. (See #1789)
-    const generations: uint = 8192;
+    const generations: uint = 128;
     fn child_no(x: uint) -> fn~() {
         ret || {
             if x < generations {