Skip to content

Commit 7bc282a

Browse files
committed
Revert "Check for the correct exit code on cfail tests. Closes rust-lang#938"
This reverts commit c42401e.
1 parent 6eabe6f commit 7bc282a

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/test/compiletest/runtest.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ fn run_cfail_test(cx: cx, props: test_props, testfile: str) {
4141
fatal_procres("compile-fail test compiled successfully!", procres);
4242
}
4343

44-
check_correct_failure_status(procres);
4544
check_error_patterns(props, testfile, procres);
4645
}
4746

@@ -58,19 +57,16 @@ fn run_rfail_test(cx: cx, props: test_props, testfile: str) {
5857
fatal_procres("run-fail test isn't valgrind-clean!", procres);
5958
}
6059

61-
check_correct_failure_status(procres);
62-
check_error_patterns(props, testfile, procres);
63-
}
64-
65-
fn check_correct_failure_status(procres: procres) {
6660
// The value the rust runtime returns on failure
6761
const rust_err: int = 101;
6862
if procres.status != rust_err {
6963
fatal_procres(
70-
#fmt("failure produced the wrong error code: %d",
64+
#fmt("run-fail test produced the wrong error code: %d",
7165
procres.status),
7266
procres);
7367
}
68+
69+
check_error_patterns(props, testfile, procres);
7470
}
7571

7672
fn run_rpass_test(cx: cx, props: test_props, testfile: str) {

0 commit comments

Comments
 (0)