about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-01-11 21:08:10 +0100
committerGitHub <noreply@github.com>2023-01-11 21:08:10 +0100
commit106df9ec98012c6fbeb0ffe636f5f566333cfaa1 (patch)
treee4e4dd2c6720f48386d0af1c9542db946106f063
parentdce5e29edcd3f97017b67296972d18fc0423599a (diff)
parentebd33522d701c03f816f49d2e1a05d1d1078ded9 (diff)
downloadrust-106df9ec98012c6fbeb0ffe636f5f566333cfaa1.tar.gz
rust-106df9ec98012c6fbeb0ffe636f5f566333cfaa1.zip
Rollup merge of #106734 - albertlarsan68:deny-src-tests-in-tidy, r=Nilstrieb
Deny having src/test exisiting in tidy

Fixes #106724
-rw-r--r--src/tools/tidy/src/lib.rs1
-rw-r--r--src/tools/tidy/src/main.rs1
-rw-r--r--src/tools/tidy/src/tests_placement.rs15
3 files changed, 17 insertions, 0 deletions
diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs
index 15c641d748c..1eb146989e4 100644
--- a/src/tools/tidy/src/lib.rs
+++ b/src/tools/tidy/src/lib.rs
@@ -64,6 +64,7 @@ pub mod pal;
 pub mod primitive_docs;
 pub mod style;
 pub mod target_specific_tests;
+pub mod tests_placement;
 pub mod ui_tests;
 pub mod unit_tests;
 pub mod unstable_book;
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
index 2a4853b37be..79441cda64c 100644
--- a/src/tools/tidy/src/main.rs
+++ b/src/tools/tidy/src/main.rs
@@ -76,6 +76,7 @@ fn main() {
         check!(extdeps, &root_path);
 
         // Checks over tests.
+        check!(tests_placement, &root_path);
         check!(debug_artifacts, &tests_path);
         check!(ui_tests, &tests_path);
         check!(mir_opt_tests, &tests_path, bless);
diff --git a/src/tools/tidy/src/tests_placement.rs b/src/tools/tidy/src/tests_placement.rs
new file mode 100644
index 00000000000..9d0057df8bc
--- /dev/null
+++ b/src/tools/tidy/src/tests_placement.rs
@@ -0,0 +1,15 @@
+use std::path::Path;
+
+const FORBIDDEN_PATH: &str = "src/test";
+const ALLOWED_PATH: &str = "tests";
+
+pub fn check(root_path: impl AsRef<Path>, bad: &mut bool) {
+    if root_path.as_ref().join(FORBIDDEN_PATH).exists() {
+        tidy_error!(
+            bad,
+            "Tests have been moved, please move them from {} to {}",
+            root_path.as_ref().join(FORBIDDEN_PATH).display(),
+            root_path.as_ref().join(ALLOWED_PATH).display()
+        )
+    }
+}