From d882b5132637c32396f42d09038d4e9dd3b68787 Mon Sep 17 00:00:00 2001
From: Vytautas Astrauskas <vastrauskas@gmail.com>
Date: Fri, 23 Jul 2021 12:43:54 +0200
Subject: [PATCH] Move obtain-borrowck to run-make-fulldeps.

---
 .../obtain-borrowck/Makefile                  | 20 +++++++++++++++
 .../obtain-borrowck/driver.rs                 |  0
 .../obtain-borrowck/output.stdout             |  0
 .../obtain-borrowck/test.rs                   |  0
 src/test/run-make/obtain-borrowck/Makefile    | 25 -------------------
 5 files changed, 20 insertions(+), 25 deletions(-)
 create mode 100644 src/test/run-make-fulldeps/obtain-borrowck/Makefile
 rename src/test/{run-make => run-make-fulldeps}/obtain-borrowck/driver.rs (100%)
 rename src/test/{run-make => run-make-fulldeps}/obtain-borrowck/output.stdout (100%)
 rename src/test/{run-make => run-make-fulldeps}/obtain-borrowck/test.rs (100%)
 delete mode 100644 src/test/run-make/obtain-borrowck/Makefile

diff --git a/src/test/run-make-fulldeps/obtain-borrowck/Makefile b/src/test/run-make-fulldeps/obtain-borrowck/Makefile
new file mode 100644
index 000000000000..35314f2738bc
--- /dev/null
+++ b/src/test/run-make-fulldeps/obtain-borrowck/Makefile
@@ -0,0 +1,20 @@
+include ../tools.mk
+
+# This example shows how to implement a rustc driver that retrieves MIR bodies
+# together with the borrow checker information.
+
+# How to run this
+# $ ./x.py test src/test/run-make/obtain-borrowck
+
+DRIVER_BINARY := "$(TMPDIR)"/driver
+SYSROOT := $(shell $(RUSTC) --print sysroot)
+
+all:
+	$(RUSTC) driver.rs -o "$(DRIVER_BINARY)"
+	$(TARGET_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout
+
+ifdef RUSTC_BLESS_TEST
+	cp "$(TMPDIR)"/output.stdout output.stdout
+else
+	$(DIFF) output.stdout "$(TMPDIR)"/output.stdout
+endif
diff --git a/src/test/run-make/obtain-borrowck/driver.rs b/src/test/run-make-fulldeps/obtain-borrowck/driver.rs
similarity index 100%
rename from src/test/run-make/obtain-borrowck/driver.rs
rename to src/test/run-make-fulldeps/obtain-borrowck/driver.rs
diff --git a/src/test/run-make/obtain-borrowck/output.stdout b/src/test/run-make-fulldeps/obtain-borrowck/output.stdout
similarity index 100%
rename from src/test/run-make/obtain-borrowck/output.stdout
rename to src/test/run-make-fulldeps/obtain-borrowck/output.stdout
diff --git a/src/test/run-make/obtain-borrowck/test.rs b/src/test/run-make-fulldeps/obtain-borrowck/test.rs
similarity index 100%
rename from src/test/run-make/obtain-borrowck/test.rs
rename to src/test/run-make-fulldeps/obtain-borrowck/test.rs
diff --git a/src/test/run-make/obtain-borrowck/Makefile b/src/test/run-make/obtain-borrowck/Makefile
deleted file mode 100644
index ede3a9c42e77..000000000000
--- a/src/test/run-make/obtain-borrowck/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
--include ../../run-make-fulldeps/tools.mk
-
-# This example shows how to implement a rustc driver that retrieves MIR bodies
-# together with the borrow checker information.
-
-# How to run this
-# $ ./x.py test src/test/run-make/obtain-borrowck
-
-DRIVER_BINARY := "$(TMPDIR)"/driver
-BUILD_STAGE := $(RUST_BUILD_STAGE:$(TARGET)=)
-RUSTC_SRC_LIB_DEPS := $(BUILD_DIR)/$(TARGET)/$(BUILD_STAGE)rustc/release/deps/
-RUSTC_SRC_LIB := $(BUILD_DIR)/$(TARGET)/$(BUILD_STAGE)rustc/$(TARGET)/release/deps/
-SYSROOT := $(shell $(RUSTC) --print sysroot)
-DRIVER_RPATH_ENV = \
-	$(LD_LIB_PATH_ENVVAR)="${RUSTC_SRC_LIB}:$(HOST_RPATH_DIR)/rustlib/$(TARGET)/lib/:$($(LD_LIB_PATH_ENVVAR))"
-
-all:
-	$(RUSTC) -L $(RUSTC_SRC_LIB) -L $(RUSTC_SRC_LIB_DEPS) driver.rs -o "$(DRIVER_BINARY)"
-	$(DRIVER_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout
-
-ifdef RUSTC_BLESS_TEST
-	cp "$(TMPDIR)"/output.stdout output.stdout
-else
-	$(DIFF) output.stdout "$(TMPDIR)"/output.stdout
-endif