Skip to content

Adjust some ui tests re. target-dependent errors #140588

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

Merged
merged 4 commits into from
May 4, 2025

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented May 2, 2025

Alternatives to optional error annotations in #140586:


try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: x86_64-mingw-1
try-job: aarch64-apple
try-job: x86_64-apple-1

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 2, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented May 2, 2025

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request May 2, 2025
[EXPERIMENTAL] Alternative test adjustments

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: x86_64-mingw-1
try-job: aarch64-apple
try-job: x86_64-apple-1
@bors
Copy link
Collaborator

bors commented May 2, 2025

⌛ Trying commit b7ef8f6 with merge 446d96c...

@rust-log-analyzer

This comment has been minimized.

@bors

This comment was marked as resolved.

@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 May 2, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented May 3, 2025

@bors try

@bors
Copy link
Collaborator

bors commented May 3, 2025

⌛ Trying commit d34cce5 with merge 1cad7e5...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 3, 2025
[EXPERIMENTAL] Alternative test adjustments

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: x86_64-mingw-1
try-job: aarch64-apple
try-job: x86_64-apple-1
@rust-log-analyzer

This comment has been minimized.

@bors

This comment was marked as resolved.

@jieyouxu
Copy link
Member Author

jieyouxu commented May 3, 2025

@bors try

@bors
Copy link
Collaborator

bors commented May 3, 2025

⌛ Trying commit 48b72c5 with merge 8f0221a...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 3, 2025
[EXPERIMENTAL] Alternative test adjustments

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: x86_64-mingw-1
try-job: aarch64-apple
try-job: x86_64-apple-1
@bors
Copy link
Collaborator

bors commented May 3, 2025

☀️ Try build successful - checks-actions
Build commit: 8f0221a (8f0221a0e3d69e4d8f62bb92fcffd6a222e6c05b)

@jieyouxu jieyouxu changed the title [EXPERIMENTAL] Alternative test adjustments Adjust some ui tests re. target-dependent errors May 3, 2025
@jieyouxu jieyouxu marked this pull request as ready for review May 3, 2025 18:25
@jieyouxu
Copy link
Member Author

jieyouxu commented May 3, 2025

r? @petrochenkov
@rustbot ready

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 3, 2025
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2025
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 3, 2025

📌 Commit 48b72c5 has been approved by petrochenkov

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 May 3, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2025
Rollup of 7 pull requests

Successful merges:

 - rust-lang#139675 (Add the AVX10 target features)
 - rust-lang#140286 (Check if format argument is identifier to avoid error err-emit)
 - rust-lang#140456 (Fix test simd/extract-insert-dyn on s390x)
 - rust-lang#140551 (Move some tests out of tests/ui)
 - rust-lang#140588 (Adjust some ui tests re. target-dependent errors)
 - rust-lang#140617 (Report the `unsafe_attr_outside_unsafe` lint at the closest node)
 - rust-lang#140626 (allow `#[rustfmt::skip]` in combination with `#[naked]`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit de30d1b into rust-lang:master May 4, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 4, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2025
Rollup merge of rust-lang#140588 - jieyouxu:opt-error, r=petrochenkov

Adjust some ui tests re. target-dependent errors

Alternatives to optional error annotations in rust-lang#140586:

- Continue to ignore target-dependent additional errors in `tests/ui/panic-runtime/{two-panic-runtimes.rs,tests/ui/panic-runtime/want-abort-got-unwind.rs,tests/ui/panic-runtime/want-abort-got-unwind2.rs}` -- but explain why some targets have more errors than others.
- Use `-Cpanic=abort` for `tests/ui/cfg/cfg_false_no_std-2.rs`. In that test, the panic strategy does not matter w.r.t. test intention.
- Adjust FIXMEs in `tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-2.rs` to track it in rust-lang#140620.

---

try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: x86_64-mingw-1
try-job: aarch64-apple
try-job: x86_64-apple-1
@jieyouxu jieyouxu deleted the opt-error branch May 4, 2025 09:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants