From cfe2d30bb46fc60af223448713c3d57ee027f34a Mon Sep 17 00:00:00 2001
From: Patrick Conrad <patrick.conrad@cherishhealth.com>
Date: Tue, 31 Aug 2021 18:06:18 -0400
Subject: Move test to run-make-fulldeps to avoid compiler flag bug

---
 .../doctests-keep-binaries/Makefile                 | 21 +++++++++++++++++++++
 .../run-make-fulldeps/doctests-keep-binaries/t.rs   | 11 +++++++++++
 src/test/run-make/doctests-keep-binaries/Makefile   | 21 ---------------------
 src/test/run-make/doctests-keep-binaries/t.rs       | 11 -----------
 4 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 src/test/run-make-fulldeps/doctests-keep-binaries/Makefile
 create mode 100644 src/test/run-make-fulldeps/doctests-keep-binaries/t.rs
 delete mode 100644 src/test/run-make/doctests-keep-binaries/Makefile
 delete mode 100644 src/test/run-make/doctests-keep-binaries/t.rs

diff --git a/src/test/run-make-fulldeps/doctests-keep-binaries/Makefile b/src/test/run-make-fulldeps/doctests-keep-binaries/Makefile
new file mode 100644
index 00000000000..273c8980b02
--- /dev/null
+++ b/src/test/run-make-fulldeps/doctests-keep-binaries/Makefile
@@ -0,0 +1,21 @@
+include ../../run-make-fulldeps/tools.mk
+
+# Check that valid binaries are persisted by running them, regardless of whether the --run or --no-run option is used.
+
+all: run no_run
+
+run:
+	mkdir -p $(TMPDIR)/doctests
+	$(RUSTC) --crate-type rlib t.rs
+	$(RUSTDOC) -Zunstable-options --test --persist-doctests $(TMPDIR)/doctests --extern t=$(TMPDIR)/libt.rlib t.rs
+	$(TMPDIR)/doctests/t_rs_2_0/rust_out
+	$(TMPDIR)/doctests/t_rs_8_0/rust_out
+	rm -rf $(TMPDIR)/doctests
+
+no_run:
+	mkdir -p $(TMPDIR)/doctests
+	$(RUSTC) --crate-type rlib t.rs
+	$(RUSTDOC) -Zunstable-options --test --persist-doctests $(TMPDIR)/doctests --extern t=$(TMPDIR)/libt.rlib t.rs --no-run
+	$(TMPDIR)/doctests/t_rs_2_0/rust_out
+	$(TMPDIR)/doctests/t_rs_8_0/rust_out
+	rm -rf $(TMPDIR)/doctests
diff --git a/src/test/run-make-fulldeps/doctests-keep-binaries/t.rs b/src/test/run-make-fulldeps/doctests-keep-binaries/t.rs
new file mode 100644
index 00000000000..c38cf0a0b25
--- /dev/null
+++ b/src/test/run-make-fulldeps/doctests-keep-binaries/t.rs
@@ -0,0 +1,11 @@
+/// Fungle the foople.
+/// ```
+/// t::foople();
+/// ```
+pub fn foople() {}
+
+/// Flomble the florp
+/// ```
+/// t::florp();
+/// ```
+pub fn florp() {}
diff --git a/src/test/run-make/doctests-keep-binaries/Makefile b/src/test/run-make/doctests-keep-binaries/Makefile
deleted file mode 100644
index 273c8980b02..00000000000
--- a/src/test/run-make/doctests-keep-binaries/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-include ../../run-make-fulldeps/tools.mk
-
-# Check that valid binaries are persisted by running them, regardless of whether the --run or --no-run option is used.
-
-all: run no_run
-
-run:
-	mkdir -p $(TMPDIR)/doctests
-	$(RUSTC) --crate-type rlib t.rs
-	$(RUSTDOC) -Zunstable-options --test --persist-doctests $(TMPDIR)/doctests --extern t=$(TMPDIR)/libt.rlib t.rs
-	$(TMPDIR)/doctests/t_rs_2_0/rust_out
-	$(TMPDIR)/doctests/t_rs_8_0/rust_out
-	rm -rf $(TMPDIR)/doctests
-
-no_run:
-	mkdir -p $(TMPDIR)/doctests
-	$(RUSTC) --crate-type rlib t.rs
-	$(RUSTDOC) -Zunstable-options --test --persist-doctests $(TMPDIR)/doctests --extern t=$(TMPDIR)/libt.rlib t.rs --no-run
-	$(TMPDIR)/doctests/t_rs_2_0/rust_out
-	$(TMPDIR)/doctests/t_rs_8_0/rust_out
-	rm -rf $(TMPDIR)/doctests
diff --git a/src/test/run-make/doctests-keep-binaries/t.rs b/src/test/run-make/doctests-keep-binaries/t.rs
deleted file mode 100644
index c38cf0a0b25..00000000000
--- a/src/test/run-make/doctests-keep-binaries/t.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-/// Fungle the foople.
-/// ```
-/// t::foople();
-/// ```
-pub fn foople() {}
-
-/// Flomble the florp
-/// ```
-/// t::florp();
-/// ```
-pub fn florp() {}
-- 
cgit 1.4.1-3-g733a5