bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rewrite raw-dylib-c to rmake

Browse source
This commit is contained in:
Oneirical 2024-07-23 13:21:41 -04:00
parent 131d453248
commit f31f8c488a
3 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View file

@ -23,7 +23,6 @@ run-make/no-alloc-shim/Makefile
run-make/pdb-buildinfo-cl-cmd/Makefile run-make/pdb-buildinfo-cl-cmd/Makefile
run-make/pgo-gen-lto/Makefile run-make/pgo-gen-lto/Makefile
run-make/pgo-indirect-call-promotion/Makefile run-make/pgo-indirect-call-promotion/Makefile
run-make/raw-dylib-c/Makefile
run-make/redundant-libs/Makefile run-make/redundant-libs/Makefile
run-make/remap-path-prefix-dwarf/Makefile run-make/remap-path-prefix-dwarf/Makefile
run-make/reproducible-build-2/Makefile run-make/reproducible-build-2/Makefile

28
tests/run-make/raw-dylib-c/Makefile
View file

@ -1,28 +0,0 @@
# Test the behavior of #[link(.., kind = "raw-dylib")] 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)"
$(RUSTC) --crate-type bin --crate-name raw_dylib_test_bin lib.rs
$(call COMPILE_OBJ,"$(TMPDIR)"/extern_1.obj,extern_1.c)
$(call COMPILE_OBJ,"$(TMPDIR)"/extern_2.obj,extern_2.c)
ifdef IS_MSVC
$(CC) "$(TMPDIR)"/extern_1.obj -link -dll -out:"$(TMPDIR)"/extern_1.dll -noimplib
$(CC) "$(TMPDIR)"/extern_2.obj -link -dll -out:"$(TMPDIR)"/extern_2.dll -noimplib
else
$(CC) "$(TMPDIR)"/extern_1.obj -shared -o "$(TMPDIR)"/extern_1.dll
$(CC) "$(TMPDIR)"/extern_2.obj -shared -o "$(TMPDIR)"/extern_2.dll
endif
"$(TMPDIR)"/driver | tr -d '\r' > "$(TMPDIR)"/output.txt
"$(TMPDIR)"/raw_dylib_test_bin > "$(TMPDIR)"/output_bin.txt
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/output.txt output.txt
else
$(DIFF) output.txt "$(TMPDIR)"/output.txt
$(DIFF) output.txt "$(TMPDIR)"/output_bin.txt
endif

29
tests/run-make/raw-dylib-c/rmake.rs Normal file
View file

@ -0,0 +1,29 @@
// `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 is the simplest of the raw-dylib tests, simply smoke-testing that the feature
// can be used to build an executable binary with an expected output with native C files
// compiling into dynamic libraries.
// See https://github.com/rust-lang/rust/pull/86419
//@ only-windows
use run_make_support::{build_native_dynamic_lib, diff, run, rustc};
fn main() {
rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run();
rustc().crate_type("bin").input("driver.rs").run();
rustc().crate_type("bin").crate_name("raw_dylib_test_bin").input("lib.rs").run();
build_native_dynamic_lib("extern_1");
build_native_dynamic_lib("extern_2");
let out_driver = run("driver").stdout_utf8();
let out_raw = run("raw_dylib_test_bin").stdout_utf8();
diff()
.expected_file("output.txt")
.actual_text("actual", out_driver)
.normalize(r#"\r"#, "")
.run();
diff().expected_file("output.txt").actual_text("actual", out_raw).run();
}