rewrite and rename issue-37893 to rmake

rust-lang · May 28, 2024 · 4ccefec · 4ccefec
1 parent 4e0599d
commit 4ccefec
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -73,7 +73,6 @@ run-make/forced-unwind-terminate-pof/Makefile
 run-make/foreign-double-unwind/Makefile
 run-make/foreign-exceptions/Makefile
 run-make/foreign-rust-exceptions/Makefile
-run-make/fpic/Makefile
 run-make/glibc-staticlib-args/Makefile
 run-make/inaccessible-temp-dir/Makefile
 run-make/include_bytes_deps/Makefile
@@ -104,7 +103,6 @@ run-make/issue-33329/Makefile
 run-make/issue-35164/Makefile
 run-make/issue-36710/Makefile
 run-make/issue-37839/Makefile
-run-make/issue-37893/Makefile
 run-make/issue-40535/Makefile
 run-make/issue-47384/Makefile
 run-make/issue-47551/Makefile

diff --git a/tests/run-make/issue-37893/Makefile b/tests/run-make/issue-37893/Makefile
diff --git a/tests/run-make/issue-37893/a.rs → tests/run-make/proc-macro-init-order/a.rs b/tests/run-make/issue-37893/a.rs → tests/run-make/proc-macro-init-order/a.rs
diff --git a/tests/run-make/issue-37893/b.rs → tests/run-make/proc-macro-init-order/b.rs b/tests/run-make/issue-37893/b.rs → tests/run-make/proc-macro-init-order/b.rs
diff --git a/tests/run-make/issue-37893/c.rs → tests/run-make/proc-macro-init-order/c.rs b/tests/run-make/issue-37893/c.rs → tests/run-make/proc-macro-init-order/c.rs
diff --git a/tests/run-make/proc-macro-init-order/rmake.rs b/tests/run-make/proc-macro-init-order/rmake.rs
@@ -0,0 +1,15 @@
+// a.rs is a procedural macro crate, on which b.rs and c.rs depend. A now
+// patched bug caused a compilation failure if the proc-macro crate was
+// initialized with its dependents in this exact order. This test checks
+// that compilation succeeds even when initialization is done in this order.
+// See https://github.com/rust-lang/rust/issues/37893
+
+//@ ignore-cross-compile
+
+use run_make_support::rustc;
+
+fn main() {
+    rustc().input("a.rs").run();
+    rustc().input("b.rs").run();
+    rustc().input("c.rs").run();
+}
diff --git a/tests/ui/imports/simple-dylib-import.rs b/tests/ui/imports/simple-dylib-import.rs
@@ -2,7 +2,7 @@
 // on the dynamic library simple-dylib.rs. If the test passes,
 // dylibs can be built and linked into another file successfully..
 
-//@ aux-crate: simple-dylib.rs
+//@ aux-crate:bar=simple-dylib.rs
 //@ run-pass
 
 extern crate bar;