summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-06-22 02:21:13 +0000
committerbors <bors@rust-lang.org>2025-06-22 02:21:13 +0000
commit8051f012658fde822bfc661b52e90950b411e5c9 (patch)
tree2a746b43e7d8f2b3de1df13ea74c6b1811fee19c /tests
parentfa2f3552dae918294c8572b2a07fed2746722dd3 (diff)
parent0d4abfc7cc05c80f6d3ef6495156fe50c8900883 (diff)
downloadrust-8051f012658fde822bfc661b52e90950b411e5c9.tar.gz
rust-8051f012658fde822bfc661b52e90950b411e5c9.zip
Auto merge of #141856 - folkertdev:run-make-forward-compiletest-runner, r=jieyouxu
forward the bootstrap `runner` to `run-make`

The runner was already forwarded to `compiletest`, this just passes it on to `run-make` and uses it in the `run` functions.

The configuration can look like this

```toml
# in bootstrap.toml
[target.s390x-unknown-linux-gnu]
runner = "qemu-s390x -L /usr/s390x-linux-gnu"
```

Any C compilation automatically sets the correct target. Calls to rustc must use `.target(target())`. Then, a command like below will work by cross-compiling to the given target, and using the given runner for that target to execute the binary:

```
./x test tests/run-make/c-link-to-rust-va-list-fn --target s390x-unknown-linux-gnu
```

The runner can also be used for e.g. running with `valgrind`.

This PR also enables its use in the test case that I care about, hopefully that actually does work on the platforms that CI uses. We should probably run some try jobs to be sure?

r? `@jieyouxu`

try-job: test-various
try-job: armhf-gnu
Diffstat (limited to 'tests')
-rw-r--r--tests/run-make/c-link-to-rust-va-list-fn/rmake.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/run-make/c-link-to-rust-va-list-fn/rmake.rs b/tests/run-make/c-link-to-rust-va-list-fn/rmake.rs
index 63904bea622..426d65b7af3 100644
--- a/tests/run-make/c-link-to-rust-va-list-fn/rmake.rs
+++ b/tests/run-make/c-link-to-rust-va-list-fn/rmake.rs
@@ -3,7 +3,8 @@
 // prevent the creation of a functional binary.
 // See https://github.com/rust-lang/rust/pull/49878
 
-//@ ignore-cross-compile
+//@ needs-target-std
+//@ ignore-android: FIXME(#142855)
 
 use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name};