add run_fail_assert_exit_code as a helper

rust-lang · Mar 9, 2024 · 3bb1abb · 3bb1abb
1 parent d3a307e
commit 3bb1abb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 24 deletions.
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -76,6 +76,18 @@ impl RustcInvocationBuilder {
         }
         output
     }
+
+    #[track_caller]
+    pub fn run_fail_assert_exit_code(&mut self, code: i32) -> Output {
+        let caller_location = std::panic::Location::caller();
+        let caller_line_number = caller_location.line();
+
+        let output = self.cmd.output().unwrap();
+        if output.status.code().unwrap() != code {
+            handle_failed_output(&format!("{:#?}", self.cmd), output, caller_line_number);
+        }
+        output
+    }
 }
 
 #[derive(Debug)]

diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-support/src/rustdoc.rs
@@ -57,6 +57,18 @@ impl RustdocInvocationBuilder {
         }
         output
     }
+
+    #[track_caller]
+    pub fn run_fail_assert_exit_code(&mut self, code: i32) -> Output {
+        let caller_location = std::panic::Location::caller();
+        let caller_line_number = caller_location.line();
+
+        let output = self.cmd.output().unwrap();
+        if output.status.code().unwrap() != code {
+            handle_failed_output(&format!("{:#?}", self.cmd), output, caller_line_number);
+        }
+        output
+    }
 }
 
 fn setup_common_rustdoc_build_cmd() -> Command {

diff --git a/tests/run-make/exit-code/rmake.rs b/tests/run-make/exit-code/rmake.rs
@@ -7,47 +7,35 @@ fn main() {
         .arg("success.rs")
         .run();
 
-    assert_eq!(rustc()
+    rustc()
         .arg("--invalid-arg-foo")
-        .run_fail()
-        .status
-        .code().unwrap(), 1);
+        .run_fail_assert_exit_code(1);
 
-    assert_eq!(rustc()
+    rustc()
         .arg("compile-error.rs")
-        .run_fail()
-        .status
-        .code().unwrap(), 1);
+        .run_fail_assert_exit_code(1);
 
-    assert_eq!(rustc()
+    rustc()
         .env("RUSTC_ICE", "0")
         .arg("-Ztreat-err-as-bug")
         .arg("compile-error.rs")
-        .run_fail()
-        .status
-        .code().unwrap(), 101);
+        .run_fail_assert_exit_code(101);
 
     rustdoc()
         .arg("-o")
         .arg_file(&tempdir().join("exit-code"))
         .arg("success.rs")
         .run();
 
-    assert_eq!(rustdoc()
+    rustdoc()
         .arg("--invalid-arg-foo")
-        .run_fail()
-        .status
-        .code().unwrap(), 1);
+        .run_fail_assert_exit_code(1);
 
-    assert_eq!(rustdoc()
+    rustdoc()
         .arg("compile-error.rs")
-        .run_fail()
-        .status
-        .code().unwrap(), 1);
+        .run_fail_assert_exit_code(1);
 
-    assert_eq!(rustdoc()
+    rustdoc()
         .arg("lint-failure.rs")
-        .run_fail()
-        .status
-        .code().unwrap(), 1);
+        .run_fail_assert_exit_code(1);
 }