Auto merge of rust-lang#138652 - ferrocene:pa-remote-test-rmake, r=<try>

Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)

try-job: armhf-gnu

Author: bors

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

@@ -12,7 +12,20 @@ fn run_common(name: &str, args: Option<&[&str]>) -> Command {
     bin_path.push(cwd());
     bin_path.push(name);
     let ld_lib_path_envvar = env_var("LD_LIB_PATH_ENVVAR");
-    let mut cmd = Command::new(bin_path);
+
+    let mut cmd = if let Some(rtc) = env::var_os("REMOTE_TEST_CLIENT") {
+        let mut cmd = Command::new(rtc);
+        cmd.arg("run");
+        // FIXME: the "0" indicates how many support files should be uploaded along with the binary
+        // to execute. If a test requires additional files to be pushed to the remote machine, this
+        // will have to be changed (and the support files will have to be uploaded).
+        cmd.arg("0");
+        cmd.arg(bin_path);
+        cmd
+    } else {
+        Command::new(bin_path)
+    };
+
     if let Some(args) = args {
         for arg in args {
             cmd.arg(arg);

tests/run-make/doctests-keep-binaries/rmake.rs

@@ -4,12 +4,12 @@
 use std::path::Path;
 
 use run_make_support::rfs::{create_dir, remove_dir_all};
-use run_make_support::{run, rustc, rustdoc};
+use run_make_support::{run, rustc, rustdoc, target};
 
 fn setup_test_env<F: FnOnce(&Path, &Path)>(callback: F) {
     let out_dir = Path::new("doctests");
     create_dir(&out_dir);
-    rustc().input("t.rs").crate_type("rlib").run();
+    rustc().target(target()).input("t.rs").crate_type("rlib").run();
     callback(&out_dir, Path::new("libt.rlib"));
     remove_dir_all(out_dir);
 }
@@ -22,6 +22,7 @@ fn check_generated_binaries() {
 fn main() {
     setup_test_env(|out_dir, extern_path| {
         rustdoc()
+            .target(target())
             .input("t.rs")
             .arg("-Zunstable-options")
             .arg("--test")
@@ -33,6 +34,7 @@ fn main() {
     });
     setup_test_env(|out_dir, extern_path| {
         rustdoc()
+            .target(target())
             .input("t.rs")
             .arg("-Zunstable-options")
             .arg("--test")
@@ -49,6 +51,7 @@ fn main() {
         create_dir(&run_dir_path);
 
         rustdoc()
+            .target(target())
             .input("t.rs")
             .arg("-Zunstable-options")
             .arg("--test")

tests/run-make/target-cpu-native/rmake.rs

@@ -3,10 +3,11 @@
 // warnings when used, and that binaries produced by it can also be successfully executed.
 // See https://github.com/rust-lang/rust/pull/23238
 
-use run_make_support::{run, rustc};
+use run_make_support::{run, rustc, target};
 
 fn main() {
-    let out = rustc().input("foo.rs").arg("-Ctarget-cpu=native").run().stderr_utf8();
+    let out =
+        rustc().target(target()).input("foo.rs").arg("-Ctarget-cpu=native").run().stderr_utf8();
     run("foo");
     // There should be zero warnings emitted - the bug would cause "unknown CPU `native`"
     // to be printed out.