Skip to content

Commit 51903b5

Browse files
OneiricalOneirical
committed
rewrite prune-link-args to rmake format
1 parent 2450aeb commit 51903b5

File tree

6 files changed

+64
-77
lines changed

6 files changed

+64
-77
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ run-make/pretty-print-with-dep-file/Makefile
181181
run-make/print-calling-conventions/Makefile
182182
run-make/print-target-list/Makefile
183183
run-make/profile/Makefile
184-
run-make/prune-link-args/Makefile
185184
run-make/raw-dylib-alt-calling-convention/Makefile
186185
run-make/raw-dylib-c/Makefile
187186
run-make/raw-dylib-cross-compilation/Makefile

‎tests/run-make/compiler-lookup-paths/rmake.rs‎

Lines changed: 39 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5,99 +5,75 @@
55
// fail to be used by the compiler.
66
// See https://github.com/rust-lang/rust/pull/19941
77

8-
use run_make_support::fs_wrapper;
9-
use run_make_support::{rmake_out_path, rustc};
8+
use run_make_support::{fs_wrapper, rustc};
109

1110
fn main() {
12-
assert!(rmake_out_path("libnative.a").exists());
13-
fs_wrapper::create_dir_all(rmake_out_path("crate"));
14-
fs_wrapper::create_dir_all(rmake_out_path("native"));
15-
fs_wrapper::rename(rmake_out_path("libnative.a"), rmake_out_path("native"));
11+
assert!("libnative.a".exists());
12+
fs_wrapper::create_dir_all("crate");
13+
fs_wrapper::create_dir_all("native");
14+
fs_wrapper::rename("libnative.a", "native/libnative.a");
1615
rustc().input("a.rs").run();
17-
fs_wrapper::rename(rmake_out_path("liba.a"), rmake_out_path("crate"));
18-
rustc()
19-
.input("b.rs")
20-
.specific_library_search_path("native", rmake_out_path("crate"))
21-
.run_fail();
22-
rustc()
23-
.input("b.rs")
24-
.specific_library_search_path("dependency", rmake_out_path("crate"))
25-
.run_fail();
26-
rustc().input("b.rs").specific_library_search_path("crate", rmake_out_path("crate")).run();
27-
rustc().input("b.rs").specific_library_search_path("all", rmake_out_path("crate")).run();
16+
fs_wrapper::rename("liba.a", "crate/liba.a");
17+
rustc().input("b.rs").specific_library_search_path("native", "crate").run_fail();
18+
rustc().input("b.rs").specific_library_search_path("dependency", "crate").run_fail();
19+
rustc().input("b.rs").specific_library_search_path("crate", "crate").run();
20+
rustc().input("b.rs").specific_library_search_path("all", "crate").run();
2821

29-
rustc()
30-
.input("c.rs")
31-
.specific_library_search_path("native", rmake_out_path("crate"))
32-
.run_fail();
33-
rustc().input("c.rs").specific_library_search_path("crate", rmake_out_path("crate")).run_fail();
34-
rustc().input("c.rs").specific_library_search_path("dependency", rmake_out_path("crate")).run();
35-
rustc().input("c.rs").specific_library_search_path("all", rmake_out_path("crate")).run();
22+
rustc().input("c.rs").specific_library_search_path("native", "crate").run_fail();
23+
rustc().input("c.rs").specific_library_search_path("crate", "crate").run_fail();
24+
rustc().input("c.rs").specific_library_search_path("dependency", "crate").run();
25+
rustc().input("c.rs").specific_library_search_path("all", "crate").run();
3626

37-
rustc()
38-
.input("d.rs")
39-
.specific_library_search_path("dependency", rmake_out_path("native"))
40-
.run_fail();
41-
rustc()
42-
.input("d.rs")
43-
.specific_library_search_path("crate", rmake_out_path("native"))
44-
.run_fail();
45-
rustc().input("d.rs").specific_library_search_path("native", rmake_out_path("native")).run();
46-
rustc().input("d.rs").specific_library_search_path("all", rmake_out_path("native")).run();
27+
rustc().input("d.rs").specific_library_search_path("dependency", "native").run_fail();
28+
rustc().input("d.rs").specific_library_search_path("crate", "native").run_fail();
29+
rustc().input("d.rs").specific_library_search_path("native", "native").run();
30+
rustc().input("d.rs").specific_library_search_path("all", "native").run();
4731

4832
// Deduplication tests.
49-
fs_wrapper::create_dir_all(rmake_out_path("e1"));
50-
fs_wrapper::create_dir_all(rmake_out_path("e2"));
33+
fs_wrapper::create_dir_all("e1");
34+
fs_wrapper::create_dir_all("e2");
5135

52-
rustc().input("e.rs").output(rmake_out_path("e1/libe.rlib")).run();
53-
rustc().input("e.rs").output(rmake_out_path("e2/libe.rlib")).run();
36+
rustc().input("e.rs").output("e1/libe.rlib").run();
37+
rustc().input("e.rs").output("e2/libe.rlib").run();
5438
// If the library hash is correct, compilation should succeed.
39+
rustc().input("f.rs").library_search_path("e1").library_search_path("e2").run();
5540
rustc()
5641
.input("f.rs")
57-
.library_search_path(rmake_out_path("e1"))
58-
.library_search_path(rmake_out_path("e2"))
59-
.run();
60-
rustc()
61-
.input("f.rs")
62-
.specific_library_search_path("crate", rmake_out_path("e1"))
63-
.library_search_path(rmake_out_path("e2"))
42+
.specific_library_search_path("crate", "e1")
43+
.library_search_path("e2")
6444
.run();
6545
rustc()
6646
.input("f.rs")
67-
.specific_library_search_path("crate", rmake_out_path("e1"))
68-
.specific_library_search_path("crate", rmake_out_path("e2"))
47+
.specific_library_search_path("crate", "e1")
48+
.specific_library_search_path("crate", "e2")
6949
.run();
7050
// If the library has a different hash, errors should occur.
71-
rustc().input("e2.rs").output(rmake_out_path("e2/libe.rlib")).run();
72-
rustc()
73-
.input("f.rs")
74-
.library_search_path(rmake_out_path("e1"))
75-
.library_search_path(rmake_out_path("e2"))
76-
.run_fail();
51+
rustc().input("e2.rs").output("e2/libe.rlib").run();
52+
rustc().input("f.rs").library_search_path("e1").library_search_path("e2").run_fail();
7753
rustc()
7854
.input("f.rs")
79-
.specific_library_search_path("crate", rmake_out_path("e1"))
80-
.library_search_path(rmake_out_path("e2"))
55+
.specific_library_search_path("crate", "e1")
56+
.library_search_path("e2")
8157
.run_fail();
8258
rustc()
8359
.input("f.rs")
84-
.specific_library_search_path("crate", rmake_out_path("e1"))
85-
.specific_library_search_path("crate", rmake_out_path("e2"))
60+
.specific_library_search_path("crate", "e1")
61+
.specific_library_search_path("crate", "e2")
8662
.run_fail();
8763
// Native and dependency paths do not cause errors.
8864
rustc()
8965
.input("f.rs")
90-
.specific_library_search_path("native", rmake_out_path("e1"))
91-
.library_search_path(rmake_out_path("e2"))
66+
.specific_library_search_path("native", "e1")
67+
.library_search_path("e2")
9268
.run();
9369
rustc()
9470
.input("f.rs")
95-
.specific_library_search_path("dependency", rmake_out_path("e1"))
96-
.library_search_path(rmake_out_path("e2"))
71+
.specific_library_search_path("dependency", "e1")
72+
.library_search_path("e2")
9773
.run();
9874
rustc()
9975
.input("f.rs")
100-
.specific_library_search_path("dependency", rmake_out_path("e1"))
101-
.specific_library_search_path("crate", rmake_out_path("e2"))
76+
.specific_library_search_path("dependency", "e1")
77+
.specific_library_search_path("crate", "e2")
10278
.run();
10379
}

