rewrite env-dep-info to rmake

Author: Oneirical

src/tools/tidy/src/allowed_run_make_makefiles.txt

@@ -26,7 +26,6 @@ run-make/dump-mono-stats/Makefile
 run-make/emit-path-unhashed/Makefile
 run-make/emit-shared-files/Makefile
 run-make/emit-to-stdout/Makefile
-run-make/env-dep-info/Makefile
 run-make/export-executable-symbols/Makefile
 run-make/extern-diff-internal-name/Makefile
 run-make/extern-flag-disambiguates/Makefile
@@ -65,7 +64,6 @@ run-make/issue-36710/Makefile
 run-make/issue-37839/Makefile
 run-make/issue-47551/Makefile
 run-make/issue-69368/Makefile
-run-make/issue-83045/Makefile
 run-make/issue-83112-incr-test-moved-file/Makefile
 run-make/issue-84395-lto-embed-bitcode/Makefile
 run-make/issue-85019-moved-src-dir/Makefile

tests/run-make/env-dep-info/Makefile

@@ -0,0 +1,29 @@
+// Inside dep-info emit files, #71858 made it so all accessed environment
+// variables are usefully printed. This test checks that this feature works
+// as intended by checking if the environment variables used in compilation
+// appear in the output dep-info files.
+// See https://github.com/rust-lang/rust/issues/40364
+
+use run_make_support::{fs_wrapper, rustc};
+
+// FIXME(Oneirical): try on musl
+
+fn main() {
+    rustc()
+        .env("EXISTING_ENV", "1")
+        .env("EXISTING_OPT_ENV", "1")
+        .emit("dep-info")
+        .input("main.rs")
+        .run();
+    let dep_info = fs_wrapper::read_to_string("main.d");
+    assert!(&dep_info.contains("# env-dep:EXISTING_ENV=1"));
+    assert!(&dep_info.contains("# env-dep:EXISTING_OPT_ENV=1"));
+    assert!(&dep_info.contains("# env-dep:NONEXISTENT_OPT_ENV"));
+    assert!(dep_info.contains(r#"# env-dep:ESCAPE\nESCAPE\\"#));
+    // Procedural macro
+    rustc().input("macro_def.rs").run();
+    rustc().env("EXISTING_PROC_MACRO_ENV", "1").emit("dep-info").input("macro_use.rs").run();
+    let dep_info = fs_wrapper::read_to_string("macro_use.d");
+    assert!(&dep_info.contains("# env-dep:EXISTING_PROC_MACRO_ENV=1"));
+    assert!(dep_info.contains("# env-dep:NONEXISTENT_PROC_MACEO_ENV"));
+}

tests/run-make/env-dep-info/rmake.rs

@@ -27,7 +27,6 @@ fn main() {
         .input("b.rs")
         .arg("--verbose")
         .run();
-    fs_wrapper::create_dir("wrong_directory");
     bare_rustc()
         .extern_("b", rust_lib_name("b"))
         .crate_type("rlib")