about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-08-01 16:19:37 -0700
committerbors <bors@rust-lang.org>2013-08-01 16:19:37 -0700
commitd346f1a40e0d0ebe24e60d418f304641fc26f9b0 (patch)
tree8b484ea7b0fee935f64ddb0529ff32996b806636
parenteb5743bfb2f634d2f5c8ef484a04e63d1a24cef6 (diff)
parent1d256ba6e83c9f779e8c9a5346eb5df95ef589b2 (diff)
downloadrust-d346f1a40e0d0ebe24e60d418f304641fc26f9b0.tar.gz
rust-d346f1a40e0d0ebe24e60d418f304641fc26f9b0.zip
auto merge of #8172 : brson/rust/nomorestack, r=pcwalton
The new scheduler does not yet implement split stacks
-rw-r--r--src/test/run-fail/morestack1.rs1
-rw-r--r--src/test/run-fail/morestack2.rs1
-rw-r--r--src/test/run-fail/morestack3.rs1
-rw-r--r--src/test/run-fail/morestack4.rs1
-rw-r--r--src/test/run-pass/morestack1.rs2
-rw-r--r--src/test/run-pass/morestack2.rs2
-rw-r--r--src/test/run-pass/morestack3.rs2
-rw-r--r--src/test/run-pass/morestack4.rs2
-rw-r--r--src/test/run-pass/morestack5.rs2
-rw-r--r--src/test/run-pass/morestack6.rs2
10 files changed, 16 insertions, 0 deletions
diff --git a/src/test/run-fail/morestack1.rs b/src/test/run-fail/morestack1.rs
index f4faac0b2ab..d3e3be6c2ca 100644
--- a/src/test/run-fail/morestack1.rs
+++ b/src/test/run-fail/morestack1.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
 // error-pattern:fail
 fn getbig(i: int) {
     if i != 0 {
diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs
index c3230965ece..bf03695855e 100644
--- a/src/test/run-fail/morestack2.rs
+++ b/src/test/run-fail/morestack2.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
 // error-pattern:explicit failure
 
 // This time we're testing that the stack limits are restored
diff --git a/src/test/run-fail/morestack3.rs b/src/test/run-fail/morestack3.rs
index 4e059c5bd3c..4a8586fd19f 100644
--- a/src/test/run-fail/morestack3.rs
+++ b/src/test/run-fail/morestack3.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
 // error-pattern:explicit failure
 
 // Just testing unwinding
diff --git a/src/test/run-fail/morestack4.rs b/src/test/run-fail/morestack4.rs
index db46438ea3c..b6fe25bc7a2 100644
--- a/src/test/run-fail/morestack4.rs
+++ b/src/test/run-fail/morestack4.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
 // error-pattern:explicit failure
 
 // Just testing unwinding
diff --git a/src/test/run-pass/morestack1.rs b/src/test/run-pass/morestack1.rs
index 775bbc883f6..e1a5c8c42c0 100644
--- a/src/test/run-pass/morestack1.rs
+++ b/src/test/run-pass/morestack1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
+
 fn getbig(i: int) {
     if i != 0 {
         getbig(i - 1);
diff --git a/src/test/run-pass/morestack2.rs b/src/test/run-pass/morestack2.rs
index e3e2a788230..cf42af0e865 100644
--- a/src/test/run-pass/morestack2.rs
+++ b/src/test/run-pass/morestack2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
+
 fn getbig(i: int) -> int {
     let m = if i >= 0 {
         let j = getbig(i - 1);
diff --git a/src/test/run-pass/morestack3.rs b/src/test/run-pass/morestack3.rs
index a21b13743fe..b24afa151e2 100644
--- a/src/test/run-pass/morestack3.rs
+++ b/src/test/run-pass/morestack3.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
+
 // Here we're testing that all of the argument registers, argument
 // stack slots, and return value are preserved across split stacks.
 fn getbig(a0: int,
diff --git a/src/test/run-pass/morestack4.rs b/src/test/run-pass/morestack4.rs
index 82d4279ed2b..bd4f5163b03 100644
--- a/src/test/run-pass/morestack4.rs
+++ b/src/test/run-pass/morestack4.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
+
 // This is testing for stack frames greater than 256 bytes,
 // for which function prologues are generated differently
 
diff --git a/src/test/run-pass/morestack5.rs b/src/test/run-pass/morestack5.rs
index 7f947e332c0..ec8ed778409 100644
--- a/src/test/run-pass/morestack5.rs
+++ b/src/test/run-pass/morestack5.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
+
 // This test will call __morestack with various minimum stack sizes
 
 extern mod extra;
diff --git a/src/test/run-pass/morestack6.rs b/src/test/run-pass/morestack6.rs
index bfb68d296c1..a4a1f4bb28f 100644
--- a/src/test/run-pass/morestack6.rs
+++ b/src/test/run-pass/morestack6.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test newsched transition
+
 // This test attempts to force the dynamic linker to resolve
 // external symbols as close to the red zone as possible.