Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Blessing rmake.rs tests silently does nothing #129038

Closed
Zalathar opened this issue Aug 13, 2024 · 1 comment · Fixed by #129040
Closed

Blessing rmake.rs tests silently does nothing #129038

Zalathar opened this issue Aug 13, 2024 · 1 comment · Fixed by #129040
Labels
A-run-make Area: port run-make Makefiles to rmake.rs T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Comments

@Zalathar
Copy link
Contributor

Zalathar commented Aug 13, 2024 •
edited
Loading

While working on #129037, I noticed that running an rmake.rs test with --bless appears to succeed, but doesn't actually update the snapshot file(s).

This seems to be a side-effect of #126097. The test does successfully bless the temporary copy of the snapshot file in build/, but that has no effect on the original snapshot file in tests/run-make/.
@rustbot rustbot added the needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. label Aug 13, 2024
@Zalathar
Copy link
Contributor Author

cc @jieyouxu @Kobzol
@rustbot label +A-run-make T-bootstrap

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 13, 2024
@onur-ozkan onur-ozkan removed the needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. label Aug 13, 2024
@Zalathar Zalathar mentioned this issue Aug 13, 2024
Merged
@bors bors closed this as completed in 42f70c2 Aug 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this issue Aug 13, 2024
@rust-timer
Unrolled build for rust-lang#129040
7513ebe 
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
Assignees
No one assigned
Labels
A-run-make Area: port run-make Makefiles to rmake.rs T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix blessing of rmake tests Zalathar/rust
3 participants
@Zalathar @onur-ozkan @rustbot