rewrite and rename issue-107094 to rmake

src/tools/tidy/src/allowed_run_make_makefiles.txt

@@ -27,7 +27,6 @@ run-make/foreign-rust-exceptions/Makefile
 run-make/incr-add-rust-src-component/Makefile
 run-make/incr-foreign-head-span/Makefile
 run-make/interdependent-c-libraries/Makefile
-run-make/issue-107094/Makefile
 run-make/issue-15460/Makefile
 run-make/issue-35164/Makefile
 run-make/issue-36710/Makefile

tests/run-make/invalid-tmpdir-env-var/rmake.rs

@@ -1,18 +1,20 @@
-// When the TMP or TMPDIR variable is set to an invalid or non-existing directory,
+// When the TMP (on Windows) or TMPDIR (on Unix) variable is set to an invalid
-// this used to cause an internal compiler error (ICE). After the addition of proper
+// or non-existing directory, this used to cause an internal compiler error (ICE). After the
-// error handling in #28430, this test checks that the expected message is printed.
+// addition of proper error handling in #28430, this test checks that the expected message is
+// printed.
 // See https://github.com/rust-lang/rust/issues/14698
 
-use run_make_support::rustc;
+use run_make_support::{is_windows, rustc};
 
 // NOTE: This is not a UI test despite its simplicity, as the error message contains a path
 // with some variability that is difficult to normalize
 
 fn main() {
-    rustc()
+    let mut rustc = rustc();
-        .input("foo.rs")
+    if is_windows() {
-        .env("TMP", "fake")
+        rustc.env("TMP", "fake");
-        .env("TMPDIR", "fake")
+    } else {
-        .run_fail()
+        rustc.env("TMPDIR", "fake");
-        .assert_stderr_contains("couldn't create a temp dir");
+    }
+    rustc.input("foo.rs").run_fail().assert_stderr_contains("couldn't create a temp dir");
 }

tests/run-make/issue-107094/Makefile

@@ -1,7 +0,0 @@
-# needs-git-hash
-
-include ../tools.mk
-
-all:
-	$(BARE_RUSTC) --version --verbose | $(CGREP) -i -e "commit-hash: [0-9a-f]{40}" "commit-date: [0-9]{4}-[0-9]{2}-[0-9]{2}"
-	$(BARE_RUSTDOC) --version --verbose | $(CGREP) -i -e "commit-hash: [0-9a-f]{40}" "commit-date: [0-9]{4}-[0-9]{2}-[0-9]{2}"

tests/run-make/version-verbose-commit-hash/rmake.rs

@@ -0,0 +1,20 @@
+// `--version --verbose` should display the git-commit hashes of rustc and rustdoc, but this
+// functionality was lost due to #104184. After this feature was returned by #109981, this
+// test ensures it will not be broken again.
+// See https://github.com/rust-lang/rust/issues/107094
+
+//@ needs-git-hash
+
+use run_make_support::{bare_rustc, bare_rustdoc, regex};
+
+fn main() {
+    let out_rustc =
+        bare_rustc().arg("--version").arg("--verbose").run().stdout_utf8().to_lowercase();
+    let out_rustdoc =
+        bare_rustdoc().arg("--version").arg("--verbose").run().stdout_utf8().to_lowercase();
+    let re =
+        regex::Regex::new(r#"commit-hash: [0-9a-f]{40}\ncommit-date: [0-9]{4}-[0-9]{2}-[0-9]{2}"#)
+            .unwrap();
+    assert!(re.is_match(&out_rustc));
+    assert!(re.is_match(&out_rustdoc));
+}

tests/ui/errors/wrong-target-spec.rs

@@ -1,3 +1,8 @@
+// The attentive may note the underscores in the target triple, making it invalid. This test
+// checks that such invalid target specs are rejected by the compiler.
+// See https://github.com/rust-lang/rust/issues/33329
+
+//@ needs-llvm-components: x86
 //@ compile-flags: --target x86_64_unknown-linux-musl
 
 fn main() {}