From 8ba9f9ecf05df8cf800f928efa72a8300d90240c Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 6 Dec 2017 09:03:07 +0100 Subject: [PATCH] Tidy: allow feature-gate tests to be ui tests ui tests are the future, especially since the recent improvement where we have gained checking and requiring of //~ERROR comments. The tidy feature-gate test check is intended to be 50% an actual insurance that there is a check, and 50% to be a teacher that such checks are required. With this commit applied, newbies might interpret stuff wrongly and create tests that don't fail but succeed instead. This is not what feature gate tests are for though. Therefore, in a later step, when only ui tests are allowed to be feature gate tests, we will add checking to ensure that a file marked as gate test is actually required to be a compilation failure. Right now implementing such a check is a bit annoying as one needs to only do it when the compile-fail test is in the ui test suite :/. --- src/tools/tidy/src/features.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index 9736c039930..eca225ee8a8 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -89,7 +89,9 @@ pub fn check(path: &Path, bad: &mut bool, quiet: bool) { let mut contents = String::new(); - super::walk_many(&[&path.join("test/compile-fail"), + super::walk_many(&[&path.join("test/ui-fulldeps"), + &path.join("test/ui"), + &path.join("test/compile-fail"), &path.join("test/compile-fail-fulldeps"), &path.join("test/parse-fail"),], &mut |path| super::filter_dirs(path), @@ -150,9 +152,9 @@ pub fn check(path: &Path, bad: &mut bool, quiet: bool) { for &(name, _) in gate_untested.iter() { println!("Expected a gate test for the feature '{}'.", name); - println!("Hint: create a file named 'feature-gate-{}.rs' in the compile-fail\ - \n test suite, with its failures due to missing usage of\ - \n #![feature({})].", name, name); + println!("Hint: create a failing test file named 'feature-gate-{}.rs'\ + \n in the 'ui' test suite, with its failures due to\ + \n missing usage of #![feature({})].", name, name); println!("Hint: If you already have such a test and don't want to rename it,\ \n you can also add a // gate-test-{} line to the test file.", name); -- 2.44.0