From 5fe1e47f80de2c5edd63d575ad311ccbd55d8f46 Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro.albini@ferrous-systems.com>
Date: Tue, 18 Mar 2025 09:59:00 +0100
Subject: [PATCH 1/2] 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.
---
src/tools/run-make-support/src/run.rs | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/tools/run-make-support/src/run.rs b/src/tools/run-make-support/src/run.rs
index 7812863ccc2c8..60e711d340278 100644
--- a/src/tools/run-make-support/src/run.rs
+++ b/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);
From f5659f28f8a426d16c2c6f7b0ab7461958b4f0a6 Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro.albini@ferrous-systems.com>
Date: Mon, 24 Mar 2025 11:33:56 +0100
Subject: [PATCH 2/2] ignore tests broken while cross compiling
---
tests/run-make/doctests-keep-binaries/rmake.rs | 2 ++
tests/run-make/target-cpu-native/rmake.rs | 2 ++
2 files changed, 4 insertions(+)
diff --git a/tests/run-make/doctests-keep-binaries/rmake.rs b/tests/run-make/doctests-keep-binaries/rmake.rs
index 246539bcf8231..a05223994df45 100644
--- a/tests/run-make/doctests-keep-binaries/rmake.rs
+++ b/tests/run-make/doctests-keep-binaries/rmake.rs
@@ -1,3 +1,5 @@
+//@ ignore-cross-compile attempts to run the doctests
+
// Check that valid binaries are persisted by running them, regardless of whether the
// --run or --no-run option is used.
diff --git a/tests/run-make/target-cpu-native/rmake.rs b/tests/run-make/target-cpu-native/rmake.rs
index fd5fb6193fe06..7b7974f309789 100644
--- a/tests/run-make/target-cpu-native/rmake.rs
+++ b/tests/run-make/target-cpu-native/rmake.rs
@@ -3,6 +3,8 @@
// warnings when used, and that binaries produced by it can also be successfully executed.
// See https://github.com/rust-lang/rust/pull/23238
+//@ ignore-cross-compile target-cpu=native doesn't work well when cross compiling
+
use run_make_support::{run, rustc};
fn main() {