Skip to content

Commit 478bf43

Browse files
Skip GCC backend-specific test if current backend is already gcc
1 parent 2ad443c commit 478bf43

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
@@ -1592,10 +1592,16 @@ impl Step for Coverage {
15921592

15931593
// GCC cannot run coverage tests.
15941594
if let Some(codegen_backend) = run.builder.config.cmd.test_codegen_backend() {
1595+
eprintln!(
1596+
"WARNING: Already testing with GCC backend so ignoring `rustc_codegen_gcc` testsuite"
1597+
);
15951598
if codegen_backend.is_gcc() {
15961599
return;
15971600
}
15981601
} else if run.builder.config.default_codegen_backend(compiler.host).is_gcc() {
1602+
eprintln!(
1603+
"WARNING: Already testing with GCC backend so ignoring `rustc_codegen_gcc` testsuite"
1604+
);
15991605
return;
16001606
}
16011607

@@ -3764,6 +3770,20 @@ impl Step for CodegenGCC {
37643770
return;
37653771
}
37663772

3773+
// It we were running with GCC backend tests, no need to run these tests.
3774+
if let Some(codegen_backend) = run.builder.config.cmd.test_codegen_backend() {
3775+
if codegen_backend.is_gcc() {
3776+
return;
3777+
}
3778+
} else if run
3779+
.builder
3780+
.config
3781+
.default_codegen_backend(compilers.target_compiler().host)
3782+
.is_gcc()
3783+
{
3784+
return;
3785+
}
3786+
37673787
if builder.download_rustc() {
37683788
builder.info("CI rustc uses the default codegen backend. skipping");
37693789
return;

0 commit comments

Comments
 (0)