From 1128453a23ee5e5c4d5b8083f145526a2ce4c0d5 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume.gomez@huawei.com>
Date: Tue, 7 May 2024 10:31:58 +0200
Subject: [PATCH] Migrate `run-make/rustdoc-map-file` to rmake

---
 .../tidy/src/allowed_run_make_makefiles.txt      |  1 -
 tests/run-make/rustdoc-map-file/Makefile         |  5 -----
 tests/run-make/rustdoc-map-file/rmake.rs         | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 tests/run-make/rustdoc-map-file/Makefile
 create mode 100644 tests/run-make/rustdoc-map-file/rmake.rs

diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
index f4ae7b06cdbb1..8ebcb439382cc 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -245,7 +245,6 @@ run-make/rlib-format-packed-bundled-libs/Makefile
 run-make/rmeta-preferred/Makefile
 run-make/rustc-macro-dep-files/Makefile
 run-make/rustdoc-io-error/Makefile
-run-make/rustdoc-map-file/Makefile
 run-make/rustdoc-output-path/Makefile
 run-make/rustdoc-scrape-examples-invalid-expr/Makefile
 run-make/rustdoc-scrape-examples-macros/Makefile
diff --git a/tests/run-make/rustdoc-map-file/Makefile b/tests/run-make/rustdoc-map-file/Makefile
deleted file mode 100644
index 5cbf7747af638..0000000000000
--- a/tests/run-make/rustdoc-map-file/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../tools.mk
-
-all:
-	$(RUSTDOC) -Z unstable-options --generate-redirect-map foo.rs -o "$(TMPDIR)/out"
-	"$(PYTHON)" validate_json.py "$(TMPDIR)/out"
diff --git a/tests/run-make/rustdoc-map-file/rmake.rs b/tests/run-make/rustdoc-map-file/rmake.rs
new file mode 100644
index 0000000000000..e32062a47db29
--- /dev/null
+++ b/tests/run-make/rustdoc-map-file/rmake.rs
@@ -0,0 +1,16 @@
+use run_make_support::{rustdoc, tmp_dir};
+use std::process::Command;
+
+fn main() {
+    let out_dir = tmp_dir().join("out");
+    rustdoc()
+        .input("foo.rs")
+        .arg("-Zunstable-options")
+        .arg("--generate-redirect-map")
+        .output(&out_dir)
+        .run();
+    let python = std::env::var("PYTHON").unwrap_or("python".into());
+    assert!(
+        Command::new(python).arg("validate_json.py").arg(&out_dir).status().unwrap().success()
+    );
+}