Rollup merge of #162482 - GuillaumeGomez:run-make-backends, r=Kobzol

Make `run-make` testsuite work with other codegen backend than LLVM

Needed for #159924.

Currently, we always run `run-make` testsuite with the codegen backend rustc was compiled with. However, in CI it's compiled with LLVM, so when we want to test with GCC (with `--test-codegen-backend`), it compiles `rmake.rs` with the GCC backend, but when running the test, it doesn't use the GCC backend since it just calls `rustc`. So to get around that, I now pass the codegen backend through the environment and set it in the `rustc` function of `run_make_support`.

To be noted that for now it's only for the `rustc` function, no other command uses it. Should I extend it right away for all commands (well, likely only `cargo`) or just `rustc` for now is enough?

r? @jieyouxu

Author: Zalathar

src/tools/compiletest/src/runtest/run_make.rs

@@ -203,6 +203,11 @@ impl TestCx<'_> {
             // through a specific CI runner).
             .env("LLVM_COMPONENTS", &self.config.llvm_components);
 
+        if let Some(codegen_backend) = &self.config.override_codegen_backend {
+            // In case it's a different codegen backend than LLVM.
+            cmd.env("RUSTC_CODEGEN_BACKEND", codegen_backend.as_str());
+        }
+
         // The `run-make-cargo` and `build-std` suites need an in-tree `cargo`, `run-make` does not.
         if matches!(self.config.suite, TestSuite::RunMakeCargo | TestSuite::BuildStd) {
             cmd.env(

src/tools/run-make-support/src/external_deps/rustc.rs

@@ -76,6 +76,9 @@ pub fn rustc_path() -> String {
 fn setup_common() -> Command {
     let mut cmd = Command::new(rustc_path());
     set_host_compiler_dylib_path(&mut cmd);
+    if let Ok(codegen_backend) = std::env::var("RUSTC_CODEGEN_BACKEND") {
+        cmd.arg(format!("-Zcodegen-backend={codegen_backend}"));
+    }
     cmd
 }
 

tests/run-make/amdgpu-kd/rmake.rs

@@ -5,6 +5,7 @@
 
 //@ needs-llvm-components: amdgpu
 //@ needs-rust-lld
+//@ ignore-backends: gcc
 
 use run_make_support::targets::is_windows_gnu;
 use run_make_support::{llvm_readobj, rustc};

tests/run-make/atomic-lock-free/rmake.rs

@@ -2,6 +2,8 @@
 // guaranteed to be lock-free.
 
 //@ only-linux
+// FIXME: Once GCC backend is fixed, remove this `ignore-backends`.
+//@ ignore-backends: gcc
 
 use run_make_support::{llvm_components_contain, llvm_readobj, rustc};
 

tests/run-make/avr-custom-target-missing-cpu/rmake.rs

@@ -2,6 +2,7 @@
 // Make sure that reports the normal missing-CPU diagnostic instead of ICEing
 //
 //@ needs-llvm-components: avr
+//@ ignore-backends: gcc
 
 use run_make_support::rustc;
 

tests/run-make/avr-rjmp-offset/rmake.rs

@@ -1,5 +1,7 @@
 //@ needs-llvm-components: avr
 //@ needs-rust-lld
+//@ ignore-backends: gcc
+
 //! Regression test for #129301/llvm-project#106722 within `rustc`.
 //!
 //! Some LLVM-versions had wrong offsets in the local labels, causing the first

tests/run-make/branch-protection-check-IBT/rmake.rs

@@ -37,6 +37,7 @@
 // FIXME(#93754): increase the test coverage of this test.
 //@ only-x86_64-unknown-linux-gnu
 //@ ignore-cross-compile
+//@ ignore-backends: gcc
 
 use run_make_support::{bare_rustc, llvm_readobj};
 

tests/run-make/c-link-to-rust-va-list-fn/rmake.rs

@@ -8,6 +8,8 @@
 //@ ignore-sgx: (x86 machine code cannot be directly executed)
 //@ ignore-pauthtest: (it requires non-trivial compilation of c sources, and only supports dynamic
 //  linking, ignore the test).
+// FIXME: Once GCC backend is fixed, remove this `ignore-backends`.
+//@ ignore-backends: gcc
 
 use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name};
 

tests/run-make/cdylib/rmake.rs

@@ -9,6 +9,8 @@
 //     - `bar()` which implements basic addition.
 
 //@ ignore-cross-compile
+// FIXME: Once GCC backend is fixed, remove this `ignore-backends`.
+//@ ignore-backends: gcc
 
 use run_make_support::{cc, cwd, dynamic_lib_name, is_windows_msvc, rfs, run, rustc};
 

tests/run-make/codegen-options-parsing/rmake.rs

@@ -2,6 +2,8 @@
 // contain specific helpful indications.
 
 //@ ignore-cross-compile
+// FIXME: Once GCC backend is fixed, remove this `ignore-backends`.
+//@ ignore-backends: gcc
 
 use run_make_support::regex::Regex;
 use run_make_support::rustc;