---

yaml
---
r: 5365
b: refs/heads/master
c: 7bc282a
h: refs/heads/master
i:
  5363: b6670c4
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eabe6f3f4b80e8c96286e266db64dfd0e576963
+refs/heads/master: 7bc282a561dca0d9e0a910cc31cd2280020c082a

trunk/src/test/compiletest/runtest.rs

@@ -41,7 +41,6 @@ fn run_cfail_test(cx: cx, props: test_props, testfile: str) {
         fatal_procres("compile-fail test compiled successfully!", procres);
     }
 
-    check_correct_failure_status(procres);
     check_error_patterns(props, testfile, procres);
 }
 
@@ -58,19 +57,16 @@ fn run_rfail_test(cx: cx, props: test_props, testfile: str) {
         fatal_procres("run-fail test isn't valgrind-clean!", procres);
     }
 
-    check_correct_failure_status(procres);
-    check_error_patterns(props, testfile, procres);
-}
-
-fn check_correct_failure_status(procres: procres) {
     // The value the rust runtime returns on failure
     const rust_err: int = 101;
     if procres.status != rust_err {
         fatal_procres(
-            #fmt("failure produced the wrong error code: %d",
+            #fmt("run-fail test produced the wrong error code: %d",
                  procres.status),
             procres);
     }
+
+    check_error_patterns(props, testfile, procres);
 }
 
 fn run_rpass_test(cx: cx, props: test_props, testfile: str) {