Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3ef7697

Browse files
authoredApr 7, 2024
Unrolled build for rust-lang#123563
Rollup merge of rust-lang#123563 - Oneirical:version, r=jieyouxu Rewrite `version` test run-make as an UI test Claiming the simple `version` test from rust-lang#121876. Reasoning: As discussed in rust-lang#123297, 10 years ago, some changes to CLI flags warranted the creation of the `version` test. Since it's not actually executing the compiled binary, it has no purpose being a `run-make` test and should instead be an UI test. This is the exact same change as it was shown on my closed PR rust-lang#123297. Changes were ready, but I did a major Git mishap while trying to fix a tidy error and messed up my branch. The details of this error are explained [here](rust-lang#123297 (comment)).
2 parents aa1c459 + a9c0ffa commit 3ef7697

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed
 

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

-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ run-make/use-suggestions-rust-2018/Makefile
321321
run-make/used-cdylib-macos/Makefile
322322
run-make/used/Makefile
323323
run-make/valid-print-requests/Makefile
324-
run-make/version/Makefile
325324
run-make/volatile-intrinsics/Makefile
326325
run-make/wasm-exceptions-nostd/Makefile
327326
run-make/wasm-override-linker/Makefile

‎src/tools/tidy/src/ui_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const ENTRY_LIMIT: usize = 900;
1818
// FIXME: The following limits should be reduced eventually.
1919

2020
const ISSUES_ENTRY_LIMIT: usize = 1733;
21-
const ROOT_ENTRY_LIMIT: usize = 860;
21+
const ROOT_ENTRY_LIMIT: usize = 861;
2222

2323
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
2424
"rs", // test source files

‎tests/run-make/version/Makefile

-6
This file was deleted.
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Check that rustc accepts various version info flags.
2+
//@ dont-check-compiler-stdout
3+
//@ revisions: version verbose-version long-verbose-version
4+
//@ check-pass
5+
//@[version] compile-flags: -V
6+
//@[verbose-version] compile-flags: -vV
7+
//@[long-verbose-verison] compile-flags: --version --verbose
8+
9+
fn main() {}

0 commit comments

Comments
 (0)
Failed to load comments.