Auto merge of rust-lang#9307 - ijackson:exit-code-string, r=joshtriplett

tests: Tolerate "exit status" in error messages "exit code" is wrong terminology on Unix. I am trying to fix this in Rust stdlib in rust-lang/rust#83462 but this currently breaks the cargo test suite. See that MR for full explanation of the change.
ehuss · Apr 6, 2021 · 6ce927a · 6ce927a
1 parent e668552
commit 6ce927a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
@@ -38,7 +38,7 @@ fn custom_build_script_failed() {
 [ERROR] failed to run custom build command for `foo v0.5.0 ([CWD])`
 
 Caused by:
-  process didn't exit successfully: `[..]/build-script-build` (exit code: 101)",
+  process didn't exit successfully: `[..]/build-script-build` (exit [..]: 101)",
         )
         .run();
 }

diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs
@@ -118,7 +118,7 @@ fn exit_code() {
     );
     if !cfg!(unix) {
         output.push_str(
-            "[ERROR] process didn't exit successfully: `target[..]foo[..]` (exit code: 2)",
+            "[ERROR] process didn't exit successfully: `target[..]foo[..]` (exit [..]: 2)",
         );
     }
     p.cargo("run").with_status(2).with_stderr(output).run();
@@ -140,7 +140,7 @@ fn exit_code_verbose() {
     );
     if !cfg!(unix) {
         output.push_str(
-            "[ERROR] process didn't exit successfully: `target[..]foo[..]` (exit code: 2)",
+            "[ERROR] process didn't exit successfully: `target[..]foo[..]` (exit [..]: 2)",
         );
     }