Skip to content

Commit bdec066

Browse files
Skip GCC backend-specific test if current backend is already gcc
1 parent 659feac commit bdec066

File tree

1 file changed

+20
-0
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+20
-0
lines changed

src/bootstrap/src/core/build_steps/test.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,10 +1575,16 @@ impl Step for Coverage {
15751575

15761576
// GCC cannot run coverage tests.
15771577
if let Some(codegen_backend) = run.builder.config.cmd.test_codegen_backend() {
1578+
eprintln!(
1579+
"WARNING: Already testing with GCC backend so ignoring `rustc_codegen_gcc` testsuite"
1580+
);
15781581
if codegen_backend.is_gcc() {
15791582
return;
15801583
}
15811584
} else if run.builder.config.default_codegen_backend(compiler.host).is_gcc() {
1585+
eprintln!(
1586+
"WARNING: Already testing with GCC backend so ignoring `rustc_codegen_gcc` testsuite"
1587+
);
15821588
return;
15831589
}
15841590

@@ -3744,6 +3750,20 @@ impl Step for CodegenGCC {
37443750
return;
37453751
}
37463752

3753+
// It we were running with GCC backend tests, no need to run these tests.
3754+
if let Some(codegen_backend) = run.builder.config.cmd.test_codegen_backend() {
3755+
if codegen_backend.is_gcc() {
3756+
return;
3757+
}
3758+
} else if run
3759+
.builder
3760+
.config
3761+
.default_codegen_backend(compilers.target_compiler().host)
3762+
.is_gcc()
3763+
{
3764+
return;
3765+
}
3766+
37473767
if builder.download_rustc() {
37483768
builder.info("CI rustc uses the default codegen backend. skipping");
37493769
return;

0 commit comments

Comments
 (0)