From d936020e6f7f8286a90669a4d15ca7a4bf55b02f Mon Sep 17 00:00:00 2001 From: Andy Leiserson Date: Sat, 24 Jan 2026 12:21:56 -0800 Subject: [PATCH] test(cts): Make the CTS quieter by default --- xtask/src/cts.rs | 39 ++++++++++++++++++++++++++++++++++----- xtask/src/main.rs | 5 +++++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/xtask/src/cts.rs b/xtask/src/cts.rs index 28f449db3..6ec13c56f 100644 --- a/xtask/src/cts.rs +++ b/xtask/src/cts.rs @@ -64,6 +64,8 @@ pub fn run_cts( let skip_checkout = args.contains("--skip-checkout"); let llvm_cov = args.contains("--llvm-cov"); let release = args.contains("--release"); + let mut quiet = args.contains("--quiet"); + let verbose = args.contains("--verbose"); let running_on_backend = args.opt_value_from_str::<_, String>("--backend")?; let mut filter_pattern = args.opt_value_from_str::<_, String>("--filter")?; let mut filter_invert = false; @@ -109,6 +111,9 @@ pub fn run_cts( if passthrough_args.is_none() { log::info!("Reading default test list from {CTS_DEFAULT_TEST_LIST}"); list_files.push(OsString::from(CTS_DEFAULT_TEST_LIST)); + + // Reduce output, unless `--verbose` was specified. + quiet = !verbose; } } else if passthrough_args.is_some() { bail!("Test(s) and test list(s) are incompatible with passthrough arguments."); @@ -304,7 +309,10 @@ pub fn run_cts( } } - log::info!("Running {}", test.selector.to_string_lossy()); + if !quiet { + log::info!("Running {}", test.selector.to_string_lossy()); + } + let mut cmd = shell .cmd("cargo") .args(run_flags) @@ -316,10 +324,31 @@ pub fn run_cts( cmd = cmd.arg("--release") } - cmd.args(["--", "./tools/run_deno", "--verbose"]) - .args([&test.selector]) - .run() - .context("CTS failed")?; + cmd = cmd + .args(["--", "./tools/run_deno", "--verbose"]) + .args([&test.selector]); + + if quiet { + let output = cmd.ignore_status().output().context("Failed to run CTS")?; + let stdout = String::from_utf8_lossy(&output.stdout); + let stderr = String::from_utf8_lossy(&output.stderr); + + if output.status.success() { + if let Some((_, summary)) = stdout.split_once("** Summary **") { + println!("\n== Summary for {} ==", test.selector.to_string_lossy()); + println!("{}", summary.trim()); + } else { + print!("{}", stdout); + eprint!("{}", stderr); + } + } else { + print!("{}", stdout); + eprint!("{}", stderr); + bail!("CTS failed"); + } + } else { + cmd.run().context("CTS failed")?; + } } if tests.len() > 1 { diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 297333116..be56fcc6d 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -22,6 +22,9 @@ Commands: cts [] [ | -f | -- ] Check out, build, and run CTS tests + If no command-line arguments are specified, runs the default test list + in `cts_runner/test.lst`, with quiet mode enabled. + --skip-checkout Don't check out the pinned CTS version, use whatever is already checked out. --release Build and run in release mode @@ -31,6 +34,8 @@ Commands: --filter Filter tests by selector using a regex pattern. Prefix with '!' to invert (exclude matching tests). Applied after all tests are collected. + --quiet Only show test counts for suites without failures. + --verbose Show full output when running the default test list. run-wasm Build and run web examples