Skip to content

Commit ff35cf1

Browse files
kirtchev-adacorekirtchev-adacore
committed
Update expected output, restore clobbered code
1 parent 7dc820d commit ff35cf1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

‎src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ pub fn run_tests_generic(
178178
mut configs: Vec<Config>,
179179
file_filter: impl Fn(&Path, &Config) -> Option<bool> + Sync,
180180
per_file_config: impl Copy + Fn(&mut Config, &Spanned<Vec<u8>>) + Send + Sync + 'static,
181-
status_emitter: impl StatusEmitter,
181+
status_emitter: impl StatusEmitter + Send,
182182
) -> Result<()> {
183183
if nextest::emulate(&mut configs) {
184184
return Ok(());

‎src/status_emitter/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl StatusEmitter for JSON {
9494
}
9595

9696
/// Invoked the moment we know a test will later be run.
97-
/// Useful for progress bars and such.
97+
/// Emits a JSON start event.
9898
fn register_test(&self, path: PathBuf) -> Box<dyn TestStatus + 'static> {
9999
let name = path.to_str().unwrap().to_string();
100100
let revision = String::new();

‎tests/integrations/json-basic/Cargo.stdout

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
3232
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/dep_derive.rs (Building dependencies) - ../basic/tests/actual_tests/dep_derive.rs" }
3333
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/dep_derive.rs () - ../basic/tests/actual_tests/dep_derive.rs" }
3434
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/dep_derive.rs (run) - ../basic/tests/actual_tests/dep_derive.rs" }
35-
{ "type": "test", "event": "failed", "name": "../basic/tests/actual_tests/error_above.rs () - ../basic/tests/actual_tests/error_above.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/../basic/tests/actual_tests\" \"../basic/tests/actual_tests/error_above.rs\" \"--extern\" \"serde_derive=$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug/libserde_derive-5185dac99885ddee.so\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.a\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.rlib\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug\" \"--edition\" \"2021\"> stdout: <error[E0432]: unresolved import `basic`\n --> ../basic/tests/actual_tests/error_above.rs:1:5\n |\n1 | use basic::add;\n | ^^^^^ use of undeclared crate or module `basic`\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0432`.\n> stderr: <>" }
36-
{ "type": "test", "event": "failed", "name": "../basic/tests/actual_tests/executable.rs () - ../basic/tests/actual_tests/executable.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/../basic/tests/actual_tests\" \"../basic/tests/actual_tests/executable.rs\" \"--extern\" \"serde_derive=$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug/libserde_derive-5185dac99885ddee.so\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.a\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.rlib\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug\" \"--edition\" \"2021\"> stdout: <error[E0432]: unresolved import `basic`\n --> ../basic/tests/actual_tests/executable.rs:1:5\n |\n1 | use basic::add;\n | ^^^^^ use of undeclared crate or module `basic`\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0432`.\n> stderr: <>" }
35+
{ "type": "test", "event": "failed", "name": "../basic/tests/actual_tests/error_above.rs () - ../basic/tests/actual_tests/error_above.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/../basic/tests/actual_tests\" \"../basic/tests/actual_tests/error_above.rs\" \"--extern\" \"serde_derive=$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug/libserde_derive-5185dac99885ddee.so\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.a\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.rlib\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: <error[E0432]: unresolved import `basic`\n --> ../basic/tests/actual_tests/error_above.rs:1:5\n |\n1 | use basic::add;\n | ^^^^^ use of undeclared crate or module `basic`\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0432`.\n> stderr: <>" }
36+
{ "type": "test", "event": "failed", "name": "../basic/tests/actual_tests/executable.rs () - ../basic/tests/actual_tests/executable.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/../basic/tests/actual_tests\" \"../basic/tests/actual_tests/executable.rs\" \"--extern\" \"serde_derive=$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug/libserde_derive-5185dac99885ddee.so\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.a\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.rlib\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: <error[E0432]: unresolved import `basic`\n --> ../basic/tests/actual_tests/executable.rs:1:5\n |\n1 | use basic::add;\n | ^^^^^ use of undeclared crate or module `basic`\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0432`.\n> stderr: <>" }
3737
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/foomp-rustfix.rs () - ../basic/tests/actual_tests/foomp-rustfix.rs" }
3838
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/foomp-rustfix.rs () - ../basic/tests/actual_tests/foomp-rustfix.fixed" }
39-
{ "type": "test", "event": "failed", "name": "../basic/tests/actual_tests/foomp.rs () - ../basic/tests/actual_tests/foomp.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/../basic/tests/actual_tests\" \"../basic/tests/actual_tests/foomp.rs\" \"--extern\" \"serde_derive=$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug/libserde_derive-5185dac99885ddee.so\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.a\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.rlib\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug\" \"--edition\" \"2021\"> stdout: <error[E0432]: unresolved import `basic`\n --> ../basic/tests/actual_tests/foomp.rs:1:5\n |\n1 | use basic::add;\n | ^^^^^ use of undeclared crate or module `basic`\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0432`.\n> stderr: <>" }
39+
{ "type": "test", "event": "failed", "name": "../basic/tests/actual_tests/foomp.rs () - ../basic/tests/actual_tests/foomp.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/../basic/tests/actual_tests\" \"../basic/tests/actual_tests/foomp.rs\" \"--extern\" \"serde_derive=$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug/libserde_derive-5185dac99885ddee.so\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.a\" \"--extern\" \"json_basic=$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug/libjson_basic.rlib\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/json-basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: <error[E0432]: unresolved import `basic`\n --> ../basic/tests/actual_tests/foomp.rs:1:5\n |\n1 | use basic::add;\n | ^^^^^ use of undeclared crate or module `basic`\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0432`.\n> stderr: <>" }
4040
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/joined_above.rs () - ../basic/tests/actual_tests/joined_above.rs" }
4141
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/joined_above.rs () - ../basic/tests/actual_tests/joined_above.fixed" }
4242
{ "type": "test", "event": "ok", "name": "../basic/tests/actual_tests/joined_below.rs () - ../basic/tests/actual_tests/joined_below.rs" }

0 commit comments

Comments
 (0)