Fix unnecessary nesting in run-make test output directories#131764
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 16, 2024
Merged
Fix unnecessary nesting in run-make test output directories#131764bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
rustbot
added
A-compiletest
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu This PR modifies cc @jieyouxu |
Member
Author
|
I tested this manually, and the directory structure and up-to-date checker appear to be working as expected. |
jieyouxu
approved these changes
Oct 16, 2024
Member
There was a problem hiding this comment.
I tested two things locally:
- That input stamping is properly preserved. I ran
./x test run-maketwice and can confirm test failures from first run (i.e. nomakeon windows) do not get incorrectly ignored on the subsequent run. - That there is no double-layering of the test output directory.
I can confirm both of these work on locally test.
Thank you!
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 16, 2024
Rollup of 10 pull requests Successful merges: - rust-lang#131582 (Add wasm32-unknown-emscripten platform support document) - rust-lang#131694 (Make fuchsia-test-runner.py compatible with new JSON output from llvm-readelf) - rust-lang#131700 (Fix match_same_arms in stable_mir) - rust-lang#131712 (Mark the unstable LazyCell::into_inner const) - rust-lang#131746 (Relax a memory order in `once_box`) - rust-lang#131754 (Don't report bivariance error when nesting a struct with field errors into another struct) - rust-lang#131760 (llvm: Match aarch64 data layout to new LLVM layout) - rust-lang#131764 (Fix unnecessary nesting in run-make test output directories) - rust-lang#131766 (Add mailmap entry for my dev-desktop setup) - rust-lang#131771 (Handle gracefully true/false in `cfg(target(..))` compact) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 16, 2024
Rollup merge of rust-lang#131764 - Zalathar:double-dir, r=jieyouxu Fix unnecessary nesting in run-make test output directories Run-make tests were using `output_base_name` to determine their output directory, which results in a redundant subdirectory (e.g. `$build/test/run-make/<foo>/<foo>/`) because that method is intended to produce the name of an individual file. The previous attempt to fix this double-nesting tried adding a special case in `output_base_dir`, which had the side-effect of breaking up-to-date checking for run-make tests, and had to be reverted in rust-lang#131681. The fix is simply to call `output_base_dir` directory, which gives the desired directory without any redundant part. r? jieyouxu
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Run-make tests were using
output_base_nameto determine their output directory, which results in a redundant subdirectory (e.g.$build/test/run-make/<foo>/<foo>/) because that method is intended to produce the name of an individual file.The previous attempt to fix this double-nesting tried adding a special case in
output_base_dir, which had the side-effect of breaking up-to-date checking for run-make tests, and had to be reverted in #131681.The fix is simply to call
output_base_dirdirectory, which gives the desired directory without any redundant part.r? jieyouxu