1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Tue, 27 May 2025 10:39:32 +0200
Subject: test: convert version_check ui test to run-make
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
else it breaks with `rpath=false`.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
(cherry picked from commit dd148a06961e4e19a8d1788ed8c759e0394d48c9)
---
tests/run-make/version-check/rmake.rs | 13 +++++++++++++
tests/ui/feature-gates/version_check.rs | 17 -----------------
2 files changed, 13 insertions(+), 17 deletions(-)
create mode 100644 tests/run-make/version-check/rmake.rs
delete mode 100644 tests/ui/feature-gates/version_check.rs
diff --git a/tests/run-make/version-check/rmake.rs b/tests/run-make/version-check/rmake.rs
new file mode 100644
index 0000000..e6a14d2
--- /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 e212dc7..0000000
--- 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);
-}
|
