Skip to content

Commit f80a3b0

Browse files
Ignore failing gcc backend testsuite directly in Dockerfile
1 parent 478bf43 commit f80a3b0

File tree

2 files changed

+9
-30
lines changed
  • src

2 files changed

+9
-30
lines changed

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,21 +1590,6 @@ impl Step for Coverage {
15901590
let compiler = run.builder.compiler(run.builder.top_stage, run.build_triple());
15911591
let target = run.target;
15921592

1593-
// GCC cannot run coverage tests.
1594-
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-
);
1598-
if codegen_backend.is_gcc() {
1599-
return;
1600-
}
1601-
} 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-
);
1605-
return;
1606-
}
1607-
16081593
// List of (coverage) test modes that the coverage test suite will be
16091594
// run in. It's OK for this to contain duplicates, because the call to
16101595
// `Builder::ensure` below will take care of deduplication.
@@ -3770,20 +3755,6 @@ impl Step for CodegenGCC {
37703755
return;
37713756
}
37723757

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-
37873758
if builder.download_rustc() {
37883759
builder.info("CI rustc uses the default codegen backend. skipping");
37893760
return;

src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ ENV RUST_CONFIGURE_ARGS \
4141
--set 'rust.codegen-backends=[\"llvm\",\"gcc\"]'
4242
ENV SCRIPT python3 ../x.py \
4343
--stage 2 \
44-
test \
44+
test tests \
4545
--test-codegen-backend gcc \
46+
--skip tests/coverage \
47+
--skip tests/coverage-run-rustdoc \
48+
--skip tests/rustdoc \
49+
--skip tests/rustdoc-gui \
50+
--skip tests/rustdoc-js \
51+
--skip tests/rustdoc-js-std \
52+
--skip tests/rustdoc-json \
53+
--skip tests/rustdoc-ui \
4654
--set 'rust.codegen-backends=[\"llvm\",\"gcc\"]'

0 commit comments

Comments
 (0)