From 9ffe161ce8a016fa98b6a6d6b269691cb3a44c46 Mon Sep 17 00:00:00 2001
From: Oneirical <manchot@videotron.ca>
Date: Tue, 23 Jul 2024 15:50:25 -0400
Subject: [PATCH] rewrite raw-dylib-link-ordinal to rmake
---
.../tidy/src/allowed_run_make_makefiles.txt | 1 -
.../run-make/raw-dylib-link-ordinal/Makefile | 17 ---------
.../run-make/raw-dylib-link-ordinal/rmake.rs | 38 +++++++++++++++++++
3 files changed, 38 insertions(+), 18 deletions(-)
delete mode 100644 tests/run-make/raw-dylib-link-ordinal/Makefile
create mode 100644 tests/run-make/raw-dylib-link-ordinal/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 fb72662405c..fa4e489f902 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -41,7 +41,6 @@ run-make/print-calling-conventions/Makefile
run-make/print-target-list/Makefile
run-make/raw-dylib-alt-calling-convention/Makefile
run-make/raw-dylib-c/Makefile
-run-make/raw-dylib-link-ordinal/Makefile
run-make/raw-dylib-stdcall-ordinal/Makefile
run-make/redundant-libs/Makefile
run-make/remap-path-prefix-dwarf/Makefile
diff --git a/tests/run-make/raw-dylib-link-ordinal/Makefile b/tests/run-make/raw-dylib-link-ordinal/Makefile
deleted file mode 100644
index 3cf1300c243..00000000000
--- a/tests/run-make/raw-dylib-link-ordinal/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Test the behavior of #[link(.., kind = "raw-dylib")] and #[link_ordinal] on windows-msvc
-
-# only-windows
-
-include ../tools.mk
-
-all:
- $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
- $(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"
- $(call COMPILE_OBJ,"$(TMPDIR)"/exporter.obj,exporter.c)
-ifdef IS_MSVC
- $(CC) "$(TMPDIR)"/exporter.obj exporter.def -link -dll -out:"$(TMPDIR)"/exporter.dll -noimplib
-else
- $(CC) "$(TMPDIR)"/exporter.obj exporter.def -shared -o "$(TMPDIR)"/exporter.dll
-endif
- "$(TMPDIR)"/driver | tr -d '\r' > "$(TMPDIR)"/output.txt
- $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
diff --git a/tests/run-make/raw-dylib-link-ordinal/rmake.rs b/tests/run-make/raw-dylib-link-ordinal/rmake.rs
new file mode 100644
index 00000000000..c9bc9dea49e
--- /dev/null
+++ b/tests/run-make/raw-dylib-link-ordinal/rmake.rs
@@ -0,0 +1,38 @@
+// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the
+// attached extern block,
+// so they may be linked against without linking against an import library.
+// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md
+// `#[link_ordinal(n)]` allows Rust to link against DLLs that export symbols by ordinal rather
+// than by name. As long as the ordinal matches, the name of the function in Rust is not
+// required to match the name of the corresponding function in the exporting DLL.
+// This test checks the correctness of this feature by comparing its output against expected
+// output.
+// See https://github.com/rust-lang/rust/pull/89025
+
+//@ only-windows
+
+use run_make_support::{cc, diff, is_msvc, run, rustc};
+
+// NOTE: build_native_dynamic lib is not used, as the special `def` files
+// must be passed to the CC compiler.
+
+fn main() {
+ rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run();
+ rustc().crate_type("bin").input("driver.rs").run();
+ if is_msvc() {
+ cc().arg("-c").out_exe("exporter").input("exporter.c").run();
+ cc().input("exporter.obj")
+ .arg("exporter.msvc.def")
+ .args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"])
+ .run();
+ } else {
+ cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run();
+ cc().input("exporter.obj")
+ .arg("exporter.gnu.def")
+ .args(&["--no-leading-underscore", "-shared"])
+ .output("exporter.dll")
+ .run();
+ };
+ let out = run("driver").stdout_utf8();
+ diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
+}