diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-07 00:51:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-07 00:51:27 +0200 |
| commit | 96dbde796ced67ac17d1dd15851cd8737bf6589a (patch) | |
| tree | ebf23d09993158f5984fd3af4ec8b9f114ca3887 | |
| parent | 7524f5e1b96b3ab5379e51a61eb2e70a587b4c7a (diff) | |
| parent | a9c0ffa35b7f93d620c0d55ced552ab1ff6cbd72 (diff) | |
| download | rust-96dbde796ced67ac17d1dd15851cd8737bf6589a.tar.gz rust-96dbde796ced67ac17d1dd15851cd8737bf6589a.zip | |
Rollup merge of #123563 - Oneirical:version, r=jieyouxu
Rewrite `version` test run-make as an UI test Claiming the simple `version` test from #121876. Reasoning: As discussed in #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 #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](https://github.com/rust-lang/rust/pull/123297#issuecomment-2041152379).
| -rw-r--r-- | src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 | ||||
| -rw-r--r-- | src/tools/tidy/src/ui_tests.rs | 2 | ||||
| -rw-r--r-- | tests/run-make/version/Makefile | 6 | ||||
| -rw-r--r-- | tests/ui/version/version-info-flags.rs | 9 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index c3ed1ff6891..dfd30d79abc 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 2d91d745daa..65ea685b37c 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 3a130545d69..00000000000 --- 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 00000000000..612113452c4 --- /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() {} |