Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions tests/compiletest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,17 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
(true, true) => panic!("cannot use MIRI_BLESS and MIRI_SKIP_UI_CHECKS at the same time"),
};

// Pass on all arguments as filters.
let path_filter = std::env::args().skip(1);
// Pass on all unknown arguments as filters.
let mut quiet = false;
let path_filter = std::env::args().skip(1).filter(|arg| {
match &**arg {
"--quiet" => {
quiet = true;
false
}
_ => true,
}
});

let use_std = env::var_os("MIRI_NO_STD").is_none();

Expand All @@ -76,6 +85,7 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
],
envs: vec![],
}),
quiet,
};
ui_test::run_tests(config)
}
Expand Down
54 changes: 46 additions & 8 deletions ui_test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ pub struct Config {
/// Can be used to override what command to run instead of `cargo` to build the
/// dependencies in `manifest_path`
pub dependency_builder: Option<DependencyBuilder>,
/// Print one character per test instead of one line
pub quiet: bool,
}

#[derive(Debug)]
Expand Down Expand Up @@ -123,11 +125,50 @@ pub fn run_tests(mut config: Config) -> Result<()> {
drop(submit);
});

// A channel for the messages emitted by the individual test threads.
let (finished_files_sender, finished_files_recv) = crossbeam::channel::unbounded();
enum TestResult {
Ok,
Failed,
Ignored,
}

s.spawn(|_| {
if config.quiet {
for (i, (_, result)) in finished_files_recv.into_iter().enumerate() {
// Humans start counting at 1
let i = i + 1;
match result {
TestResult::Ok => eprint!("{}", ".".green()),
TestResult::Failed => eprint!("{}", "F".red().bold()),
TestResult::Ignored => eprint!("{}", "i".yellow()),
}
if i % 100 == 0 {
eprintln!(" {i}");
}
}
} else {
for (msg, result) in finished_files_recv {
eprint!("{msg} ... ");
eprintln!(
"{}",
match result {
TestResult::Ok => "ok".green(),
TestResult::Failed => "FAILED".red().bold(),
TestResult::Ignored => "ignored (in-test comment)".yellow(),
}
);
}
}
});

let mut threads = vec![];

// Create N worker threads that receive files to test.
for _ in 0..std::thread::available_parallelism().unwrap().get() {
let finished_files_sender = finished_files_sender.clone();
threads.push(s.spawn(|_| -> Result<()> {
let finished_files_sender = finished_files_sender;
for path in &receive {
if !config.path_filter.is_empty() {
let path_display = path.display().to_string();
Expand All @@ -140,11 +181,8 @@ pub fn run_tests(mut config: Config) -> Result<()> {
// Ignore file if only/ignore rules do (not) apply
if !test_file_conditions(&comments, &target, &config) {
ignored.fetch_add(1, Ordering::Relaxed);
eprintln!(
"{} ... {}",
path.display(),
"ignored (in-test comment)".yellow()
);
finished_files_sender
.send((path.display().to_string(), TestResult::Ignored))?;
continue;
}
// Run the test for all revisions
Expand All @@ -159,12 +197,11 @@ pub fn run_tests(mut config: Config) -> Result<()> {
if !revision.is_empty() {
write!(msg, "(revision `{revision}`) ").unwrap();
}
write!(msg, "... ").unwrap();
if errors.is_empty() {
eprintln!("{msg}{}", "ok".green());
finished_files_sender.send((msg, TestResult::Ok))?;
succeeded.fetch_add(1, Ordering::Relaxed);
} else {
eprintln!("{msg}{}", "FAILED".red().bold());
finished_files_sender.send((msg, TestResult::Failed))?;
failures.lock().unwrap().push((
path.clone(),
m,
Expand All @@ -178,6 +215,7 @@ pub fn run_tests(mut config: Config) -> Result<()> {
Ok(())
}));
}

for thread in threads {
thread.join().unwrap()?;
}
Expand Down
1 change: 1 addition & 0 deletions ui_test/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ fn config() -> Config {
output_conflict_handling: OutputConflictHandling::Error,
dependencies_crate_manifest_path: None,
dependency_builder: None,
quiet: false,
}
}

Expand Down