‎tests/run-make/dump-mono-stats/rmake.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
use run_make_support::{cwd, fs_wrapper, rustc};
88

99
fn main() {
10-
rustc().crate_type("lib").input("foo.rs").dump_mono_stats(cwd()).arg("-Zdump-mono-stats-format=json").run();
11-
assert!(fs_wrapper::read_to_string("foo.mono_items.json").contains("\"name\":\"bar\"");
10+
rustc()
11+
.crate_type("lib")
12+
.input("foo.rs")
13+
.dump_mono_stats(cwd())
14+
.arg("-Zdump-mono-stats-format=json")
15+
.run();
16+
assert!(fs_wrapper::read_to_string("foo.mono_items.json").contains(r#""name":"bar""#));
1217
}

‎tests/run-make/prune-link-args/Makefile‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tests/run-make/prune-link-args/empty.rs‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/run-make/prune-link-args/rmake.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Passing link-args with an unexpected space
2+
// could result in the flag being parsed and receiving
3+
// an unexpected, empty linker argument. This test
4+
// ensures successful compilation even when a space is
5+
// present.
6+
// See https://github.com/rust-lang/rust/pull/10749
7+
8+
//@ ignore-cross-compile
9+
10+
//FIXME(Oneirical): As simple as this test is, it is not a UI test,
11+
// as the UI test parser has trouble with double quotes (").
12+
13+
use run_make_support::rustc;
14+
15+
fn main() {
16+
// Notice the space at the end of -lc, which emulates the output of pkg-config.
17+
rustc().arg(r#"-Clink-args="-lc ""#).input("empty.rs").run();
18+
}

0 commit comments

Comments
 (0)