-
Notifications
You must be signed in to change notification settings - Fork 13k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
compiletest: known-bug / crashes: allow for an "auxiliary" directory to contain files that do not have a "known-bug" directive #133013
Conversation
…to contain files that do not have a "known-bug" directive Fixes rust-lang#133009
Could not assign reviewer from: |
r? @onur-ozkan rustbot has assigned @onur-ozkan. Use |
FWIW in ui tests the aux build logic supports setup like
i.e. it's not a hard coded fixed giga aux directory. But if crashes don't support nested auxiliary I guess this logic makes sense for tidy? |
I never really planned for the |
The job Click to see the possible cause of the failure (guessed by this bot)
|
@bors r+ |
// files in "auxiliary" do not need to crash by themselves | ||
let test_path_segments = | ||
file.iter().map(|s| s.to_string_lossy().into()).collect::<Vec<String>>(); | ||
let test_path_segments_str = | ||
test_path_segments.iter().map(|s| s.as_str()).collect::<Vec<&str>>(); | ||
|
||
if !matches!(test_path_segments_str[..], [ | ||
.., | ||
"tests", | ||
"crashes", | ||
"auxiliary", | ||
_aux_file_rs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: I think the aux test file check be simplified to something like
let crashes_aux_dir_prefix = test_root.join("crashes").join("auxiliary"); // probably pass this as a ref
let is_crashes_aux_file = file.starts_with(crashes_aux_dir_prefix);
If we don't support arbitrary nested auxiliary folders in tests/crashes
.
Collecting into Vec<String>
in test_path_segments
would do a bunch of small string allocations, right?
…llaumeGomez Rollup of 5 pull requests Successful merges: - rust-lang#132010 (ci: Enable full `debuginfo-level=2` in `DEPLOY_ALT`) - rust-lang#132310 (compiletest: add `max-llvm-major-version` directive) - rust-lang#132773 (PassWrapper: disable UseOdrIndicator for Asan Win32) - rust-lang#133013 (compiletest: known-bug / crashes: allow for an "auxiliary" directory to contain files that do not have a "known-bug" directive) - rust-lang#133027 (Fix a copy-paste issue in the NuttX raw type definition) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#133013 - matthiaskrgr:crash_aux, r=onur-ozkan compiletest: known-bug / crashes: allow for an "auxiliary" directory to contain files that do not have a "known-bug" directive Fixes rust-lang#133009 r? `@jieyouxu`
Fixes #133009
r? @jieyouxu