mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #122209 - onur-ozkan:fix-tidy-path-resolution, r=compiler-errors

Browse Source 
fix incorrect path resolution in tidy

Previously, reading the current path from the environment led to failure when invoking x from outside the source root. This change fixes this issue by passing the already resolved root path into `ui_tests::check`.

Fixes #122202
This commit is contained in:
Matthias Krüger 2024-03-09 16:21:18 +01:00 committed by GitHub
commit a5adac0ea3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/tidy/src/main.rs
View File

@ -102,7 +102,7 @@ fn main() {
check!(tests_placement, &root_path); check!(tests_placement, &root_path);
check!(tests_revision_unpaired_stdout_stderr, &tests_path); check!(tests_revision_unpaired_stdout_stderr, &tests_path);
check!(debug_artifacts, &tests_path); check!(debug_artifacts, &tests_path);
check!(ui_tests, &tests_path, bless); check!(ui_tests, &root_path, bless);
check!(mir_opt_tests, &tests_path, bless); check!(mir_opt_tests, &tests_path, bless);
check!(rustdoc_gui_tests, &tests_path); check!(rustdoc_gui_tests, &tests_path);
check!(rustdoc_css_themes, &librustdoc_path); check!(rustdoc_css_themes, &librustdoc_path);

5
src/tools/tidy/src/ui_tests.rs
View File

@ -99,7 +99,8 @@ fn check_entries(tests_path: &Path, bad: &mut bool) {
} }
} }
pub fn check(path: &Path, bless: bool, bad: &mut bool) { pub fn check(root_path: &Path, bless: bool, bad: &mut bool) {
let path = &root_path.join("tests");
check_entries(&path, bad); check_entries(&path, bad);
// the list of files in ui tests that are allowed to start with `issue-XXXX` // the list of files in ui tests that are allowed to start with `issue-XXXX`
@ -193,7 +194,7 @@ pub fn check(path: &Path, bless: bool, bad: &mut bool) {
*/ */
[ [
"#; "#;
let tidy_src = std::env::current_dir().unwrap().join("src/tools/tidy/src"); let tidy_src = root_path.join("src/tools/tidy/src");
// instead of overwriting the file, recreate it and use an "atomic rename" // instead of overwriting the file, recreate it and use an "atomic rename"
// so we don't bork things on panic or a contributor using Ctrl+C // so we don't bork things on panic or a contributor using Ctrl+C
let blessed_issues_path = tidy_src.join("issues_blessed.txt"); let blessed_issues_path = tidy_src.join("issues_blessed.txt");