Skip to content

Commit

Permalink
rewrite and rename issue-107094 to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jul 16, 2024
1 parent 5a10ceb commit 9216284
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ run-make/foreign-rust-exceptions/Makefile
run-make/incr-add-rust-src-component/Makefile
run-make/incr-foreign-head-span/Makefile
run-make/interdependent-c-libraries/Makefile
run-make/issue-107094/Makefile
run-make/issue-15460/Makefile
run-make/issue-18943/Makefile
run-make/issue-22131/Makefile
Expand Down
7 changes: 0 additions & 7 deletions tests/run-make/issue-107094/Makefile

This file was deleted.

18 changes: 18 additions & 0 deletions tests/run-make/version-verbose-commit-hash/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// `--version --verbose` should display the git-commit hashes of rustc and rustdoc, but this
// functionality was lost due to #104184. After this feature was returned by #109981, this
// test ensures it will not be broken again.
// See https://github.com/rust-lang/rust/issues/107094

//@ needs-git-hash

use run_make_support::{bare_rustc, bare_rustdoc, regex};

fn main() {
let out_rustc = bare_rustc().arg("--version").arg("--verbose").run().stdout_utf8();
let out_rustdoc = bare_rustdoc().arg("--version").arg("--verbose").run().stdout_utf8();
let re =
regex::Regex::new(r#"commit-hash: [0-9a-f]{40}" "commit-date: [0-9]{4}-[0-9]{2}-[0-9]{2}"#)
.unwrap();
assert!(re.is_match(&out_rustc));
assert!(re.is_match(&out_rustdoc));
}
4 changes: 4 additions & 0 deletions tests/ui/errors/wrong-target-spec.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// The attentive may note the underscores in the target triple, making it invalid. This test
// checks that such invalid target specs are rejected by the compiler.
// See https://github.com/rust-lang/rust/issues/33329

//@ compile-flags: --target x86_64_unknown-linux-musl

fn main() {}

0 comments on commit 9216284

Please sign in to comment.