Skip to content

Commit 158c301

Browse files
committed
rewrite version as an UI test
try fixing merge conflict also fix root_entry_limit make tidy happy remove does-nothing fix: set back to 860
1 parent ceab612 commit 158c301

File tree

6 files changed

+11
-19
lines changed

6 files changed

+11
-19
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ run-make/use-suggestions-rust-2018/Makefile
324324
run-make/used-cdylib-macos/Makefile
325325
run-make/used/Makefile
326326
run-make/valid-print-requests/Makefile
327-
run-make/version/Makefile
328327
run-make/volatile-intrinsics/Makefile
329328
run-make/wasm-exceptions-nostd/Makefile
330329
run-make/wasm-override-linker/Makefile

src/tools/tidy/src/ui_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use std::path::{Path, PathBuf};
1717
const ENTRY_LIMIT: usize = 900;
1818
// FIXME: The following limits should be reduced eventually.
1919

20-
const ISSUES_ENTRY_LIMIT: usize = 1750;
20+
const ISSUES_ENTRY_LIMIT: usize = 1733;
2121
const ROOT_ENTRY_LIMIT: usize = 860;
2222

2323
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[

tests/run-make/version/Makefile

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/ui/does-nothing.rs

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/ui/does-nothing.stderr

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
6+
//@[version] compile-flags: -V
7+
//@[verbose-version] compile-flags: -vV
8+
//@[long-verbose-version] compile-flags: --version --verbose
9+
10+
fn main() {}

0 commit comments

Comments
 (0)