about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/tools/tidy/src/allowed_run_make_makefiles.txt1
-rw-r--r--tests/run-make/duplicate-output-flavors/Makefile5
-rw-r--r--tests/run-make/duplicate-output-flavors/rmake.rs6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
index f45e9e766a9..fdd0be79a4d 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -29,7 +29,6 @@ run-make/dep-info-spaces/Makefile
 run-make/dep-info/Makefile
 run-make/dump-ice-to-disk/Makefile
 run-make/dump-mono-stats/Makefile
-run-make/duplicate-output-flavors/Makefile
 run-make/dylib-chain/Makefile
 run-make/emit-path-unhashed/Makefile
 run-make/emit-shared-files/Makefile
diff --git a/tests/run-make/duplicate-output-flavors/Makefile b/tests/run-make/duplicate-output-flavors/Makefile
deleted file mode 100644
index e33279966c9..00000000000
--- a/tests/run-make/duplicate-output-flavors/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../tools.mk
-
-all:
-	$(RUSTC) --crate-type=rlib foo.rs
-	$(RUSTC) --crate-type=rlib,rlib foo.rs
diff --git a/tests/run-make/duplicate-output-flavors/rmake.rs b/tests/run-make/duplicate-output-flavors/rmake.rs
new file mode 100644
index 00000000000..09545228807
--- /dev/null
+++ b/tests/run-make/duplicate-output-flavors/rmake.rs
@@ -0,0 +1,6 @@
+use run_make_support::rustc;
+
+fn main() {
+    rustc().input("foo.rs").crate_type("rlib").run();
+    rustc().input("foo.rs").crate_type("rlib,rlib").run();
+}