Skip to content

Commit

Permalink
rewrite raw-dylib-custom-dlltool to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jul 5, 2024
1 parent ae144bf commit e705973
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 12 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 @@ -119,7 +119,6 @@ run-make/profile/Makefile
run-make/prune-link-args/Makefile
run-make/raw-dylib-alt-calling-convention/Makefile
run-make/raw-dylib-c/Makefile
run-make/raw-dylib-custom-dlltool/Makefile
run-make/raw-dylib-import-name-type/Makefile
run-make/raw-dylib-link-ordinal/Makefile
run-make/raw-dylib-stdcall-ordinal/Makefile
Expand Down
11 changes: 0 additions & 11 deletions tests/run-make/raw-dylib-custom-dlltool/Makefile

This file was deleted.

25 changes: 25 additions & 0 deletions tests/run-make/raw-dylib-custom-dlltool/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Instead of using the default dlltool, the rust compiler can also accept a custom
// command file with the -C dlltool flag. This test uses it to compile some rust code
// with the raw_dylib Windows-exclusive feature, and checks that the output contains
// the string passed from the custom dlltool, confirming that the default dlltool was
// successfully overridden.
// See https://github.com/rust-lang/rust/pull/109677

//@ only-windows
//@ only-gnu
//@ needs-dlltool
// Reason: this test specifically checks the custom dlltool feature, only
// available on Windows-gnu.

use run_make_support::{diff, rustc};

fn main() {
let out = rustc()
.crate_type("lib")
.crate_name("raw_dylib_test")
.input("lib.rs")
.arg("-Cdlltool=script.cmd")
.run()
.stdout_utf8();
diff().expected_file("output.txt").actual_text("actual_text", out).run();
}

0 comments on commit e705973

Please sign in to comment.