From a4eaf879823456d5ffa3177a27359b9a2b9134e3 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume.gomez@huawei.com>
Date: Sat, 15 Jun 2024 13:00:20 +0200
Subject: [PATCH] Migrate `run-make/dep-graph` to `rmake.rs`

---
 .../tidy/src/allowed_run_make_makefiles.txt    |  1 -
 tests/run-make/dep-graph/Makefile              | 12 ------------
 tests/run-make/dep-graph/rmake.rs              | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 13 deletions(-)
 delete mode 100644 tests/run-make/dep-graph/Makefile
 create mode 100644 tests/run-make/dep-graph/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 be9df226d64e8..df536cdc030e8 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -25,7 +25,6 @@ run-make/cross-lang-lto-upstream-rlibs/Makefile
 run-make/cross-lang-lto/Makefile
 run-make/debug-assertions/Makefile
 run-make/debugger-visualizer-dep-info/Makefile
-run-make/dep-graph/Makefile
 run-make/dep-info-doesnt-run-much/Makefile
 run-make/dep-info-spaces/Makefile
 run-make/dep-info/Makefile
diff --git a/tests/run-make/dep-graph/Makefile b/tests/run-make/dep-graph/Makefile
deleted file mode 100644
index d06333f4454b0..0000000000000
--- a/tests/run-make/dep-graph/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-include ../tools.mk
-
-# ignore-cross-compile
-
-# Just verify that we successfully run and produce dep graphs when requested.
-
-all:
-	RUST_DEP_GRAPH=$(TMPDIR)/dep-graph $(RUSTC) \
-        -Cincremental=$(TMPDIR)/incr \
-        -Zquery-dep-graph -Zdump-dep-graph foo.rs
-	test -f $(TMPDIR)/dep-graph.txt
-	test -f $(TMPDIR)/dep-graph.dot
diff --git a/tests/run-make/dep-graph/rmake.rs b/tests/run-make/dep-graph/rmake.rs
new file mode 100644
index 0000000000000..351418997f1dd
--- /dev/null
+++ b/tests/run-make/dep-graph/rmake.rs
@@ -0,0 +1,18 @@
+// Just verify that we successfully run and produce dep graphs when requested.
+
+//@ ignore-cross-compile
+
+use run_make_support::{path, rustc};
+
+fn main() {
+    rustc()
+        .input("foo.rs")
+        .incremental(path("incr"))
+        .arg("-Zquery-dep-graph")
+        .arg("-Zdump-dep-graph")
+        .env("RUST_DEP_GRAPH", path("dep-graph"))
+        .run();
+
+    assert!(path("dep-graph.txt").is_file());
+    assert!(path("dep-graph.dot").is_file());
+}