Skip to content

Commit

Permalink
Add GHA log groups for tool tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jyn514 committed Jul 14, 2023
1 parent a5de56a commit fff8223
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions src/bootstrap/test.rs
Expand Up @@ -413,6 +413,7 @@ impl Step for RustAnalyzer {
cargo.env("SKIP_SLOW_TESTS", "1");

cargo.add_rustc_lib_path(builder, compiler);
builder.msg_sysroot_tool(Kind::Test, compiler.stage, "rust-analyzer", host, host);
run_cargo_test(cargo, &[], &[], "rust-analyzer", compiler, host, builder);
}
}
Expand Down Expand Up @@ -462,6 +463,7 @@ impl Step for Rustfmt {

cargo.add_rustc_lib_path(builder, compiler);

builder.msg_sysroot_tool(Kind::Test, compiler.stage, "rustfmt", host, host);
run_cargo_test(cargo, &[], &[], "rustfmt", compiler, host, builder);
}
}
Expand Down Expand Up @@ -554,6 +556,13 @@ impl Miri {
cargo.env("RUST_BACKTRACE", "1");

let mut cargo = Command::from(cargo);
let _guard = builder.msg(
Kind::Build,
compiler.stage + 1,
"miri sysroot",
compiler.host,
compiler.host,
);
builder.run(&mut cargo);

// # Determine where Miri put its sysroot.
Expand Down Expand Up @@ -631,6 +640,8 @@ impl Step for Miri {
SourceType::InTree,
&[],
);
let _guard = builder.msg_sysroot_tool(Kind::Test, compiler.stage, "miri", host, host);

cargo.add_rustc_lib_path(builder, compiler);

// miri tests need to know about the stage sysroot
Expand Down Expand Up @@ -799,6 +810,8 @@ impl Step for Clippy {
cargo.env("BLESS", "Gesundheit");
}

builder.msg_sysroot_tool(Kind::Test, compiler.stage, "clippy", host, host);

if builder.try_run(&mut cargo).is_ok() {
// The tests succeeded; nothing to do.
return;
Expand Down Expand Up @@ -1049,6 +1062,13 @@ impl Step for RustdocGUI {
}

let _time = util::timeit(&builder);
let _guard = builder.msg_sysroot_tool(
Kind::Test,
self.compiler.stage,
"rustdoc-gui",
self.compiler.host,
self.target,
);
crate::render_tests::try_run_tests(builder, &mut cmd, true);
}
}
Expand Down

0 comments on commit fff8223

Please sign in to comment.