about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2024-04-14 23:24:33 +0200
committerGitHub <noreply@github.com>2024-04-14 23:24:33 +0200
commitf3a68fb71898cce8ff3049775f8ee1e9ccfa13a5 (patch)
tree25246babea758977b4b63ae28eb59f8b79108ac7
parentfa483a482940b24229a6cc5be0da6a462d6dd9e5 (diff)
parent167e3ab8c80deb0cdec524f4445f323d93dbd3a7 (diff)
downloadrust-f3a68fb71898cce8ff3049775f8ee1e9ccfa13a5.tar.gz
rust-f3a68fb71898cce8ff3049775f8ee1e9ccfa13a5.zip
Rollup merge of #123373 - onur-ozkan:skip-codegen, r=Mark-Simulacrum
skip Codegen{GCC,Cranelift} when using CI rustc

CI rustc uses the default codegen backend, therefore we can't run `CodegenGCC` and `CodegenCranelift` tests when using it.

cc `@bjorn3` (to make sure I am not doing anything wrong)

Fixes #123331
-rw-r--r--src/bootstrap/src/core/build_steps/test.rs10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 09763e6bf01..e3dde89aefc 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -3300,6 +3300,11 @@ impl Step for CodegenCranelift {
             return;
         }
 
+        if builder.download_rustc() {
+            builder.info("CI rustc uses the default codegen backend. skipping");
+            return;
+        }
+
         if !target_supports_cranelift_backend(run.target) {
             builder.info("target not supported by rustc_codegen_cranelift. skipping");
             return;
@@ -3421,6 +3426,11 @@ impl Step for CodegenGCC {
             return;
         }
 
+        if builder.download_rustc() {
+            builder.info("CI rustc uses the default codegen backend. skipping");
+            return;
+        }
+
         let triple = run.target.triple;
         let target_supported =
             if triple.contains("linux") { triple.contains("x86_64") } else { false };