Skip to content

Commit 43e1a3e

Browse files
committed
Rewrite and rename issue-26006 to rmake
1 parent 6f24454 commit 43e1a3e

File tree

6 files changed

+26
-19
lines changed

6 files changed

+26
-19
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ run-make/issue-14698/Makefile
5050
run-make/issue-15460/Makefile
5151
run-make/issue-18943/Makefile
5252
run-make/issue-25581/Makefile
53-
run-make/issue-26006/Makefile
5453
run-make/issue-28595/Makefile
5554
run-make/issue-33329/Makefile
5655
run-make/issue-35164/Makefile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// In this test, the symlink created is invalid (valid relative to the root, but not
2+
// relatively to where it is located), and used to cause an internal
3+
// compiler error (ICE) when passed as a library search path. This was fixed in #26044,
4+
// and this test checks that the invalid symlink is instead simply ignored.
5+
// See https://github.com/rust-lang/rust/issues/26006
6+
7+
//FIXME(Oneirical): try it on test-various and windows
8+
9+
use run_make_support::{create_symlink, fs_wrapper, rustc};
10+
11+
fn main() {
12+
fs_wrapper::create_dir("out");
13+
fs_wrapper::create_dir("out/libc");
14+
rustc()
15+
.input("in/libc/lib.rs")
16+
.crate_name("libc")
17+
.metadata("foo")
18+
.output("out/libc/liblibc.rlib")
19+
.run();
20+
fs_wrapper::create_dir("out/time");
21+
fs_wrapper::create_dir("out/time/deps");
22+
create_symlink("out/libc/liblibc.rlib", "out/time/deps");
23+
rustc().input("in/time/lib.rs").library_search_path("dependency=out/time/deps").run();
24+
}

tests/run-make/issue-26006/Makefile

-17
This file was deleted.

tests/run-make/rustdoc-cfgspec-parsing/rmake.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
//FIXME(Oneirical): try test-various
77

8-
use run_make_support::{rustc, rustdoc};
8+
use run_make_support::{cwd, rustc, rustdoc};
99

1010
fn main() {
1111
rustc().cfg(r#"feature="bar""#).crate_type("lib").input("foo.rs").run();
1212
rustdoc()
1313
.arg("--test")
1414
.arg("--cfg")
1515
.arg(r#"feature="bar""#)
16+
.library_search_path(cwd())
1617
.input("foo.rs")
1718
.run()
1819
.assert_stdout_contains("foo.rs - foo (line 1) ... ok");

0 commit comments

Comments
 (0)