Merge pull request #88 from oli-obk/version_bump

Use display printing for io error

Author: oli-obk

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ui_test"
-version = "0.11.5"
+version = "0.11.6"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A test framework for testing rustc diagnostics output"

Cargo.toml

@@ -521,7 +521,7 @@ fn run_test(
 
     let output = cmd
         .output()
-        .unwrap_or_else(|err| panic!("could not execute {cmd:?}: {err:?}"));
+        .unwrap_or_else(|err| panic!("could not execute {cmd:?}: {err}"));
     let mode = config.mode.maybe_override(comments, revision, &mut errors);
     let status_check = mode.ok(output.status);
     if status_check.is_empty() && matches!(mode, Mode::Run { .. }) {

src/lib.rs

@@ -543,6 +543,32 @@ impl<T: StatusEmitter, U: StatusEmitter> StatusEmitter for (T, U) {
     }
 }
 
+impl<T: StatusEmitter + ?Sized> StatusEmitter for Box<T> {
+    fn failed_test<'a>(
+        &'a self,
+        revision: &'a str,
+        path: &'a Path,
+        cmd: &'a Command,
+        stderr: &'a [u8],
+    ) -> Box<dyn Debug + 'a> {
+        (**self).failed_test(revision, path, cmd, stderr)
+    }
+
+    fn test_result(&mut self, path: &Path, revision: &str, result: &TestResult) {
+        (**self).test_result(path, revision, result);
+    }
+
+    fn finalize(
+        &self,
+        failures: usize,
+        succeeded: usize,
+        ignored: usize,
+        filtered: usize,
+    ) -> Box<dyn Summary> {
+        (**self).finalize(failures, succeeded, ignored, filtered)
+    }
+}
+
 impl Summary for (Box<dyn Summary>, Box<dyn Summary>) {
     fn test_failure(&mut self, path: &Path, revision: &str, errors: &Errors) {
         self.0.test_failure(path, revision, errors);

src/status_emitter.rs

@@ -72,6 +72,8 @@ fn run(name: &str, mode: Mode) -> Result<()> {
     config.stderr_filter("/([^/\\.]+)\\.dylib", "/$1.so");
     config.stderr_filter("(command: )\"[^<rp][^\"]+", "$1\"$$CMD");
     config.stderr_filter("(src/.*?\\.rs):[0-9]+:[0-9]+", "$1:LL:CC");
+    config.stderr_filter("program not found", "No such file or directory");
+    config.stderr_filter(" \\(os error [0-9]+\\)", "");
 
     run_tests_generic(
         config,

tests/integration.rs

@@ -528,23 +528,23 @@ error: test failed, to rerun pass `--test ui_tests_invalid_program`
 
 Caused by:
   process didn't exit successfully: `$DIR/target/ui/debug/ui_tests_invalid_program-HASH --test-threads 1` (exit status: 1)
-thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/bad_pattern.rs" "--edition" "2021"', $DIR/src/lib.rs
+thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/bad_pattern.rs" "--edition" "2021": No such file or directory', $DIR/src/lib.rs
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 tests/actual_tests/bad_pattern.rs ... FAILED
-thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable.rs" "--edition" "2021"', $DIR/src/lib.rs
+thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable.rs" "--edition" "2021": No such file or directory', $DIR/src/lib.rs
 tests/actual_tests/executable.rs ... FAILED
-thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable_compile_err.rs" "--edition" "2021"', $DIR/src/lib.rs
+thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable_compile_err.rs" "--edition" "2021": No such file or directory', $DIR/src/lib.rs
 tests/actual_tests/executable_compile_err.rs ... FAILED
-thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/exit_code_fail.rs" "--edition" "2021"', $DIR/src/lib.rs
+thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/exit_code_fail.rs" "--edition" "2021": No such file or directory', $DIR/src/lib.rs
 tests/actual_tests/exit_code_fail.rs ... FAILED
 tests/actual_tests/filters.rs ... FAILED
-thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/foomp.rs" "--edition" "2021"', $DIR/src/lib.rs
+thread '<unnamed>' panicked at 'could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/foomp.rs" "--edition" "2021": No such file or directory', $DIR/src/lib.rs
 tests/actual_tests/foomp.rs ... FAILED
 
 tests/actual_tests/bad_pattern.rs FAILED:
 command: "<unknown>"
 
-A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/bad_pattern.rs" "--edition" "2021"
+A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/bad_pattern.rs" "--edition" "2021": No such file or directory
 
 full stderr:
 
@@ -553,7 +553,7 @@ full stderr:
 tests/actual_tests/executable.rs FAILED:
 command: "<unknown>"
 
-A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable.rs" "--edition" "2021"
+A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable.rs" "--edition" "2021": No such file or directory
 
 full stderr:
 
@@ -562,7 +562,7 @@ full stderr:
 tests/actual_tests/executable_compile_err.rs FAILED:
 command: "<unknown>"
 
-A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable_compile_err.rs" "--edition" "2021"
+A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/executable_compile_err.rs" "--edition" "2021": No such file or directory
 
 full stderr:
 
@@ -571,7 +571,7 @@ full stderr:
 tests/actual_tests/exit_code_fail.rs FAILED:
 command: "<unknown>"
 
-A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/exit_code_fail.rs" "--edition" "2021"
+A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/exit_code_fail.rs" "--edition" "2021": No such file or directory
 
 full stderr:
 
@@ -590,7 +590,7 @@ full stderr:
 tests/actual_tests/foomp.rs FAILED:
 command: "<unknown>"
 
-A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/foomp.rs" "--edition" "2021"
+A bug in `ui_test` occurred: could not execute "invalid_foobarlaksdfalsdfj" "tests/actual_tests/foomp.rs" "--edition" "2021": No such file or directory
 
 full stderr: