diff options
| author | Fabian Grünbichler <f.gruenbichler@proxmox.com> | 2025-05-27 10:39:32 +0200 |
|---|---|---|
| committer | Fabian Grünbichler <f.gruenbichler@proxmox.com> | 2025-05-27 11:12:15 +0200 |
| commit | dd148a06961e4e19a8d1788ed8c759e0394d48c9 (patch) | |
| tree | fa9799c3172f174899ef11ec9a371110ae197d24 | |
| parent | d76fe154029e03aeb64af721beafdcef856d576a (diff) | |
| download | rust-dd148a06961e4e19a8d1788ed8c759e0394d48c9.tar.gz rust-dd148a06961e4e19a8d1788ed8c759e0394d48c9.zip | |
test: convert version_check ui test to run-make
else it breaks with `rpath=false`. Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
| -rw-r--r-- | tests/run-make/version-check/rmake.rs | 13 | ||||
| -rw-r--r-- | tests/ui/feature-gates/version_check.rs | 17 |
2 files changed, 13 insertions, 17 deletions
diff --git a/tests/run-make/version-check/rmake.rs b/tests/run-make/version-check/rmake.rs new file mode 100644 index 00000000000..e6a14d2e95c --- /dev/null +++ b/tests/run-make/version-check/rmake.rs @@ -0,0 +1,13 @@ +use run_make_support::bare_rustc; + +fn main() { + let signalled_version = "Ceci n'est pas une rustc"; + let rustc_out = bare_rustc() + .env("RUSTC_OVERRIDE_VERSION_STRING", signalled_version) + .arg("--version") + .run() + .stdout_utf8(); + + let version = rustc_out.strip_prefix("rustc ").unwrap().trim_end(); + assert_eq!(version, signalled_version); +} diff --git a/tests/ui/feature-gates/version_check.rs b/tests/ui/feature-gates/version_check.rs deleted file mode 100644 index e212dc74fd1..00000000000 --- a/tests/ui/feature-gates/version_check.rs +++ /dev/null @@ -1,17 +0,0 @@ -//@ run-pass -//@ only-linux -//@ only-x86 -// FIXME: this should be more like //@ needs-subprocesses -use std::process::Command; - -fn main() { - let signalled_version = "Ceci n'est pas une rustc"; - let version = Command::new(std::env::var_os("RUSTC").unwrap()) - .env("RUSTC_OVERRIDE_VERSION_STRING", signalled_version) - .arg("--version") - .output() - .unwrap() - .stdout; - let version = std::str::from_utf8(&version).unwrap().strip_prefix("rustc ").unwrap().trim_end(); - assert_eq!(version, signalled_version); -} |
