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.

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

Migrate dump-ice-to-disk and panic-abort-eh_frame run-make tests to rmake #127523

Merged
merged 2 commits into from
Jul 26, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 9, 2024

Part of #121876 and the associated Google Summer of Code project.

Please try:

try-job: x86_64-msvc
try-job: i686-mingw

@rustbot
Copy link
Collaborator

rustbot commented Jul 9, 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 A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 9, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 9, 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

jieyouxu commented Jul 9, 2024

@bors delegate+ (for try jobs only)

@bors
Copy link
Contributor

bors commented Jul 9, 2024

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

@jieyouxu
Copy link
Member

jieyouxu commented Jul 9, 2024

@bors try

@bors
Copy link
Contributor

bors commented Jul 9, 2024

⌛ Trying commit 7b37e2b with merge 56e4ec0...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 9, 2024
Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: aarch64-apple
try-job: x86_64-msvc
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 9, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 9, 2024
@Oneirical
Copy link
Contributor Author

Very strange... that was supposed to have been fixed by #116814. Let's try it without the assertion and with some debug logging. At least, apple does pass!
@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 9, 2024
Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 9, 2024

⌛ Trying commit fb0e011 with merge 9cd4712...

@bors
Copy link
Contributor

bors commented Jul 9, 2024

☀️ Try build successful - checks-actions
Build commit: 9cd4712 (9cd4712a81071a234459c596d88179e84562cc97)

@Oneirical
Copy link
Contributor Author

Oneirical commented Jul 9, 2024

Very well, I am removing that check for colons (:) in Windows filenames. Tell me if that is unwise.
@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 9, 2024
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the PR. I have some concerns about dump-ice-to-disk regarding test parity and a question about a FIXME in panic_abort-eh_frame.

tests/run-make/panic-abort-eh_frame/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/dump-ice-to-disk/rmake.rs Show resolved Hide resolved
tests/run-make/dump-ice-to-disk/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/dump-ice-to-disk/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/dump-ice-to-disk/check.sh Show resolved Hide resolved
tests/run-make/dump-ice-to-disk/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/dump-ice-to-disk/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 12, 2024
@bors
Copy link
Contributor

bors commented Jul 20, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 20, 2024
@tgross35
Copy link
Contributor

tgross35 commented Jul 20, 2024

Ah I didn't r- fast enough, this failed the rollup too #127991 (comment). Almost all tests except i686-mingw passed, updated the try jobs.

@bors
Copy link
Contributor

bors commented Jul 20, 2024

☔ The latest upstream changes (presumably #127663) made this pull request unmergeable. Please resolve the merge conflicts.

@Oneirical Oneirical force-pushed the treasure-test branch 2 times, most recently from e7cfc85 to 184649c Compare July 22, 2024 15:23
@Oneirical
Copy link
Contributor Author

I restored the ignore on this specific platform, let me know if that is adequate.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, the other changes look good, but the ignore on the panic-abort test is a bit interesting, I'll wait for people who are more familiar to see if it's intentional that it fails on i686-pc-windows-gnu.

Comment on lines 8 to 9
//@ ignore-i686-pc-windows-gnu
// Reason: the DW_CFA symbol appears on this specific architecture
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: cc @Nilstrieb (since you were the reviewer of #112403) and @saethlin, since I lack context for this test: is it intentional that this property is only preserved for linux, but not necessarily for i686-pc-windows-gnu, or is this a bug? The original test was only-linux but I couldn't find reasons for why it had to be only-linux other than it was impacting RfL so obviously we would want to test it on linux.

Copy link
Member

@saethlin saethlin Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The context is that everything under -Zub-checks creates non-unwinding panics, so it is a problem for RFL and quite goofy in general if enabling -Zub-checks produces new sections which are only for unwinding.

I don't know enough about this target to say whether it has this section with UB checks disabled. If it has this section with UB checks off that seems like a separate bug, we can handle that in another issue. If it gains this section when UB checks are enabled on this target specifically I would really like to know why.

Copy link
Member

@jieyouxu jieyouxu Jul 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this is intended behavior that uwtable is forced on Windows (cf. #128136 (comment)), see

Can you revert this to //@ only-linux and add a comment to that effect?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me!

@bors
Copy link
Contributor

bors commented Jul 23, 2024

☔ The latest upstream changes (presumably #128109) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, r=me after a rebase + adding the FIXME linking to #128136.

Comment on lines 8 to 9
//@ ignore-i686-pc-windows-gnu
// Reason: the DW_CFA symbol appears on this specific architecture
Copy link
Member

@jieyouxu jieyouxu Jul 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this is intended behavior that uwtable is forced on Windows (cf. #128136 (comment)), see

Can you revert this to //@ only-linux and add a comment to that effect?

@Oneirical
Copy link
Contributor Author

Oneirical commented Jul 24, 2024

Thanks, r=me after a rebase + adding the FIXME linking to #128136.

There's something weird about this. The uwtable forcing file is named windows_msvc.rs, and the test does pass on MSVC (see https://github.com/rust-lang-ci/rust/actions/runs/10017286801/job/27691281649, it's not even getting ignored). It even passes on x86 gnu-windows. It is only this one specific architecture (i686-mingw) that fails.

Given this, why would only-linux be superior to the current ignore?

@jieyouxu

This comment has been minimized.

@jieyouxu
Copy link
Member

jieyouxu commented Jul 25, 2024

Let's keep it only-linux and just document that currently uwtables are forced on windows targers (apparently they're eventually forced even on windows-gnu). AFAICT we only are trying to guarantee this property on linux, but not for Windows.

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jul 25, 2024

📌 Commit f72bf8b 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 Jul 25, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#126575 (Make it crystal clear what lint `type_alias_bounds` actually signifies)
 - rust-lang#127017 (Extend rules of dead code analysis for impls for adts to impls for types refer to adts)
 - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake)
 - rust-lang#127557 (Add a label to point to the lacking macro name definition)
 - rust-lang#127989 (Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `run-make` tests to rmake)
 - rust-lang#128099 (migrate tests/run-make/extern-flag-disambiguates to rmake)
 - rust-lang#128170 (Make Clone::clone a lang item)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 96fb354 into rust-lang:master Jul 26, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 26, 2024
@bors
Copy link
Contributor

bors commented Jul 26, 2024

⌛ Testing commit f72bf8b with merge 83d6768...

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2024
Rollup merge of rust-lang#127523 - Oneirical:treasure-test, r=jieyouxu

Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: i686-mingw
@tgross35
Copy link
Contributor

🤔 bors you tested it already

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

7 participants