Skip to content

Commit 9dff8a3

Browse files
committed
rewrite mismatching-target-triples to rmake
1 parent 790c238 commit 9dff8a3

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ run-make/many-crates-but-no-match/Makefile
111111
run-make/metadata-dep-info/Makefile
112112
run-make/min-global-align/Makefile
113113
run-make/mingw-export-call-convention/Makefile
114-
run-make/mismatching-target-triples/Makefile
115114
run-make/missing-crate-dependency/Makefile
116115
run-make/mixing-libs/Makefile
117116
run-make/msvc-opt-minsize/Makefile

tests/run-make/mismatching-target-triples/Makefile

-11
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// In this test, foo links against 32-bit architecture, and then, bar, which depends
2+
// on foo, links against 64-bit architecture, causing a metadata mismatch due to the
3+
// differences in target architectures. This used to cause an internal compiler error,
4+
// now replaced by a clearer normal error message. This test checks that this aforementioned
5+
// error message is used.
6+
// See https://github.com/rust-lang/rust/issues/10814
7+
8+
use run_make_support::rustc;
9+
10+
fn main() {
11+
rustc().input("foo.rs").target("i686-unknown-linux-gnu").run();
12+
rustc().input("bar.rs").target("x86_64-unknown-linux-gnu").run_fail().assert_stderr_contains(
13+
r#"couldn't find crate `foo` with expected target triple x86_64-unknown-linux-gnu"#,
14+
);
15+
}

tests/run-make/pdb-alt-path/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// checks that no full file paths are exposed and that the override flag is respected.
66
// See https://github.com/rust-lang/rust/pull/121297
77

8-
//@ only-windows-msvc
8+
//@ only-windows
99

1010
fn main() {
1111
// Test that we don't have the full path to the PDB file in the binary

0 commit comments

Comments
 (0)