From a9c0ffa35b7f93d620c0d55ced552ab1ff6cbd72 Mon Sep 17 00:00:00 2001 From: Oneirical Date: Sat, 6 Apr 2024 14:08:14 -0400 Subject: [PATCH] Rewrite version test as UI test fix: re-add stout ignore restore does-nothing fix: universal check-pass --- src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 - src/tools/tidy/src/ui_tests.rs | 2 +- tests/run-make/version/Makefile | 6 ------ tests/ui/version/version-info-flags.rs | 9 +++++++++ 4 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 tests/run-make/version/Makefile create mode 100644 tests/ui/version/version-info-flags.rs diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index c3ed1ff689145..dfd30d79abca9 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -321,7 +321,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 index 454811c5fbbfd..3a93bcdbe0aab 100644 --- 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 = 1733; -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 deleted file mode 100644 index 3a130545d69d3..0000000000000 --- a/tests/run-make/version/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -include ../tools.mk - -all: - $(RUSTC) -V - $(RUSTC) -vV - $(RUSTC) --version --verbose diff --git a/tests/ui/version/version-info-flags.rs b/tests/ui/version/version-info-flags.rs new file mode 100644 index 0000000000000..612113452c41f --- /dev/null +++ b/tests/ui/version/version-info-flags.rs @@ -0,0 +1,9 @@ +// Check that rustc accepts various version info flags. +//@ dont-check-compiler-stdout +//@ revisions: version verbose-version long-verbose-version +//@ check-pass +//@[version] compile-flags: -V +//@[verbose-version] compile-flags: -vV +//@[long-verbose-verison] compile-flags: --version --verbose + +fn main() {}