Skip to content

Commit 9216284

Browse files
committed
rewrite and rename issue-107094 to rmake
1 parent 5a10ceb commit 9216284

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ run-make/foreign-rust-exceptions/Makefile
4343
run-make/incr-add-rust-src-component/Makefile
4444
run-make/incr-foreign-head-span/Makefile
4545
run-make/interdependent-c-libraries/Makefile
46-
run-make/issue-107094/Makefile
4746
run-make/issue-15460/Makefile
4847
run-make/issue-18943/Makefile
4948
run-make/issue-22131/Makefile

tests/run-make/issue-107094/Makefile

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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 = bare_rustc().arg("--version").arg("--verbose").run().stdout_utf8();
12+
let out_rustdoc = bare_rustdoc().arg("--version").arg("--verbose").run().stdout_utf8();
13+
let re =
14+
regex::Regex::new(r#"commit-hash: [0-9a-f]{40}" "commit-date: [0-9]{4}-[0-9]{2}-[0-9]{2}"#)
15+
.unwrap();
16+
assert!(re.is_match(&out_rustc));
17+
assert!(re.is_match(&out_rustdoc));
18+
}

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

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
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+
15
//@ compile-flags: --target x86_64_unknown-linux-musl
26

37
fn main() {}

0 commit comments

Comments
 (0)