Skip to content

Commit

Permalink
rewrite raw-dylib-stdcall-ordinal to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jul 26, 2024
1 parent b9ddc2f commit fdb2e90
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 30 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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-stdcall-ordinal/Makefile
run-make/redundant-libs/Makefile
run-make/remap-path-prefix-dwarf/Makefile
run-make/reproducible-build-2/Makefile
Expand Down
5 changes: 3 additions & 2 deletions tests/run-make/raw-dylib-import-name-type/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
// 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
// This test uses this feature alongside `import_name_type`, which allows for customization
// of how Windows symbols will be named. The correctness of this feature is checked by comparison
// of how Windows symbols will be named. A sanity check of this feature is done by comparison
// with expected output.
// See https://github.com/rust-lang/rust/pull/100732

//@ only-x86
//@ only-windows
// Reason: this test specifically exercises a 32bit Windows calling convention.

use run_make_support::{cc, diff, is_msvc, run, rustc};

Expand All @@ -32,5 +33,5 @@ fn main() {
.run();
};
let out = run("driver").stdout_utf8();
diff().expected_file("output.txt").actual_text("actual", out).run();
diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
}
10 changes: 3 additions & 7 deletions tests/run-make/raw-dylib-link-ordinal/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// `#[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
// This test is a sanity check for this feature, done by comparing its output against expected
// output.
// See https://github.com/rust-lang/rust/pull/89025

Expand All @@ -22,16 +22,12 @@ fn main() {
if is_msvc() {
cc().arg("-c").out_exe("exporter").input("exporter.c").run();
cc().input("exporter.obj")
.arg("exporter.msvc.def")
.arg("exporter.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();
cc().input("exporter.obj").arg("exporter.def").arg("-shared").output("exporter.dll").run();
};
let out = run("driver").stdout_utf8();
diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
Expand Down
18 changes: 0 additions & 18 deletions tests/run-make/raw-dylib-stdcall-ordinal/Makefile

This file was deleted.

41 changes: 41 additions & 0 deletions tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// `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
// Almost identical to `raw-dylib-link-ordinal`, but with the addition of calling conventions,
// such as stdcall.
// See https://github.com/rust-lang/rust/pull/90782

//@ only-x86
//@ only-windows
// Reason: this test specifically exercises a 32bit Windows calling convention.

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")
.arg("-shared")
.output("exporter.dll")
.run();
};
let out = run("driver").stdout_utf8();
diff()
.expected_file("expected_output.txt")
.actual_text("actual", out)
.normalize(r#"\r"#, "")
.run();
}
2 changes: 0 additions & 2 deletions tests/run-make/share-generics-dylib/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
//
// This is regression test for https://github.com/rust-lang/rust/issues/67276.

//FIXME(Oneirical): ignore-cross-compile

use run_make_support::rustc;

fn main() {
Expand Down

0 comments on commit fdb2e90

Please sign in to comment.