Skip to content

Commit e705973

Browse files
committed
rewrite raw-dylib-custom-dlltool to rmake
1 parent ae144bf commit e705973

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ run-make/profile/Makefile
119119
run-make/prune-link-args/Makefile
120120
run-make/raw-dylib-alt-calling-convention/Makefile
121121
run-make/raw-dylib-c/Makefile
122-
run-make/raw-dylib-custom-dlltool/Makefile
123122
run-make/raw-dylib-import-name-type/Makefile
124123
run-make/raw-dylib-link-ordinal/Makefile
125124
run-make/raw-dylib-stdcall-ordinal/Makefile

tests/run-make/raw-dylib-custom-dlltool/Makefile

-11
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Instead of using the default dlltool, the rust compiler can also accept a custom
2+
// command file with the -C dlltool flag. This test uses it to compile some rust code
3+
// with the raw_dylib Windows-exclusive feature, and checks that the output contains
4+
// the string passed from the custom dlltool, confirming that the default dlltool was
5+
// successfully overridden.
6+
// See https://github.com/rust-lang/rust/pull/109677
7+
8+
//@ only-windows
9+
//@ only-gnu
10+
//@ needs-dlltool
11+
// Reason: this test specifically checks the custom dlltool feature, only
12+
// available on Windows-gnu.
13+
14+
use run_make_support::{diff, rustc};
15+
16+
fn main() {
17+
let out = rustc()
18+
.crate_type("lib")
19+
.crate_name("raw_dylib_test")
20+
.input("lib.rs")
21+
.arg("-Cdlltool=script.cmd")
22+
.run()
23+
.stdout_utf8();
24+
diff().expected_file("output.txt").actual_text("actual_text", out).run();
25+
}

0 commit comments

Comments
 (0)