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

Fix dump-ice-to-disk for RUSTC_ICE=0 users #128909

Merged
merged 1 commit into from
Aug 10, 2024
Merged

Fix dump-ice-to-disk for RUSTC_ICE=0 users #128909

merged 1 commit into from
Aug 10, 2024

Conversation

saethlin
Copy link
Member

Before this change, the test fails if you run it with RUSTC_ICE=0.

@rustbot
Copy link
Collaborator

rustbot commented Aug 10, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 10, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 10, 2024

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@jieyouxu
Copy link
Member

Oops, thanks!

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 10, 2024

📌 Commit f595539 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 10, 2024
@jieyouxu jieyouxu mentioned this pull request Aug 10, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 10, 2024
@bors
Auto merge of rust-lang#128916 - jieyouxu:dump-ice-dump-ice, r=<try>
ded2b46 
Tidy up `dump-ice-to-disk` and make assertion failures dump ICE messages

A bit of clean up to the `dump-ice-to-disk` test.

- Fixes/updates the top-level comment.
- Add a FIXME pointing to rust-lang#128911 for flakiness.
- Instead of trying to manually cleanup `rustc-ice*.txt` dumps, run each test instance in a separate temp directory.
- Explicitly make `RUSTC_ICE` unavailable in one of the `-Zmetrics-dir` test case to not have interference from environment.
- Make assertion failures (on ICE dump line count mismatch) extremely verbose to help debug why this test is flakey in CI (rust-lang#128911).

Contains a fix by `@saethlin` in rust-lang#128909, should wait until that is merged then rebase on top.

try-job: aarch64-gnu
try-job: aarch64-apple
try-job: x86_64-msvc
try-job: i686-mingw
try-job: test-various
@GuillaumeGomez GuillaumeGomez mentioned this pull request Aug 10, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 10, 2024
@bors
Auto merge of rust-lang#128927 - GuillaumeGomez:rollup-ei2lr0f, r=Gui…
04ba50e 
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128273 (Improve `Ord` violation help)
 - rust-lang#128807 (run-make: explaing why fmt-write-bloat is ignore-windows)
 - rust-lang#128903 (rustdoc-json-types `Discriminant`: fix typo)
 - rust-lang#128905 (gitignore: Add Zed and Helix editors)
 - rust-lang#128908 (diagnostics: do not warn when a lifetime bound infers itself)
 - rust-lang#128909 (Fix dump-ice-to-disk for RUSTC_ICE=0 users)
 - rust-lang#128910 (Differentiate between methods and associated functions in diagnostics)
 - rust-lang#128923 ([rustdoc] Stop showing impl items for negative impls)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 48fd9fd into rust-lang:master Aug 10, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 10, 2024
@rust-timer
Unrolled build for rust-lang#128909
b8de25f 
Rollup merge of rust-lang#128909 - saethlin:run-make-ice-yes, r=jieyouxu

Fix dump-ice-to-disk for RUSTC_ICE=0 users

Before this change, the test fails if you run it with `RUSTC_ICE=0`.
@saethlin saethlin deleted the run-make-ice-yes branch August 10, 2024 18:02
@jieyouxu jieyouxu mentioned this pull request Aug 11, 2024
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Aug 11, 2024
@jieyouxu
Rollup merge of rust-lang#128916 - jieyouxu:dump-ice-dump-ice, r=comp…
f5861d4 
…iler-errors

Tidy up `dump-ice-to-disk` and make assertion failures dump ICE messages

For the future traveler: **if you did a `git blame` and found this PR that last modified `dump-ice-to-disk` because the test failed in a completely unrelated PR, then I'm afraid our ICE dump may have regressed or somehow behaves differently on `i686-mingw`.**

A bit of clean up to the `dump-ice-to-disk` test.

- Fixes/updates the top-level comment.
- Add a FIXME pointing to rust-lang#128911 for flakiness.
- Instead of trying to manually cleanup `rustc-ice*.txt` dumps, run each test instance in a separate temp directory.
- Explicitly make `RUSTC_ICE` unavailable in one of the `-Zmetrics-dir` test case to not have interference from environment.
- Make assertion failures (on ICE dump line count mismatch) extremely verbose to help debug why this test is flakey in CI (rust-lang#128911).

Contains a fix by `@saethlin` in rust-lang#128909, should wait until that is merged then rebase on top.

try-job: aarch64-gnu
try-job: aarch64-apple
try-job: x86_64-msvc
try-job: i686-mingw
try-job: test-various
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Aug 11, 2024
@jieyouxu
Rollup merge of rust-lang#128916 - jieyouxu:dump-ice-dump-ice, r=comp…
e95fa51 
…iler-errors

Tidy up `dump-ice-to-disk` and make assertion failures dump ICE messages

For the future traveler: **if you did a `git blame` and found this PR that last modified `dump-ice-to-disk` because the test failed in a completely unrelated PR, then I'm afraid our ICE dump may have regressed or somehow behaves differently on `i686-mingw`.**

A bit of clean up to the `dump-ice-to-disk` test.

- Fixes/updates the top-level comment.
- Add a FIXME pointing to rust-lang#128911 for flakiness.
- Instead of trying to manually cleanup `rustc-ice*.txt` dumps, run each test instance in a separate temp directory.
- Explicitly make `RUSTC_ICE` unavailable in one of the `-Zmetrics-dir` test case to not have interference from environment.
- Make assertion failures (on ICE dump line count mismatch) extremely verbose to help debug why this test is flakey in CI (rust-lang#128911).

Contains a fix by `@saethlin` in rust-lang#128909, should wait until that is merged then rebase on top.

try-job: aarch64-gnu
try-job: aarch64-apple
try-job: x86_64-msvc
try-job: i686-mingw
try-job: test-various
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 11, 2024
@bors
Auto merge of rust-lang#128916 - jieyouxu:dump-ice-dump-ice, r=compil…
5e5ec8a 
…er-errors

Tidy up `dump-ice-to-disk` and make assertion failures dump ICE messages

For the future traveler: **if you did a `git blame` and found this PR that last modified `dump-ice-to-disk` because the test failed in a completely unrelated PR, then I'm afraid our ICE dump may have regressed or somehow behaves differently on `i686-mingw`.**

A bit of clean up to the `dump-ice-to-disk` test.

- Fixes/updates the top-level comment.
- Add a FIXME pointing to rust-lang#128911 for flakiness.
- Instead of trying to manually cleanup `rustc-ice*.txt` dumps, run each test instance in a separate temp directory.
- Explicitly make `RUSTC_ICE` unavailable in one of the `-Zmetrics-dir` test case to not have interference from environment.
- Make assertion failures (on ICE dump line count mismatch) extremely verbose to help debug why this test is flakey in CI (rust-lang#128911).

Contains a fix by `@saethlin` in rust-lang#128909, should wait until that is merged then rebase on top.

try-job: aarch64-gnu
try-job: aarch64-apple
try-job: x86_64-msvc
try-job: i686-mingw
try-job: test-various
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jieyouxu jieyouxu

Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
Oxidizing run-make tests
Status: Done
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
4 participants
@saethlin @rustbot @jieyouxu @bors