Skip to content

Commit ba78a9e

Browse files
committed
rewrite incr-foreign-head-span to rmake
1 parent 95dd189 commit ba78a9e

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

src/tools/compiletest/src/command-list.rs

+1
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
201201
"only-wasm32-wasip1",
202202
"only-watchos",
203203
"only-windows",
204+
"only-windows-gnu",
204205
"only-x86",
205206
"only-x86_64",
206207
"only-x86_64-fortanix-unknown-sgx",

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ run-make/foreign-double-unwind/Makefile
2424
run-make/foreign-exceptions/Makefile
2525
run-make/foreign-rust-exceptions/Makefile
2626
run-make/incr-add-rust-src-component/Makefile
27-
run-make/incr-foreign-head-span/Makefile
2827
run-make/issue-107094/Makefile
2928
run-make/issue-14698/Makefile
3029
run-make/issue-15460/Makefile

tests/run-make/incr-foreign-head-span/Makefile

-21
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Ensure that modifying a crate on disk (without recompiling it)
2+
// does not cause ICEs (internal compiler errors) in downstream crates.
3+
// Previously, we would call `SourceMap.guess_head_span` on a span
4+
// from an external crate, which would cause us to read an upstream
5+
// source file from disk during compilation of a downstream crate.
6+
// See https://github.com/rust-lang/rust/issues/86480
7+
8+
//@ ignore-none
9+
// Reason: no-std is not supported
10+
//@ ignore-nvptx64-nvidia-cuda
11+
// Reason: can't find crate for 'std'
12+
13+
use run_make_support::{rfs, rust_lib_name, rustc};
14+
15+
fn main() {
16+
rustc().input("first_crate.rs").incremental("incr").crate_type("lib").run();
17+
rustc()
18+
.input("second_crate.rs")
19+
.incremental("incr")
20+
.extern_("first_crate", rust_lib_name("first_crate"))
21+
.crate_type("lib")
22+
.run();
23+
rfs::remove_file("first_crate.rs");
24+
rustc().input("second_crate.rs").incremental("incr").cfg("second_run").crate_type("lib").run();
25+
}

tests/run-make/interdependent-c-libraries/rmake.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
// library will be stripped out, and the linkage will fail.
77
// See https://github.com/rust-lang/rust/commit/e6072fa0c4c22d62acf3dcb78c8ee260a1368bd7
88

9-
// FIXME(Oneirical): test-various
9+
//@ ignore-cross-compile
10+
// Reason: linkage still fails as the object files produced are not in the correct
11+
// format in the `build_native_static_lib` step
1012

1113
use run_make_support::{build_native_static_lib, rustc};
1214

0 commit comments

Comments
 (0)