rewrite version test in Rust

tidy: remove version from allowed_run_make_makefiles convert version to ui test simplify: only write check-pass once bump up max ROOT_ENTRY_LIMIT bump ROOT_ENTRY_LIMIT only what is required
rust-lang · Apr 3, 2024 · 5c580d3 · 5c580d3
1 parent bf71dae
commit 5c580d3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -325,7 +325,6 @@ run-make/use-suggestions-rust-2018/Makefile
 run-make/used-cdylib-macos/Makefile
 run-make/used/Makefile
 run-make/valid-print-requests/Makefile
-run-make/version/Makefile
 run-make/volatile-intrinsics/Makefile
 run-make/wasm-exceptions-nostd/Makefile
 run-make/wasm-override-linker/Makefile

diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -18,7 +18,7 @@ const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
 
 const ISSUES_ENTRY_LIMIT: usize = 1750;
-const ROOT_ENTRY_LIMIT: usize = 860;
+const ROOT_ENTRY_LIMIT: usize = 861;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files

diff --git a/tests/run-make/version/Makefile b/tests/run-make/version/Makefile
diff --git a/tests/ui/version-flags/version-info-flags.rs b/tests/ui/version-flags/version-info-flags.rs
@@ -0,0 +1,9 @@
+// Check that rustc accepts various version info flags.
+//@ revisions: version verbose-version long-verbose-version
+//@ check-pass
+
+//@[version] compile-flags: -V
+//@[verbose-version] compile-flags: -vV
+//@[long-verbose-version] compile-flags: --version --verbose
+
+fn main() {}