Skip to content

Commit

Permalink
Rollup merge of #106734 - albertlarsan68:deny-src-tests-in-tidy, r=Ni…
Browse files Browse the repository at this point in the history
…lstrieb

Deny having src/test exisiting in tidy

Fixes #106724
  • Loading branch information
matthiaskrgr authored Jan 11, 2023
2 parents dce5e29 + ebd3352 commit 106df9e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/tools/tidy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/tools/tidy/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
15 changes: 15 additions & 0 deletions src/tools/tidy/src/tests_placement.rs
Original file line number Diff line number Diff line change
@@ -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()
)
}
}

0 comments on commit 106df9e

Please sign in to comment.