Skip to content

Commit

Permalink
rewrite raw-dylib-alt-calling-conventions to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Aug 5, 2024
1 parent 9179d9b commit 131d453
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 25 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 @@ -23,7 +23,6 @@ run-make/no-alloc-shim/Makefile
run-make/pdb-buildinfo-cl-cmd/Makefile
run-make/pgo-gen-lto/Makefile
run-make/pgo-indirect-call-promotion/Makefile
run-make/raw-dylib-alt-calling-convention/Makefile
run-make/raw-dylib-c/Makefile
run-make/redundant-libs/Makefile
run-make/remap-path-prefix-dwarf/Makefile
Expand Down
24 changes: 0 additions & 24 deletions tests/run-make/raw-dylib-alt-calling-convention/Makefile

This file was deleted.

28 changes: 28 additions & 0 deletions tests/run-make/raw-dylib-alt-calling-convention/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// `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
// This test uses this feature alongside alternative calling conventions, checking that both
// features are compatible and result in the expected output upon execution of the binary.
// See https://github.com/rust-lang/rust/pull/84171

//@ only-x86
//@ only-windows

use run_make_support::{build_native_dynamic_lib, diff, is_msvc, run, run_with_args, rustc};

fn main() {
rustc()
.crate_type("lib")
.crate_name("raw_dylib_alt_calling_convention_test")
.input("lib.rs")
.run();
rustc().crate_type("bin").input("driver.rs").run();
build_native_dynamic_lib("extern");
let out = run("driver").stdout_utf8();
diff().expected_file("output.txt").actual_text("actual", out).run();
if is_msvc() {
let out_msvc = run_with_args("driver", &["true"]).stdout_utf8();
diff().expected_file("output.msvc.txt").actual_text("actual", out_msvc).run();
}
}

0 comments on commit 131d453

Please sign in to comment.