Ignore failing gcc backend testsuite directly in Dockerfile

Author: GuillaumeGomez

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

@@ -1573,21 +1573,6 @@ impl Step for Coverage {
         let compiler = run.builder.compiler(run.builder.top_stage, run.build_triple());
         let target = run.target;
 
-        // GCC cannot run coverage tests.
-        if let Some(codegen_backend) = run.builder.config.cmd.test_codegen_backend() {
-            eprintln!(
-                "WARNING: Already testing with GCC backend so ignoring `rustc_codegen_gcc` testsuite"
-            );
-            if codegen_backend.is_gcc() {
-                return;
-            }
-        } else if run.builder.config.default_codegen_backend(compiler.host).is_gcc() {
-            eprintln!(
-                "WARNING: Already testing with GCC backend so ignoring `rustc_codegen_gcc` testsuite"
-            );
-            return;
-        }
-
         // List of (coverage) test modes that the coverage test suite will be
         // run in. It's OK for this to contain duplicates, because the call to
         // `Builder::ensure` below will take care of deduplication.
@@ -3750,20 +3735,6 @@ impl Step for CodegenGCC {
             return;
         }
 
-        // It we were running with GCC backend tests, no need to run these tests.
-        if let Some(codegen_backend) = run.builder.config.cmd.test_codegen_backend() {
-            if codegen_backend.is_gcc() {
-                return;
-            }
-        } else if run
-            .builder
-            .config
-            .default_codegen_backend(compilers.target_compiler().host)
-            .is_gcc()
-        {
-            return;
-        }
-
         if builder.download_rustc() {
             builder.info("CI rustc uses the default codegen backend. skipping");
             return;

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

@@ -41,6 +41,8 @@ ENV RUST_CONFIGURE_ARGS \
  --set 'rust.codegen-backends=[\"llvm\",\"gcc\"]'
 ENV SCRIPT python3 ../x.py \
   --stage 2 \
-  test \
+  test tests \
   --test-codegen-backend gcc \
+  --skip tests/coverage \
+  --skip tests/coverage-run-rustdoc \
   --set 'rust.codegen-backends=[\"llvm\",\"gcc\"]'