Skip to content

Commit 634270e

Browse files
committed
rewrite mixing-deps in rmake
1 parent d9d013b commit 634270e

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ run-make/min-global-align/Makefile
156156
run-make/mingw-export-call-convention/Makefile
157157
run-make/mismatching-target-triples/Makefile
158158
run-make/missing-crate-dependency/Makefile
159-
run-make/mixing-deps/Makefile
160159
run-make/mixing-formats/Makefile
161160
run-make/mixing-libs/Makefile
162161
run-make/msvc-opt-minsize/Makefile

tests/run-make/lto-smoke/rmake.rs

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
//@ ignore-cross-compile
66

7+
use run_make_support::rustc;
8+
79
fn main() {
810
let lto_flags = ["-Clto", "-Clto=yes", "-Clto=off", "-Clto=thin", "-Clto=fat"];
911
for flag in lto_flags {

tests/run-make/mixing-deps/Makefile

-8
This file was deleted.
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// This test invokes the main function in prog.rs, which has dependencies
2+
// in both an rlib and a dylib. This test checks that these different library
3+
// types can be successfully mixed.
4+
//@ ignore-cross-compile
5+
6+
use run_make_support::{run, rustc};
7+
8+
fn main() {
9+
rustc().input("both.rs").arg("-Cprefer-dynamic").run();
10+
rustc().input("dylib.rs").arg("-Cprefer-dynamic").run();
11+
rustc().input("prog.rs").run();
12+
run("prog");
13+
}

0 commit comments

Comments
 (0)