test: Fix run-fail testing and bring tests up to date

A typo in the Makefile was causing these to not run. Happily, a lot of these
tests pass, so un-xfailed.

10 files changed, 4 insertions, 22 deletions

diff --git a/mk/tests.mk b/mk/tests.mk
index 6aab30041d4..8bdb9318ba4 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -91,9 +91,9 @@ TEST_RFAIL_EXES_STAGE2 = \
 TEST_RFAIL_OUTS_STAGE0 = \
   $(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out)
 TEST_RFAIL_OUTS_STAGE1 = \
-  $(TEST_RFAIL_EXES_STAGE0:.stage1$(X)=.stage1.out)
+  $(TEST_RFAIL_EXES_STAGE1:.stage1$(X)=.stage1.out)
 TEST_RFAIL_OUTS_STAGE2 = \
-  $(TEST_RFAIL_EXES_STAGE0:.stage2$(X)=.stage2.out)
+  $(TEST_RFAIL_EXES_STAGE2:.stage2$(X)=.stage2.out)
 
 
 TEST_CFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC))
diff --git a/src/test/run-fail/explicit-fail.rs b/src/test/run-fail/explicit-fail.rs
index 373874637e7..cb0e37e5ce8 100644
--- a/src/test/run-fail/explicit-fail.rs
+++ b/src/test/run-fail/explicit-fail.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern:explicit
 
 fn main() {
diff --git a/src/test/run-fail/expr-alt-fail.rs b/src/test/run-fail/expr-alt-fail.rs
index 33d09cce8c0..782e4ee32d0 100644
--- a/src/test/run-fail/expr-alt-fail.rs
+++ b/src/test/run-fail/expr-alt-fail.rs
@@ -1,4 +1,3 @@
-// xfail-stage0
 // error-pattern:explicit failure
 
 fn main() {
diff --git a/src/test/run-fail/expr-if-fail.rs b/src/test/run-fail/expr-if-fail.rs
index 2a4f6d27a4c..741a8f0dcf9 100644
--- a/src/test/run-fail/expr-if-fail.rs
+++ b/src/test/run-fail/expr-if-fail.rs
@@ -1,4 +1,3 @@
-// xfail-stage0
 // error-pattern:explicit failure
 
 fn main() {
diff --git a/src/test/run-fail/fail.rs b/src/test/run-fail/fail.rs
index 50269869084..20dd3af8781 100644
--- a/src/test/run-fail/fail.rs
+++ b/src/test/run-fail/fail.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern:1 == 2
 
 fn main() {
diff --git a/src/test/run-fail/non-exhaustive-match.rs b/src/test/run-fail/non-exhaustive-match.rs
index 0600f0c5d4c..eb533ef3077 100644
--- a/src/test/run-fail/non-exhaustive-match.rs
+++ b/src/test/run-fail/non-exhaustive-match.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:non-exhaustive match failure
diff --git a/src/test/run-fail/str-overrun.rs b/src/test/run-fail/str-overrun.rs
index 078c7493825..c6d11ceb9d3 100644
--- a/src/test/run-fail/str-overrun.rs
+++ b/src/test/run-fail/str-overrun.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:bounds check
diff --git a/src/test/run-fail/trivial-message2.rs b/src/test/run-fail/trivial-message2.rs
index d39c016e6f0..09bd04f95f1 100644
--- a/src/test/run-fail/trivial-message2.rs
+++ b/src/test/run-fail/trivial-message2.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 /*
   This program should hang on the r <- po line.
  */
diff --git a/src/test/run-fail/vec-overrun.rs b/src/test/run-fail/vec-overrun.rs
index a6d782809c7..6d9de022275 100644
--- a/src/test/run-fail/vec-overrun.rs
+++ b/src/test/run-fail/vec-overrun.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:bounds check
diff --git a/src/test/run-fail/vec-underrun.rs b/src/test/run-fail/vec-underrun.rs
index ac691bb85ae..a3e69bb8669 100644
--- a/src/test/run-fail/vec-underrun.rs
+++ b/src/test/run-fail/vec-underrun.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:bounds check