From 333f8a3dced277cbf78d5c4ca2008940d4156363 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 12 Aug 2024 12:32:54 +0200 Subject: [PATCH 1/2] Remove `update_status` --- CHANGELOG.md | 2 + src/dependencies.rs | 23 ++++++--- src/status_emitter.rs | 24 ---------- src/test_result.rs | 1 + tests/integrations/basic-bin/Cargo.stdout | 1 + .../integrations/basic-fail-mode/Cargo.stdout | 1 + tests/integrations/basic-fail/Cargo.stdout | 47 +++++++++++++++++++ tests/integrations/basic/Cargo.stdout | 28 +++++++++++ tests/integrations/dep-fail/Cargo.stdout | 1 + .../integrations/ui_test_dep_bug/Cargo.stdout | 1 + 10 files changed, 98 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 239b0c2..8c78020 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +* `TestStatus::update_status`, instead use a revision if you want to run subcommands + ## [0.25.0] - 2024-07-24 ### Added diff --git a/src/dependencies.rs b/src/dependencies.rs index 7afa090..6aa9d6f 100644 --- a/src/dependencies.rs +++ b/src/dependencies.rs @@ -16,7 +16,7 @@ use crate::{ custom_flags::Flag, per_test_config::TestConfig, test_result::Errored, - CommandBuilder, Config, OutputConflictHandling, + CommandBuilder, Config, OutputConflictHandling, TestOk, }; #[derive(Default, Debug)] @@ -390,13 +390,22 @@ impl Flag for DependencyBuilder { config: &TestConfig<'_>, build_manager: &BuildManager<'_>, ) -> Result<(), Errored> { - config + let status = config .status - .update_status("waiting for dependencies to finish building".into()); - let extra_args = build_manager.build(self.clone())?; - cmd.args(extra_args); - config.status.update_status(String::new()); - Ok(()) + .for_revision("waiting for dependencies to finish building"); + match build_manager.build(self.clone()) { + Ok(extra_args) => { + cmd.args(extra_args); + status.done(&Ok(TestOk::Ok)); + Ok(()) + } + Err(err) => { + let err = Err(err); + status.done(&err); + #[allow(clippy::unnecessary_literal_unwrap)] + Err(err.unwrap_err()) + } + } } } diff --git a/src/status_emitter.rs b/src/status_emitter.rs index f3e30d2..75baf62 100644 --- a/src/status_emitter.rs +++ b/src/status_emitter.rs @@ -60,9 +60,6 @@ pub trait TestStatus: Send + Sync + RefUnwindSafe { stdout: &'a [u8], ) -> Box; - /// Change the status of the test while it is running to supply some kind of progress - fn update_status(&self, msg: String); - /// A test has finished, handle the result immediately. fn done(&self, _result: &TestResult) {} @@ -134,8 +131,6 @@ impl TestStatus for SilentStatus { Box::new(()) } - fn update_status(&self, _msg: String) {} - fn path(&self) -> &Path { &self.path } @@ -179,7 +174,6 @@ enum Msg { Inc, IncLength, Finish, - Status(String, String), } impl Text { @@ -212,9 +206,6 @@ impl Text { spinner.finish_and_clear(); } } - Msg::Status(msg, status) => { - threads.get_mut(&msg).unwrap().set_message(status); - } Msg::Push(msg) => { let spinner = bars.add(ProgressBar::new_spinner().with_prefix(msg.clone())); @@ -329,10 +320,6 @@ impl TestStatus for TextTest { } } - fn update_status(&self, msg: String) { - self.text.sender.send(Msg::Status(self.msg(), msg)).unwrap(); - } - fn failed_test<'a>( &self, cmd: &str, @@ -946,8 +933,6 @@ impl TestStatus for PathAndRev { fn revision(&self) -> &str { &self.revision } - - fn update_status(&self, _msg: String) {} } impl StatusEmitter for Gha { @@ -1057,11 +1042,6 @@ impl TestStatus for (T, U) { fn for_path(&self, path: &Path) -> Box { Box::new((self.0.for_path(path), self.1.for_path(path))) } - - fn update_status(&self, msg: String) { - self.0.update_status(msg.clone()); - self.1.update_status(msg) - } } impl StatusEmitter for (T, U) { @@ -1115,10 +1095,6 @@ impl TestStatus for Box { ) -> Box { (**self).failed_test(cmd, stderr, stdout) } - - fn update_status(&self, msg: String) { - (**self).update_status(msg) - } } impl StatusEmitter for Box { diff --git a/src/test_result.rs b/src/test_result.rs index a51606f..6b68dab 100644 --- a/src/test_result.rs +++ b/src/test_result.rs @@ -4,6 +4,7 @@ use crate::{status_emitter::TestStatus, Error}; use color_eyre::eyre::Result; /// The possible non-failure results a single test can have. +#[derive(Debug)] pub enum TestOk { /// The test passed Ok, diff --git a/tests/integrations/basic-bin/Cargo.stdout b/tests/integrations/basic-bin/Cargo.stdout index 058d804..8183a6f 100644 --- a/tests/integrations/basic-bin/Cargo.stdout +++ b/tests/integrations/basic-bin/Cargo.stdout @@ -4,6 +4,7 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok +tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... ok test result: ok. 1 passed diff --git a/tests/integrations/basic-fail-mode/Cargo.stdout b/tests/integrations/basic-fail-mode/Cargo.stdout index 15df52b..1c18a07 100644 --- a/tests/integrations/basic-fail-mode/Cargo.stdout +++ b/tests/integrations/basic-fail-mode/Cargo.stdout @@ -9,6 +9,7 @@ running 3 tests test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok +tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... ok test result: ok. 1 passed diff --git a/tests/integrations/basic-fail/Cargo.stdout b/tests/integrations/basic-fail/Cargo.stdout index a27553f..86fa1ba 100644 --- a/tests/integrations/basic-fail/Cargo.stdout +++ b/tests/integrations/basic-fail/Cargo.stdout @@ -4,19 +4,26 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok +tests/actual_tests/bad_pattern.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/bad_pattern.rs ... FAILED +tests/actual_tests/executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/executable.rs (revision `run`) ... FAILED tests/actual_tests/executable.rs ... ok +tests/actual_tests/executable_compile_err.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/executable_compile_err.rs ... FAILED +tests/actual_tests/exit_code_fail.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/exit_code_fail.rs ... FAILED tests/actual_tests/filters.rs ... FAILED +tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... FAILED +tests/actual_tests/foomp2.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp2.rs ... FAILED tests/actual_tests/inline_chain.rs ... FAILED tests/actual_tests/joined_wrong_order.rs ... FAILED tests/actual_tests/lone_joined_pattern.rs ... FAILED tests/actual_tests/pattern_too_many_arrow.rs ... FAILED tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED +tests/actual_tests/rustc_ice.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/rustc_ice.rs ... FAILED tests/actual_tests/touching_above_below.rs ... FAILED tests/actual_tests/touching_above_below_chain.rs ... FAILED @@ -455,58 +462,90 @@ FAILURES: test result: FAIL. 15 failed; 1 passed Building dependencies ... ok +tests/actual_tests_bless/abort.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/abort.rs (revision `run`) ... FAILED tests/actual_tests_bless/abort.rs ... ok tests/actual_tests_bless/aux_build_not_found.rs ... FAILED tests/actual_tests_bless/aux_proc_macro_misuse.rs ... FAILED Building aux file tests/actual_tests_bless/auxiliary/the_proc_macro.rs ... ok +tests/actual_tests_bless/aux_proc_macro_no_main.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/aux_proc_macro_no_main.rs ... FAILED tests/actual_tests_bless/compile_flags_quotes.rs ... FAILED tests/actual_tests_bless/compiletest-rs-command.rs ... FAILED +tests/actual_tests_bless/failing_executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/failing_executable.rs (revision `run`) ... FAILED tests/actual_tests_bless/failing_executable.rs ... ok Building aux file tests/actual_tests_bless/auxiliary/foomp.rs ... ok +tests/actual_tests_bless/foomp_aux.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/foomp_aux.rs ... ok Building aux file tests/actual_tests_bless/auxiliary/nested.rs ... ok +tests/actual_tests_bless/nested_aux.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/nested_aux.rs ... ok +tests/actual_tests_bless/no_main.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/no_main.rs ... FAILED +tests/actual_tests_bless/no_main_manual.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/no_main_manual.rs ... FAILED +tests/actual_tests_bless/no_test.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/no_test.rs ... FAILED tests/actual_tests_bless/non_top_level_configs.rs ... FAILED +tests/actual_tests_bless/pass.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/pass.rs ... ok +tests/actual_tests_bless/pass_with_annotation.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/pass_with_annotation.rs ... FAILED tests/actual_tests_bless/revised_revision.rs ... FAILED +tests/actual_tests_bless/revisioned_executable.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/revisioned_executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisioned_executable.rs (revision `run.run`) ... ok tests/actual_tests_bless/revisioned_executable.rs (revision `run`) ... ok tests/actual_tests_bless/revisioned_executable.rs (revision `panic.run`) ... FAILED tests/actual_tests_bless/revisioned_executable.rs (revision `panic`) ... ok +tests/actual_tests_bless/revisioned_executable_panic.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/revisioned_executable_panic.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run.run`) ... FAILED tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run`) ... ok tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic.run`) ... ok tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic`) ... ok +tests/actual_tests_bless/revisions.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/revisions.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions.rs (revision `bar`) ... ok +tests/actual_tests_bless/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_bad.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions_bad.rs (revision `bar`) ... FAILED tests/actual_tests_bless/revisions_filter.rs (revision `foo`) ... ignored (in-test comment) tests/actual_tests_bless/revisions_filter.rs (revision `bar`) ... ignored (in-test comment) +tests/actual_tests_bless/revisions_filter2.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_filter2.rs (revision `foo`) ... ignored (in-test comment) tests/actual_tests_bless/revisions_filter2.rs (revision `bar`) ... ok +tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `bar`) ... ok +tests/actual_tests_bless/revisions_same_everywhere.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/revisions_same_everywhere.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_same_everywhere.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions_same_everywhere.rs (revision `bar`) ... ok +tests/actual_tests_bless/run_panic.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/run_panic.rs (revision `run`) ... ok tests/actual_tests_bless/run_panic.rs ... ok +tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/rustfix-fail-revisions.a.fixed (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/rustfix-fail-revisions.b.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/rustfix-fail-revisions.a.fixed (revision `a`) ... FAILED tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `a`) ... ok tests/actual_tests_bless/rustfix-fail-revisions.b.fixed (revision `b`) ... FAILED tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `b`) ... ok +tests/actual_tests_bless/rustfix-fail.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless/rustfix-fail.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/rustfix-fail.fixed ... FAILED tests/actual_tests_bless/rustfix-fail.rs ... ok +tests/actual_tests_bless/unicode.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/unicode.rs ... FAILED tests/actual_tests_bless/unknown_revision.rs ... FAILED tests/actual_tests_bless/unknown_revision2.rs ... FAILED +tests/actual_tests_bless/wrong_diagnostic_code.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/wrong_diagnostic_code.rs ... FAILED FAILED TEST: tests/actual_tests_bless/abort.rs (revision `run`) @@ -1081,10 +1120,18 @@ FAILURES: test result: FAIL. 23 failed; 24 passed; 3 ignored Building dependencies ... ok +tests/actual_tests_bless_yolo/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless_yolo/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless_yolo/revisions_bad.rs (revision `foo`) ... ok tests/actual_tests_bless_yolo/revisions_bad.rs (revision `bar`) ... ok +tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed ... ok tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs ... ok +tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed ... ok tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed ... FAILED tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed ... ok diff --git a/tests/integrations/basic/Cargo.stdout b/tests/integrations/basic/Cargo.stdout index cdd35c3..664e5d8 100644 --- a/tests/integrations/basic/Cargo.stdout +++ b/tests/integrations/basic/Cargo.stdout @@ -10,38 +10,66 @@ test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini Building dependencies ... ok Building aux file tests/actual_tests/auxiliary/proc_macro_attr.rs ... ok +tests/actual_tests/aux_attr_proc_macro.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/aux_attr_proc_macro.rs ... ok Building aux file tests/actual_tests/auxiliary/derive_proc_macro.rs ... ok +tests/actual_tests/aux_derive.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/aux_derive.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/aux_derive.fixed ... ok tests/actual_tests/aux_derive.rs ... ok Building aux file tests/actual_tests/auxiliary/the_proc_macro.rs ... ok +tests/actual_tests/aux_proc_macro.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/aux_proc_macro.rs ... ok +tests/actual_tests/dep_derive.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/dep_derive.rs (revision `run`) ... ok tests/actual_tests/dep_derive.rs ... ok +tests/actual_tests/error_above.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/error_above.rs ... ok +tests/actual_tests/executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/executable.rs (revision `run`) ... ok tests/actual_tests/executable.rs ... ok +tests/actual_tests/foomp-rustfix.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/foomp-rustfix.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp-rustfix.fixed ... ok tests/actual_tests/foomp-rustfix.rs ... ok +tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... ok +tests/actual_tests/joined_above.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/joined_above.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/joined_above.fixed ... ok tests/actual_tests/joined_above.rs ... ok +tests/actual_tests/joined_below.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/joined_below.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/joined_below.fixed ... ok tests/actual_tests/joined_below.rs ... ok +tests/actual_tests/joined_mixed.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/joined_mixed.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/joined_mixed.fixed ... ok tests/actual_tests/joined_mixed.rs ... ok +tests/actual_tests/mac_span.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/mac_span.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/mac_span.fixed ... ok tests/actual_tests/mac_span.rs ... ok +tests/actual_tests/match_diagnostic_code.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/match_diagnostic_code.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/match_diagnostic_code.fixed ... ok tests/actual_tests/match_diagnostic_code.rs ... ok +tests/actual_tests/no_rustfix.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/no_rustfix.rs ... ok +tests/actual_tests/rustfix-multiple.rs (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/rustfix-multiple.1.fixed (revision `waiting for dependencies to finish building`) ... ok +tests/actual_tests/rustfix-multiple.2.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/rustfix-multiple.1.fixed ... ok tests/actual_tests/rustfix-multiple.2.fixed ... ok tests/actual_tests/rustfix-multiple.rs ... ok +tests/actual_tests/stdin.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/stdin.rs (revision `run`) ... ok tests/actual_tests/stdin.rs ... ok +tests/actual_tests/unicode.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/unicode.rs ... ok +tests/actual_tests/windows_paths.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/windows_paths.rs ... ok +tests/actual_tests/subdir/aux_proc_macro.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/subdir/aux_proc_macro.rs ... ok test result: ok. 31 passed diff --git a/tests/integrations/dep-fail/Cargo.stdout b/tests/integrations/dep-fail/Cargo.stdout index c053179..e2ce758 100644 --- a/tests/integrations/dep-fail/Cargo.stdout +++ b/tests/integrations/dep-fail/Cargo.stdout @@ -4,6 +4,7 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... FAILED +tests/ui/basic_test.rs (revision `waiting for dependencies to finish building`) ... FAILED tests/ui/basic_test.rs ... FAILED FAILED TEST: tests/ui/basic_test.rs diff --git a/tests/integrations/ui_test_dep_bug/Cargo.stdout b/tests/integrations/ui_test_dep_bug/Cargo.stdout index 990abfa..72f43c4 100644 --- a/tests/integrations/ui_test_dep_bug/Cargo.stdout +++ b/tests/integrations/ui_test_dep_bug/Cargo.stdout @@ -4,6 +4,7 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok +tests/ui/basic_test.rs (revision `waiting for dependencies to finish building`) ... ok tests/ui/basic_test.rs ... ok test result: ok. 1 passed From 2f3a770688ba91e1aae4efa968add9e37b9d5750 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 12 Aug 2024 11:32:55 +0200 Subject: [PATCH 2/2] Allow hiding some revisions from command line output --- src/build_manager.rs | 7 ++- src/custom_flags/run.rs | 6 +-- src/dependencies.rs | 8 +-- src/lib.rs | 3 +- src/status_emitter.rs | 49 +++++++++++++++---- tests/integrations/basic-bin/Cargo.stdout | 1 - .../integrations/basic-fail-mode/Cargo.stdout | 1 - tests/integrations/basic-fail/Cargo.stdout | 47 ------------------ tests/integrations/basic/Cargo.stdout | 28 ----------- tests/integrations/dep-fail/Cargo.stdout | 1 - .../integrations/ui_test_dep_bug/Cargo.stdout | 1 - 11 files changed, 54 insertions(+), 98 deletions(-) diff --git a/src/build_manager.rs b/src/build_manager.rs index 7c63fb4..15c53dc 100644 --- a/src/build_manager.rs +++ b/src/build_manager.rs @@ -6,7 +6,10 @@ use std::{ sync::{Arc, OnceLock, RwLock}, }; -use crate::{status_emitter::StatusEmitter, Config, Errored}; +use crate::{ + status_emitter::{RevisionStyle, StatusEmitter}, + Config, Errored, +}; /// A build shared between all tests of the same `BuildManager` pub trait Build { @@ -83,7 +86,7 @@ impl<'a> BuildManager<'a> { let build = self .status_emitter .register_test(what.description().into()) - .for_revision(""); + .for_revision("", RevisionStyle::Parent); let res = what.build(self).map_err(|e| err = Some(e)); build.done( &res.as_ref() diff --git a/src/custom_flags/run.rs b/src/custom_flags/run.rs index 20ed264..4a63c01 100644 --- a/src/custom_flags/run.rs +++ b/src/custom_flags/run.rs @@ -5,8 +5,8 @@ use spanned::Spanned; use std::process::{Command, Output}; use crate::{ - build_manager::BuildManager, display, per_test_config::TestConfig, Error, Errored, TestOk, - TestRun, + build_manager::BuildManager, display, per_test_config::TestConfig, + status_emitter::RevisionStyle, Error, Errored, TestOk, TestRun, }; use super::Flag; @@ -37,7 +37,7 @@ impl Flag for Run { config: config.config.clone(), comments: config.comments, aux_dir: config.aux_dir, - status: config.status.for_revision(&revision), + status: config.status.for_revision(&revision, RevisionStyle::Show), }; cmd.arg("--print").arg("file-names"); let output = cmd.output().unwrap(); diff --git a/src/dependencies.rs b/src/dependencies.rs index 6aa9d6f..18f3243 100644 --- a/src/dependencies.rs +++ b/src/dependencies.rs @@ -15,6 +15,7 @@ use crate::{ build_manager::{Build, BuildManager}, custom_flags::Flag, per_test_config::TestConfig, + status_emitter::RevisionStyle, test_result::Errored, CommandBuilder, Config, OutputConflictHandling, TestOk, }; @@ -390,9 +391,10 @@ impl Flag for DependencyBuilder { config: &TestConfig<'_>, build_manager: &BuildManager<'_>, ) -> Result<(), Errored> { - let status = config - .status - .for_revision("waiting for dependencies to finish building"); + let status = config.status.for_revision( + "waiting for dependencies to finish building", + RevisionStyle::Quiet, + ); match build_manager.build(self.clone()) { Ok(extra_args) => { cmd.args(extra_args); diff --git a/src/lib.rs b/src/lib.rs index fd2ed10..43ad88f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,6 +18,7 @@ pub use core::CrateType; pub use filter::Match; use per_test_config::TestConfig; use spanned::Spanned; +use status_emitter::RevisionStyle; use status_emitter::{StatusEmitter, TestStatus}; use std::collections::VecDeque; use std::path::Path; @@ -326,7 +327,7 @@ fn parse_and_test_file( let revisions = comments.revisions.as_deref().unwrap_or(EMPTY); let mut runs = vec![]; for revision in revisions { - let status = status.for_revision(revision); + let status = status.for_revision(revision, RevisionStyle::Show); // Ignore file if only/ignore rules do (not) apply if !config.test_file_conditions(&comments, revision) { runs.push(TestRun { diff --git a/src/status_emitter.rs b/src/status_emitter.rs index 75baf62..8fd3e26 100644 --- a/src/status_emitter.rs +++ b/src/status_emitter.rs @@ -43,10 +43,22 @@ pub trait StatusEmitter: Sync + RefUnwindSafe { ) -> Box; } +/// Some configuration options for revisions +#[derive(Debug, Clone, Copy)] +pub enum RevisionStyle { + /// Things like dependencies or aux files building are noise in non-interactif mode + /// and thus silenced. + Quiet, + /// Always show them, even if rendering to a file + Show, + /// The parent, only show in indicatif mode and on failure + Parent, +} + /// Information about a specific test run. pub trait TestStatus: Send + Sync + RefUnwindSafe { /// Create a copy of this test for a new revision. - fn for_revision(&self, revision: &str) -> Box; + fn for_revision(&self, revision: &str, style: RevisionStyle) -> Box; /// Create a copy of this test for a new path. fn for_path(&self, path: &Path) -> Box; @@ -108,7 +120,7 @@ pub struct SilentStatus { } impl TestStatus for SilentStatus { - fn for_revision(&self, revision: &str) -> Box { + fn for_revision(&self, revision: &str, _style: RevisionStyle) -> Box { Box::new(SilentStatus { revision: revision.into(), path: self.path.clone(), @@ -286,6 +298,7 @@ struct TextTest { path: PathBuf, revision: String, first: AtomicBool, + style: RevisionStyle, } impl TextTest { @@ -313,8 +326,18 @@ impl TestStatus for TextTest { let old_msg = self.msg(); let msg = format!("... {result}"); if ProgressDrawTarget::stdout().is_hidden() { - println!("{old_msg} {msg}"); - std::io::stdout().flush().unwrap(); + match self.style { + RevisionStyle::Quiet => {} + RevisionStyle::Show | RevisionStyle::Parent => { + let revision = if self.revision.is_empty() { + String::new() + } else { + format!(" (revision `{}`)", self.revision) + }; + println!("{}{revision} {msg}", display(&self.path)); + std::io::stdout().flush().unwrap(); + } + } } self.text.sender.send(Msg::Pop(old_msg, Some(msg))).unwrap(); } @@ -360,7 +383,7 @@ impl TestStatus for TextTest { &self.path } - fn for_revision(&self, revision: &str) -> Box { + fn for_revision(&self, revision: &str, style: RevisionStyle) -> Box { if !self.first.swap(false, std::sync::atomic::Ordering::Relaxed) && self.text.is_quiet_output() { @@ -372,6 +395,7 @@ impl TestStatus for TextTest { path: self.path.clone(), revision: revision.to_owned(), first: AtomicBool::new(false), + style, }; self.text.sender.send(Msg::Push(text.msg())).unwrap(); Box::new(text) @@ -383,6 +407,7 @@ impl TestStatus for TextTest { path: path.to_path_buf(), revision: self.revision.clone(), first: AtomicBool::new(false), + style: RevisionStyle::Show, }; self.text.sender.send(Msg::Push(text.msg())).unwrap(); Box::new(text) @@ -403,6 +428,7 @@ impl StatusEmitter for Text { path, revision: String::new(), first: AtomicBool::new(true), + style: RevisionStyle::Parent, }) } @@ -904,7 +930,7 @@ impl TestStatus for PathAndRev { &self.path } - fn for_revision(&self, revision: &str) -> Box { + fn for_revision(&self, revision: &str, _style: RevisionStyle) -> Box { Box::new(Self { path: self.path.clone(), revision: revision.to_owned(), @@ -1035,8 +1061,11 @@ impl TestStatus for (T, U) { rev } - fn for_revision(&self, revision: &str) -> Box { - Box::new((self.0.for_revision(revision), self.1.for_revision(revision))) + fn for_revision(&self, revision: &str, style: RevisionStyle) -> Box { + Box::new(( + self.0.for_revision(revision, style), + self.1.for_revision(revision, style), + )) } fn for_path(&self, path: &Path) -> Box { @@ -1079,8 +1108,8 @@ impl TestStatus for Box { (**self).revision() } - fn for_revision(&self, revision: &str) -> Box { - (**self).for_revision(revision) + fn for_revision(&self, revision: &str, style: RevisionStyle) -> Box { + (**self).for_revision(revision, style) } fn for_path(&self, path: &Path) -> Box { diff --git a/tests/integrations/basic-bin/Cargo.stdout b/tests/integrations/basic-bin/Cargo.stdout index 8183a6f..058d804 100644 --- a/tests/integrations/basic-bin/Cargo.stdout +++ b/tests/integrations/basic-bin/Cargo.stdout @@ -4,7 +4,6 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok -tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... ok test result: ok. 1 passed diff --git a/tests/integrations/basic-fail-mode/Cargo.stdout b/tests/integrations/basic-fail-mode/Cargo.stdout index 1c18a07..15df52b 100644 --- a/tests/integrations/basic-fail-mode/Cargo.stdout +++ b/tests/integrations/basic-fail-mode/Cargo.stdout @@ -9,7 +9,6 @@ running 3 tests test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok -tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... ok test result: ok. 1 passed diff --git a/tests/integrations/basic-fail/Cargo.stdout b/tests/integrations/basic-fail/Cargo.stdout index 86fa1ba..a27553f 100644 --- a/tests/integrations/basic-fail/Cargo.stdout +++ b/tests/integrations/basic-fail/Cargo.stdout @@ -4,26 +4,19 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok -tests/actual_tests/bad_pattern.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/bad_pattern.rs ... FAILED -tests/actual_tests/executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/executable.rs (revision `run`) ... FAILED tests/actual_tests/executable.rs ... ok -tests/actual_tests/executable_compile_err.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/executable_compile_err.rs ... FAILED -tests/actual_tests/exit_code_fail.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/exit_code_fail.rs ... FAILED tests/actual_tests/filters.rs ... FAILED -tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... FAILED -tests/actual_tests/foomp2.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp2.rs ... FAILED tests/actual_tests/inline_chain.rs ... FAILED tests/actual_tests/joined_wrong_order.rs ... FAILED tests/actual_tests/lone_joined_pattern.rs ... FAILED tests/actual_tests/pattern_too_many_arrow.rs ... FAILED tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED -tests/actual_tests/rustc_ice.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/rustc_ice.rs ... FAILED tests/actual_tests/touching_above_below.rs ... FAILED tests/actual_tests/touching_above_below_chain.rs ... FAILED @@ -462,90 +455,58 @@ FAILURES: test result: FAIL. 15 failed; 1 passed Building dependencies ... ok -tests/actual_tests_bless/abort.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/abort.rs (revision `run`) ... FAILED tests/actual_tests_bless/abort.rs ... ok tests/actual_tests_bless/aux_build_not_found.rs ... FAILED tests/actual_tests_bless/aux_proc_macro_misuse.rs ... FAILED Building aux file tests/actual_tests_bless/auxiliary/the_proc_macro.rs ... ok -tests/actual_tests_bless/aux_proc_macro_no_main.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/aux_proc_macro_no_main.rs ... FAILED tests/actual_tests_bless/compile_flags_quotes.rs ... FAILED tests/actual_tests_bless/compiletest-rs-command.rs ... FAILED -tests/actual_tests_bless/failing_executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/failing_executable.rs (revision `run`) ... FAILED tests/actual_tests_bless/failing_executable.rs ... ok Building aux file tests/actual_tests_bless/auxiliary/foomp.rs ... ok -tests/actual_tests_bless/foomp_aux.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/foomp_aux.rs ... ok Building aux file tests/actual_tests_bless/auxiliary/nested.rs ... ok -tests/actual_tests_bless/nested_aux.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/nested_aux.rs ... ok -tests/actual_tests_bless/no_main.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/no_main.rs ... FAILED -tests/actual_tests_bless/no_main_manual.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/no_main_manual.rs ... FAILED -tests/actual_tests_bless/no_test.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/no_test.rs ... FAILED tests/actual_tests_bless/non_top_level_configs.rs ... FAILED -tests/actual_tests_bless/pass.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/pass.rs ... ok -tests/actual_tests_bless/pass_with_annotation.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/pass_with_annotation.rs ... FAILED tests/actual_tests_bless/revised_revision.rs ... FAILED -tests/actual_tests_bless/revisioned_executable.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/revisioned_executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisioned_executable.rs (revision `run.run`) ... ok tests/actual_tests_bless/revisioned_executable.rs (revision `run`) ... ok tests/actual_tests_bless/revisioned_executable.rs (revision `panic.run`) ... FAILED tests/actual_tests_bless/revisioned_executable.rs (revision `panic`) ... ok -tests/actual_tests_bless/revisioned_executable_panic.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/revisioned_executable_panic.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run.run`) ... FAILED tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run`) ... ok tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic.run`) ... ok tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic`) ... ok -tests/actual_tests_bless/revisions.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/revisions.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions.rs (revision `bar`) ... ok -tests/actual_tests_bless/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_bad.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions_bad.rs (revision `bar`) ... FAILED tests/actual_tests_bless/revisions_filter.rs (revision `foo`) ... ignored (in-test comment) tests/actual_tests_bless/revisions_filter.rs (revision `bar`) ... ignored (in-test comment) -tests/actual_tests_bless/revisions_filter2.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_filter2.rs (revision `foo`) ... ignored (in-test comment) tests/actual_tests_bless/revisions_filter2.rs (revision `bar`) ... ok -tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `bar`) ... ok -tests/actual_tests_bless/revisions_same_everywhere.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/revisions_same_everywhere.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/revisions_same_everywhere.rs (revision `foo`) ... ok tests/actual_tests_bless/revisions_same_everywhere.rs (revision `bar`) ... ok -tests/actual_tests_bless/run_panic.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/run_panic.rs (revision `run`) ... ok tests/actual_tests_bless/run_panic.rs ... ok -tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/rustfix-fail-revisions.a.fixed (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/rustfix-fail-revisions.b.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/rustfix-fail-revisions.a.fixed (revision `a`) ... FAILED tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `a`) ... ok tests/actual_tests_bless/rustfix-fail-revisions.b.fixed (revision `b`) ... FAILED tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `b`) ... ok -tests/actual_tests_bless/rustfix-fail.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless/rustfix-fail.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/rustfix-fail.fixed ... FAILED tests/actual_tests_bless/rustfix-fail.rs ... ok -tests/actual_tests_bless/unicode.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/unicode.rs ... FAILED tests/actual_tests_bless/unknown_revision.rs ... FAILED tests/actual_tests_bless/unknown_revision2.rs ... FAILED -tests/actual_tests_bless/wrong_diagnostic_code.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless/wrong_diagnostic_code.rs ... FAILED FAILED TEST: tests/actual_tests_bless/abort.rs (revision `run`) @@ -1120,18 +1081,10 @@ FAILURES: test result: FAIL. 23 failed; 24 passed; 3 ignored Building dependencies ... ok -tests/actual_tests_bless_yolo/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless_yolo/revisions_bad.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless_yolo/revisions_bad.rs (revision `foo`) ... ok tests/actual_tests_bless_yolo/revisions_bad.rs (revision `bar`) ... ok -tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed ... ok tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs ... ok -tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed ... ok tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed ... FAILED tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed ... ok diff --git a/tests/integrations/basic/Cargo.stdout b/tests/integrations/basic/Cargo.stdout index 664e5d8..cdd35c3 100644 --- a/tests/integrations/basic/Cargo.stdout +++ b/tests/integrations/basic/Cargo.stdout @@ -10,66 +10,38 @@ test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini Building dependencies ... ok Building aux file tests/actual_tests/auxiliary/proc_macro_attr.rs ... ok -tests/actual_tests/aux_attr_proc_macro.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/aux_attr_proc_macro.rs ... ok Building aux file tests/actual_tests/auxiliary/derive_proc_macro.rs ... ok -tests/actual_tests/aux_derive.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/aux_derive.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/aux_derive.fixed ... ok tests/actual_tests/aux_derive.rs ... ok Building aux file tests/actual_tests/auxiliary/the_proc_macro.rs ... ok -tests/actual_tests/aux_proc_macro.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/aux_proc_macro.rs ... ok -tests/actual_tests/dep_derive.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/dep_derive.rs (revision `run`) ... ok tests/actual_tests/dep_derive.rs ... ok -tests/actual_tests/error_above.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/error_above.rs ... ok -tests/actual_tests/executable.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/executable.rs (revision `run`) ... ok tests/actual_tests/executable.rs ... ok -tests/actual_tests/foomp-rustfix.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/foomp-rustfix.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp-rustfix.fixed ... ok tests/actual_tests/foomp-rustfix.rs ... ok -tests/actual_tests/foomp.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/foomp.rs ... ok -tests/actual_tests/joined_above.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/joined_above.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/joined_above.fixed ... ok tests/actual_tests/joined_above.rs ... ok -tests/actual_tests/joined_below.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/joined_below.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/joined_below.fixed ... ok tests/actual_tests/joined_below.rs ... ok -tests/actual_tests/joined_mixed.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/joined_mixed.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/joined_mixed.fixed ... ok tests/actual_tests/joined_mixed.rs ... ok -tests/actual_tests/mac_span.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/mac_span.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/mac_span.fixed ... ok tests/actual_tests/mac_span.rs ... ok -tests/actual_tests/match_diagnostic_code.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/match_diagnostic_code.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/match_diagnostic_code.fixed ... ok tests/actual_tests/match_diagnostic_code.rs ... ok -tests/actual_tests/no_rustfix.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/no_rustfix.rs ... ok -tests/actual_tests/rustfix-multiple.rs (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/rustfix-multiple.1.fixed (revision `waiting for dependencies to finish building`) ... ok -tests/actual_tests/rustfix-multiple.2.fixed (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/rustfix-multiple.1.fixed ... ok tests/actual_tests/rustfix-multiple.2.fixed ... ok tests/actual_tests/rustfix-multiple.rs ... ok -tests/actual_tests/stdin.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/stdin.rs (revision `run`) ... ok tests/actual_tests/stdin.rs ... ok -tests/actual_tests/unicode.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/unicode.rs ... ok -tests/actual_tests/windows_paths.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/windows_paths.rs ... ok -tests/actual_tests/subdir/aux_proc_macro.rs (revision `waiting for dependencies to finish building`) ... ok tests/actual_tests/subdir/aux_proc_macro.rs ... ok test result: ok. 31 passed diff --git a/tests/integrations/dep-fail/Cargo.stdout b/tests/integrations/dep-fail/Cargo.stdout index e2ce758..c053179 100644 --- a/tests/integrations/dep-fail/Cargo.stdout +++ b/tests/integrations/dep-fail/Cargo.stdout @@ -4,7 +4,6 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... FAILED -tests/ui/basic_test.rs (revision `waiting for dependencies to finish building`) ... FAILED tests/ui/basic_test.rs ... FAILED FAILED TEST: tests/ui/basic_test.rs diff --git a/tests/integrations/ui_test_dep_bug/Cargo.stdout b/tests/integrations/ui_test_dep_bug/Cargo.stdout index 72f43c4..990abfa 100644 --- a/tests/integrations/ui_test_dep_bug/Cargo.stdout +++ b/tests/integrations/ui_test_dep_bug/Cargo.stdout @@ -4,7 +4,6 @@ running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished Building dependencies ... ok -tests/ui/basic_test.rs (revision `waiting for dependencies to finish building`) ... ok tests/ui/basic_test.rs ... ok test result: ok. 1 passed