Skip to content

Commit ba20784

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#127820
Rollup merge of rust-lang#127820 - Oneirical:intestellar-travel, r=jieyouxu Rewrite and rename `issue-14698`. `issue-33329` and `issue-107094` `run-make` tests to rmake or ui Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). try-job: armhf-gnu try-job: test-various try-job: aarch64-apple try-job: x86_64-msvc
2 parents 20f23ab + 8990df7 commit ba20784

File tree

10 files changed

+50
-20
lines changed

10 files changed

+50
-20
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ run-make/foreign-rust-exceptions/Makefile
2727
run-make/incr-add-rust-src-component/Makefile
2828
run-make/incr-foreign-head-span/Makefile
2929
run-make/interdependent-c-libraries/Makefile
30-
run-make/issue-107094/Makefile
31-
run-make/issue-14698/Makefile
3230
run-make/issue-15460/Makefile
33-
run-make/issue-33329/Makefile
3431
run-make/issue-35164/Makefile
3532
run-make/issue-36710/Makefile
3633
run-make/issue-47551/Makefile

‎tests/run-make/issue-14698/foo.rs ‎tests/run-make/invalid-tmpdir-env-var/foo.rs

File renamed without changes.

‎tests/run-make/invalid-tmpdir-env-var/rmake.rs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// When the TMP (on Windows) or TMPDIR (on Unix) variable is set to an invalid
2+
// or non-existing directory, this used to cause an internal compiler error (ICE). After the
3+
// addition of proper error handling in #28430, this test checks that the expected message is
4+
// printed.
5+
// See https://github.com/rust-lang/rust/issues/14698
6+
7+
use run_make_support::{is_windows, rustc};
8+
9+
// NOTE: This is not a UI test despite its simplicity, as the error message contains a path
10+
// with some variability that is difficult to normalize
11+
12+
fn main() {
13+
let mut rustc = rustc();
14+
if is_windows() {
15+
rustc.env("TMP", "fake");
16+
} else {
17+
rustc.env("TMPDIR", "fake");
18+
}
19+
rustc.input("foo.rs").run_fail().assert_stderr_contains("couldn't create a temp dir");
20+
}

‎tests/run-make/issue-107094/Makefile

-7
This file was deleted.

‎tests/run-make/issue-14698/Makefile

-4
This file was deleted.

‎tests/run-make/issue-33329/Makefile

-5
This file was deleted.

‎tests/run-make/issue-33329/main.rs

-1
This file was deleted.

‎tests/run-make/version-verbose-commit-hash/rmake.rs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// `--version --verbose` should display the git-commit hashes of rustc and rustdoc, but this
2+
// functionality was lost due to #104184. After this feature was returned by #109981, this
3+
// test ensures it will not be broken again.
4+
// See https://github.com/rust-lang/rust/issues/107094
5+
6+
//@ needs-git-hash
7+
8+
use run_make_support::{bare_rustc, bare_rustdoc, regex};
9+
10+
fn main() {
11+
let out_rustc =
12+
bare_rustc().arg("--version").arg("--verbose").run().stdout_utf8().to_lowercase();
13+
let out_rustdoc =
14+
bare_rustdoc().arg("--version").arg("--verbose").run().stdout_utf8().to_lowercase();
15+
let re =
16+
regex::Regex::new(r#"commit-hash: [0-9a-f]{40}\ncommit-date: [0-9]{4}-[0-9]{2}-[0-9]{2}"#)
17+
.unwrap();
18+
assert!(re.is_match(&out_rustc));
19+
assert!(re.is_match(&out_rustdoc));
20+
}

‎tests/ui/errors/wrong-target-spec.rs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// The attentive may note the underscores in the target triple, making it invalid. This test
2+
// checks that such invalid target specs are rejected by the compiler.
3+
// See https://github.com/rust-lang/rust/issues/33329
4+
5+
//@ needs-llvm-components: x86
6+
//@ compile-flags: --target x86_64_unknown-linux-musl
7+
8+
fn main() {}

‎tests/ui/errors/wrong-target-spec.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
error: Error loading target specification: Could not find specification for target "x86_64_unknown-linux-musl". Run `rustc --print target-list` for a list of built-in targets
2+

0 commit comments

Comments
 (0)