Skip to content

Commit e6f8a83

Browse files
OneiricalOneirical
committed
Remove some allowed-makefiles
1 parent 836c08e commit e6f8a83

File tree

5 files changed

+87
-76
lines changed

5 files changed

+87
-76
lines changed

‎src/tools/run-make-support/src/run.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use std::process::{Command, Output};
44

55
use crate::is_windows;
66

7-
use super::{bin_name, handle_failed_output};
7+
use super::handle_failed_output;
88

99
fn run_common(name: &str) -> (Command, Output) {
1010
let mut bin_path = PathBuf::new();
1111
bin_path.push(env::var("TMPDIR").unwrap());
12-
bin_path.push(&bin_name(name));
12+
bin_path.push(name);
1313
let ld_lib_path_envvar = env::var("LD_LIB_PATH_ENVVAR").unwrap();
1414
let mut cmd = Command::new(bin_path);
1515
cmd.env(&ld_lib_path_envvar, {

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ run-make/allocator-shim-circular-deps/Makefile
22
run-make/allow-non-lint-warnings-cmdline/Makefile
33
run-make/archive-duplicate-names/Makefile
44
run-make/atomic-lock-free/Makefile
5-
run-make/bare-outfile/Makefile
65
run-make/branch-protection-check-IBT/Makefile
76
run-make/c-dynamic-dylib/Makefile
87
run-make/c-dynamic-rlib/Makefile
@@ -43,7 +42,6 @@ run-make/emit-path-unhashed/Makefile
4342
run-make/emit-shared-files/Makefile
4443
run-make/emit-stack-sizes/Makefile
4544
run-make/emit-to-stdout/Makefile
46-
run-make/emit/Makefile
4745
run-make/env-dep-info/Makefile
4846
run-make/error-found-staticlib-instead-crate/Makefile
4947
run-make/error-writing-dependencies/Makefile
@@ -150,7 +148,6 @@ run-make/min-global-align/Makefile
150148
run-make/mingw-export-call-convention/Makefile
151149
run-make/mismatching-target-triples/Makefile
152150
run-make/missing-crate-dependency/Makefile
153-
run-make/mixing-formats/Makefile
154151
run-make/mixing-libs/Makefile
155152
run-make/msvc-opt-minsize/Makefile
156153
run-make/multiple-emits/Makefile

‎tests/run-make/bare-outfile/rmake.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
//@ ignore-cross-compile
55

66
use run_make_support::{run, rustc, tmp_dir};
7-
use std::fs;
87
use std::env;
8+
use std::fs;
99

10-
fn main(){
11-
fs::copy("foo.rs", tmp_dir()).unwrap();
10+
fn main() {
11+
fs::copy("foo.rs", tmp_dir().join("foo.rs")).unwrap();
1212
env::set_current_dir(tmp_dir());
13-
rustc().output("foo").input("foo.rs");
13+
rustc().output("foo").input("foo.rs").run();
1414
run("foo");
1515
}

‎tests/run-make/emit/rmake.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// A bug from 2015 would cause errors when emitting multiple types of files
2-
// in the same rustc call. A fix was created in #30452. This test checks that
3-
// the fix did not accidentally break compilation.
2+
// in the same rustc call. A fix was created in #30452. This test checks that rustc still compiles
3+
// a source file successfully when emission of multiple output artifacts are requested.
44
// See https://github.com/rust-lang/rust/pull/30452
55

66
//@ ignore-cross-compile
@@ -10,10 +10,10 @@ use run_make_support::{run, rustc};
1010
fn main() {
1111
let opt_levels = ["0", "1", "2", "3", "s", "z"];
1212
for level in opt_levels {
13-
rustc().opt_level(level).emit("llvm-bc,llvm-ir,asm,obj,link").input("test-24876.rs");
13+
rustc().opt_level(level).emit("llvm-bc,llvm-ir,asm,obj,link").input("test-24876.rs").run();
1414
}
1515
for level in opt_levels {
16-
rustc().opt_level(level).emit("llvm-bc,llvm-ir,asm,obj,link").input("test-26235.rs");
16+
rustc().opt_level(level).emit("llvm-bc,llvm-ir,asm,obj,link").input("test-26235.rs").run();
1717
run("test-26235");
1818
}
1919
}

‎tests/run-make/mixing-formats/rmake.rs

+77-63
Original file line numberDiff line numberDiff line change
@@ -15,70 +15,84 @@
1515
use run_make_support::{rustc, tmp_dir};
1616
use std::fs;
1717

18+
fn test_with_teardown(rustc_calls: impl Fn()) {
19+
rustc_calls();
20+
let mut dir_entries = fs::read_dir(tmp_dir()).expect("tmp_dir not found");
21+
while let Some(entry) = dir_entries.next() {
22+
let entry = entry.expect("no entry found in tmp_dir");
23+
let path = entry.path();
24+
if path.is_dir() {
25+
fs::remove_dir_all(&path).unwrap();
26+
} else {
27+
fs::remove_file(&path).unwrap();
28+
}
29+
}
30+
}
31+
1832
fn main() {
19-
// Building just baz
20-
rustc().crate_type("rlib").input("foo.rs").run();
21-
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
22-
rustc().crate_type("dylib,rlib").input("baz.rs").arg("-Cprefer-dynamic").run();
23-
rustc().crate_type("bin").input("baz.rs").run();
24-
fs::remove_dir_all(tmp_dir()).unwrap();
25-
fs::create_dir(tmp_dir()).unwrap();
26-
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
27-
rustc().crate_type("rlib").input("bar1.rs").run();
28-
rustc().crate_type("dylib,rlib").input("baz.rs").arg("-Cprefer-dynamic").run();
29-
rustc().crate_type("bin").input("baz.rs").run();
30-
fs::remove_dir_all(tmp_dir()).unwrap();
31-
fs::create_dir(tmp_dir()).unwrap();
32-
// Building baz2
33-
rustc().crate_type("rlib").input("foo.rs").run();
34-
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
35-
rustc().crate_type("dylib").input("bar2.rs").arg("-Cprefer-dynamic").run();
36-
rustc().crate_type("dylib").input("baz2.rs").run_fail_assert_exit_code(1);
37-
rustc().crate_type("bin").input("baz2.rs").run_fail_assert_exit_code(1);
38-
fs::remove_dir_all(tmp_dir()).unwrap();
39-
fs::create_dir(tmp_dir()).unwrap();
40-
rustc().crate_type("rlib").input("foo.rs").run();
41-
rustc().crate_type("rlib").input("bar1.rs").run();
42-
rustc().crate_type("dylib").input("bar2.rs").arg("-Cprefer-dynamic").run();
43-
rustc().crate_type("dylib,rlib").input("baz2.rs").run();
44-
rustc().crate_type("bin").input("baz2.rs").run;
45-
fs::remove_dir_all(tmp_dir()).unwrap();
46-
fs::create_dir(tmp_dir()).unwrap();
47-
rustc().crate_type("rlib").input("foo.rs").run();
48-
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
49-
rustc().crate_type("rlib").input("bar2.rs").run();
50-
rustc().crate_type("dylib,rlib").input("baz2.rs").arg("-Cprefer-dynamic").run();
51-
rustc().crate_type("bin").input("baz2.rs").run();
52-
fs::remove_dir_all(tmp_dir()).unwrap();
53-
fs::create_dir(tmp_dir()).unwrap();
54-
rustc().crate_type("rlib").input("foo.rs").run();
55-
rustc().crate_type("rlib").input("bar1.rs").run();
56-
rustc().crate_type("rlib").input("bar2.rs").run();
57-
rustc().crate_type("dylib,rlib").input("baz2.rs").arg("-Cprefer-dynamic").run();
58-
rustc().crate_type("bin").input("baz2.rs").run();
59-
fs::remove_dir_all(tmp_dir()).unwrap();
60-
fs::create_dir(tmp_dir()).unwrap();
61-
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
62-
rustc().crate_type("rlib").input("bar1.rs").run();
63-
rustc().crate_type("rlib").input("bar2.rs").run();
64-
rustc().crate_type("dylib,rlib").input("baz2.rs").arg("-Cprefer-dynamic").run();
65-
rustc().crate_type("bin").input("baz2.rs").run();
66-
fs::remove_dir_all(tmp_dir()).unwrap();
67-
fs::create_dir(tmp_dir()).unwrap();
68-
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
69-
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
70-
rustc().crate_type("rlib").input("bar2.rs").run();
71-
rustc().crate_type("dylib,rlib").input("baz2.rs").run();
72-
rustc().crate_type("bin").input("baz2.rs").run();
73-
fs::remove_dir_all(tmp_dir()).unwrap();
74-
fs::create_dir(tmp_dir()).unwrap();
75-
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
76-
rustc().crate_type("rlib").input("bar1.rs").run();
77-
rustc().crate_type("dylib").input("bar2.rs").arg("-Cprefer-dynamic").run();
78-
rustc().crate_type("dylib,rlib").input("baz2.rs").run();
79-
rustc().crate_type("bin").input("baz2.rs").run();
80-
fs::remove_dir_all(tmp_dir()).unwrap();
81-
fs::create_dir(tmp_dir()).unwrap();
33+
test_with_teardown(|| {
34+
// Building just baz
35+
rustc().crate_type("rlib").input("foo.rs").run();
36+
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
37+
rustc().crate_type("dylib,rlib").input("baz.rs").arg("-Cprefer-dynamic").run();
38+
rustc().crate_type("bin").input("baz.rs").run();
39+
});
40+
test_with_teardown(|| {
41+
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
42+
rustc().crate_type("rlib").input("bar1.rs").run();
43+
rustc().crate_type("dylib,rlib").input("baz.rs").arg("-Cprefer-dynamic").run();
44+
rustc().crate_type("bin").input("baz.rs").run();
45+
});
46+
test_with_teardown(|| {
47+
// Building baz2
48+
rustc().crate_type("rlib").input("foo.rs").run();
49+
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
50+
rustc().crate_type("dylib").input("bar2.rs").arg("-Cprefer-dynamic").run();
51+
rustc().crate_type("dylib").input("baz2.rs").run_fail_assert_exit_code(1);
52+
rustc().crate_type("bin").input("baz2.rs").run_fail_assert_exit_code(1);
53+
});
54+
test_with_teardown(|| {
55+
rustc().crate_type("rlib").input("foo.rs").run();
56+
rustc().crate_type("rlib").input("bar1.rs").run();
57+
rustc().crate_type("dylib").input("bar2.rs").arg("-Cprefer-dynamic").run();
58+
rustc().crate_type("dylib,rlib").input("baz2.rs").run();
59+
rustc().crate_type("bin").input("baz2.rs").run();
60+
});
61+
test_with_teardown(|| {
62+
rustc().crate_type("rlib").input("foo.rs").run();
63+
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
64+
rustc().crate_type("rlib").input("bar2.rs").run();
65+
rustc().crate_type("dylib,rlib").input("baz2.rs").arg("-Cprefer-dynamic").run();
66+
rustc().crate_type("bin").input("baz2.rs").run();
67+
});
68+
test_with_teardown(|| {
69+
rustc().crate_type("rlib").input("foo.rs").run();
70+
rustc().crate_type("rlib").input("bar1.rs").run();
71+
rustc().crate_type("rlib").input("bar2.rs").run();
72+
rustc().crate_type("dylib,rlib").input("baz2.rs").arg("-Cprefer-dynamic").run();
73+
rustc().crate_type("bin").input("baz2.rs").run();
74+
});
75+
test_with_teardown(|| {
76+
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
77+
rustc().crate_type("rlib").input("bar1.rs").run();
78+
rustc().crate_type("rlib").input("bar2.rs").run();
79+
rustc().crate_type("dylib,rlib").input("baz2.rs").arg("-Cprefer-dynamic").run();
80+
rustc().crate_type("bin").input("baz2.rs").run();
81+
});
82+
test_with_teardown(|| {
83+
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
84+
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
85+
rustc().crate_type("rlib").input("bar2.rs").run();
86+
rustc().crate_type("dylib,rlib").input("baz2.rs").run();
87+
rustc().crate_type("bin").input("baz2.rs").run();
88+
});
89+
test_with_teardown(|| {
90+
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
91+
rustc().crate_type("rlib").input("bar1.rs").run();
92+
rustc().crate_type("dylib").input("bar2.rs").arg("-Cprefer-dynamic").run();
93+
rustc().crate_type("dylib,rlib").input("baz2.rs").run();
94+
rustc().crate_type("bin").input("baz2.rs").run();
95+
});
8296
rustc().crate_type("dylib").input("foo.rs").arg("-Cprefer-dynamic").run();
8397
rustc().crate_type("dylib").input("bar1.rs").arg("-Cprefer-dynamic").run();
8498
rustc().crate_type("dylib").input("bar2.rs").arg("-Cprefer-dynamic").run();

0 commit comments

Comments
 (0)