Fix blessing of rmake tests #129040
Merged
Fix blessing of rmake tests #129040
Conversation
This file contains 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
rustbot
added
A-run-make
rustbot
added
the
T-bootstrap
|
I thought about using a different variable to communicate the path, but |
|
I'll r+ after PR CI is green |
|
Actually I can just let you r=me after PR CI is green @bors delegate+ |
|
Ideally we would want some kind of self-test, but I don't think we want to muck about in actual sources directories. |
|
Yeah, automatically testing this seems disproportionately hard, so for this PR I didn't bother. |
|
Yeah, feel free to r=me, I think we can just YOLO it (it was YOLO'd before anyway, so...) |
|
CI is green. @bors r=jieyouxu |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 13, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#128643 (Refactor `powerpc64` call ABI handling) - rust-lang#128655 (std: refactor UNIX random data generation) - rust-lang#128745 (Remove unused lifetime parameter from spawn_unchecked) - rust-lang#128841 (bootstrap: don't use rustflags for `--rustc-args`) - rust-lang#128983 (Slightly refactor `TargetSelection` in bootstrap) - rust-lang#129026 (CFI: Move CFI ui tests to cfi directory) - rust-lang#129040 (Fix blessing of rmake tests) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 13, 2024
Rollup merge of rust-lang#129040 - Zalathar:bless-rmake, r=jieyouxu Fix blessing of rmake tests Fixes rust-lang#129038. When running in `--bless` mode, we now set the value of `RUSTC_BLESS_TEST` to the current test's source directory. This allows the diff helper in `run_make_support` to find the original snapshot file in the source directory and bless that, instead of unhelpfully blessing the temporary copy in `build`. r? `@jieyouxu`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #129038.
When running in
--blessmode, we now set the value ofRUSTC_BLESS_TESTto the current test's source directory. This allows the diff helper inrun_make_supportto find the original snapshot file in the source directory and bless that, instead of unhelpfully blessing the temporary copy inbuild.r? @jieyouxu