Skip to content

Commit cd21022

Browse files
committed
rewrite suspicious-library in rmake
1 parent d553d5b commit cd21022

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ run-make/static-pie/Makefile
246246
run-make/staticlib-blank-lib/Makefile
247247
run-make/staticlib-dylib-linkage/Makefile
248248
run-make/std-core-cycle/Makefile
249-
run-make/suspicious-library/Makefile
250249
run-make/symbol-mangling-hashed/Makefile
251250
run-make/symbol-visibility/Makefile
252251
run-make/symbols-include-type-name/Makefile

tests/run-make/incr-prev-body-beyond-eof/rmake.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,19 @@
77
// was hashed by rustc in addition to the span length, and the fix still
88
// works.
99

10-
// FIXME: Ignore flags temporarily disabled for the test.
11-
// ignore-none
12-
// ignore-nvptx64-nvidia-cuda
13-
1410
use run_make_support::{rustc, target, tmp_dir};
1511
use std::fs;
1612

1713
fn main() {
18-
fs::create_dir(tmp_dir().join("src"));
19-
fs::create_dir(tmp_dir().join("incr"));
20-
fs::copy("a.rs", tmp_dir().join("main.rs"));
14+
fs::create_dir(tmp_dir().join("src")).unwrap();
15+
fs::create_dir(tmp_dir().join("incr")).unwrap();
16+
fs::copy("a.rs", tmp_dir().join("main.rs")).unwrap();
2117
rustc()
2218
.incremental(tmp_dir().join("incr"))
2319
.input(tmp_dir().join("src/main.rs"))
2420
.target(target())
2521
.run();
26-
fs::copy("b.rs", tmp_dir().join("main.rs"));
22+
fs::copy("b.rs", tmp_dir().join("main.rs")).unwrap();
2723
rustc()
2824
.incremental(tmp_dir().join("incr"))
2925
.input(tmp_dir().join("src/main.rs"))

tests/run-make/suspicious-library/Makefile

-8
This file was deleted.
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// This test creates some fake dynamic libraries with nothing inside,
2+
// and checks if rustc avoids them and successfully compiles as a result.
3+
4+
//@ ignore-cross-compile
5+
6+
use run_make_support::{dynamic_lib, rustc};
7+
use std::fs::File;
8+
9+
fn main() {
10+
rustc().input("foo.rs").arg("-Cprefer-dynamic").run();
11+
File::create(dynamic_lib("foo-something-special")).unwrap();
12+
File::create(dynamic_lib("foo-something-special2")).unwrap();
13+
rustc().input("bar.rs").run();
14+
}

0 commit comments

Comments
 (0)