putting the failure_status code in header.rs

2 files changed, 4 insertions, 6 deletions

diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index f63b5997a4a..0212ff45eec 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -585,6 +585,9 @@ impl TestProps {
                 _ => 1,
             };
         }
+        if self.should_ice {
+            self.failure_status = 101;
+        }
 
         for key in &["RUST_TEST_NOCAPTURE", "RUST_TEST_THREADS"] {
             if let Ok(val) = env::var(key) {
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 68812bd94eb..fd250d6c7a6 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -434,12 +434,7 @@ impl<'test> TestCx<'test> {
     }
 
     fn check_correct_failure_status(&self, proc_res: &ProcRes) {
-        let expected_status =
-            if self.props.should_ice {
-                Some(101)
-            } else {
-                Some(self.props.failure_status)
-            };
+        let expected_status = Some(self.props.failure_status);
         let received_status = proc_res.status.code();
 
         if expected_status != received_status {