run-make-support: adjust assertion printing, add some basic sanity checks#135036
Merged
bors merged 3 commits intorust-lang:masterfrom Jan 4, 2025
Merged
run-make-support: adjust assertion printing, add some basic sanity checks#135036bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
compiler-errors
approved these changes
Jan 2, 2025
Contributor
compiler-errors
left a comment
There was a problem hiding this comment.
r=me with or without nits
Contributor
|
this was very hard to diff btw lol, i had to open it in a separate diff tool 💀 |
Member
Author
|
Yeah sorry, I cooked this up hastly, should've made this into several commits. |
Member
Author
|
@rustbot author |
Avoid double-dumping or dumping even when assertion is successful.
96a6037 to
6175d73
Compare
Member
Author
|
Changes since last review:
There is only minor dump message changes (and droped the param name changes) since last review, I just tidied up the commit history to make the diff less of a pain to look at or blame. @rustbot review |
Member
Author
|
Split into several commits and addressed the nits, so @bors r=compiler-errors rollup |
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 3, 2025
…r-errors run-make-support: adjust assertion printing, add some basic sanity checks cc `@Noratrieb` I think we may have unintentionally regressed this recently and double-printed (or printed even when the assertions didn't fail). This PR should condition the detail dumps only when the assertions fail. Added some basic sanity checks for the assertions helpers except for the directory comparisons. That particular helper is not robust against symlinks, and I intend to address it in a follow-up (issue is rust-lang#135037). r? bootstrap (or compiler)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 3, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#133420 (Switch rtems target to panic unwind) - rust-lang#134965 (Make Boxy UwU) - rust-lang#135007 (Some type-outlives computation tweaks) - rust-lang#135036 (run-make-support: adjust assertion printing, add some basic sanity checks) - rust-lang#135043 (rustdoc: treat `allowed_through_unstable_modules` as deprecation) - rust-lang#135044 (Improve infer (`_`) suggestions in `const`s and `static`s) - rust-lang#135058 (refactor bootstrap path resolution) - rust-lang#135061 (crashes: add latest batch of tests) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 3, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133420 (Switch rtems target to panic unwind) - rust-lang#134965 (Make Boxy UwU) - rust-lang#135007 (Some type-outlives computation tweaks) - rust-lang#135036 (run-make-support: adjust assertion printing, add some basic sanity checks) - rust-lang#135043 (rustdoc: treat `allowed_through_unstable_modules` as deprecation) - rust-lang#135044 (Improve infer (`_`) suggestions in `const`s and `static`s) - rust-lang#135058 (refactor bootstrap path resolution) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 4, 2025
Rollup merge of rust-lang#135036 - jieyouxu:rmake-be-quiet, r=compiler-errors run-make-support: adjust assertion printing, add some basic sanity checks cc ``@Noratrieb`` I think we may have unintentionally regressed this recently and double-printed (or printed even when the assertions didn't fail). This PR should condition the detail dumps only when the assertions fail. Added some basic sanity checks for the assertions helpers except for the directory comparisons. That particular helper is not robust against symlinks, and I intend to address it in a follow-up (issue is rust-lang#135037). r? bootstrap (or compiler)
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
5 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.
cc @Noratrieb
I think we may have unintentionally regressed this recently and double-printed (or printed even when the assertions didn't fail). This PR should condition the detail dumps only when the assertions fail.
Added some basic sanity checks for the assertions helpers except for the directory comparisons. That particular helper is not robust against symlinks, and I intend to address it in a follow-up (issue is #135037).
r? bootstrap (or compiler)