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 a couple Emscripten tests #136199

Merged
merged 3 commits into from
Jan 30, 2025
Merged

Fix a couple Emscripten tests #136199

merged 3 commits into from
Jan 30, 2025

Conversation

purplesyringa
Copy link
Contributor

This fixes a couple Emscripten tests where the correct fix is more or less obvious. A couple UI tests are still broken with this PR:

  • tests/ui/abi/numbers-arithmetic/return-float.rs (NaNs are quieted on Emscripten #136197)
  • tests/ui/no_std/no-std-unwind-binary.rs (haven't debugged yet)
  • tests/ui/test-attrs/test-passed.rs (haven't debugged this either)

@rustbot label +T-compiler +O-emscripten

@rustbot
Copy link
Collaborator

rustbot commented Jan 28, 2025

r? @chenyukang

rustbot has assigned @chenyukang.
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-compiletest Area: The compiletest test runner 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 28, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 28, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu jieyouxu self-assigned this Jan 29, 2025
jieyouxu
jieyouxu reviewed Jan 29, 2025
View reviewed changes
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, one question

tests/codegen/wasm_exceptions.rs
//@ compile-flags: -C panic=unwind
//@ compile-flags: -C panic=unwind -Z emscripten-wasm-eh
Copy link
Member

Choose a reason for hiding this comment

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

Question: how does -Z emscripten-wasm-eh affect non-emscripten wasm32 targets?

Copy link
Contributor Author

@purplesyringa purplesyringa Jan 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

It's silently ignored on anywhere but emscripten.

Copy link
Member

@jieyouxu jieyouxu Jan 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Alright (I find that behavior... interesting, as in not even a warning if the flag has no effect, but given it's an unstable flag, whatever).

jieyouxu
jieyouxu approved these changes Jan 29, 2025
View reviewed changes
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

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 29, 2025

📌 Commit 644e527 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 Jan 29, 2025
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 29, 2025
@GuillaumeGomez
Rollup merge of rust-lang#136199 - purplesyringa:emscripten-tests, r=…
e635fd2 
…jieyouxu

Fix a couple Emscripten tests

This fixes a couple Emscripten tests where the correct fix is more or less obvious. A couple UI tests are still broken with this PR:

- `tests/ui/abi/numbers-arithmetic/return-float.rs` (rust-lang#136197)
- `tests/ui/no_std/no-std-unwind-binary.rs` (haven't debugged yet)
- `tests/ui/test-attrs/test-passed.rs` (haven't debugged this either)

`@rustbot` label +T-compiler +O-emscripten
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 29, 2025
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 30, 2025
@matthiaskrgr
Rollup merge of rust-lang#136199 - purplesyringa:emscripten-tests, r=…
bbd93a5 
…jieyouxu

Fix a couple Emscripten tests

This fixes a couple Emscripten tests where the correct fix is more or less obvious. A couple UI tests are still broken with this PR:

- `tests/ui/abi/numbers-arithmetic/return-float.rs` (rust-lang#136197)
- `tests/ui/no_std/no-std-unwind-binary.rs` (haven't debugged yet)
- `tests/ui/test-attrs/test-passed.rs` (haven't debugged this either)

``@rustbot`` label +T-compiler +O-emscripten
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 30, 2025
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 30, 2025
@matthiaskrgr
Rollup merge of rust-lang#136199 - purplesyringa:emscripten-tests, r=…
f7af5ce 
…jieyouxu

Fix a couple Emscripten tests

This fixes a couple Emscripten tests where the correct fix is more or less obvious. A couple UI tests are still broken with this PR:

- `tests/ui/abi/numbers-arithmetic/return-float.rs` (rust-lang#136197)
- `tests/ui/no_std/no-std-unwind-binary.rs` (haven't debugged yet)
- `tests/ui/test-attrs/test-passed.rs` (haven't debugged this either)

```@rustbot``` label +T-compiler +O-emscripten
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 30, 2025
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 30, 2025
@matthiaskrgr
Rollup merge of rust-lang#136199 - purplesyringa:emscripten-tests, r=…
d4b4078 
…jieyouxu

Fix a couple Emscripten tests

This fixes a couple Emscripten tests where the correct fix is more or less obvious. A couple UI tests are still broken with this PR:

- `tests/ui/abi/numbers-arithmetic/return-float.rs` (rust-lang#136197)
- `tests/ui/no_std/no-std-unwind-binary.rs` (haven't debugged yet)
- `tests/ui/test-attrs/test-passed.rs` (haven't debugged this either)

````@rustbot```` label +T-compiler +O-emscripten
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 30, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2025
@bors
Auto merge of rust-lang#136285 - matthiaskrgr:rollup-v2owtsm, r=matth…
3ddd26c 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#133636 ([rustdoc] Add sans-serif font setting)
 - rust-lang#135434 (Match Ergonomics 2024: update edition 2024 behavior of feature gates)
 - rust-lang#135739 (Clean up uses of the unstable `dwarf_version` option)
 - rust-lang#135882 (simplify `similar_tokens` from `Option<Vec<_>>` to `&[_]`)
 - rust-lang#136179 (Allow transmuting generic pattern types to and from their base)
 - rust-lang#136199 (Fix a couple Emscripten tests)
 - rust-lang#136238 (ci: refactor how directories are removed in free-disk-space disk)
 - rust-lang#136251 (use impl Into<String> instead of explicit type args with bounds)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 30, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2025
@bors
Auto merge of rust-lang#136292 - matthiaskrgr:rollup-fw1tlca, r=matth…
6ac8878 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#133636 ([rustdoc] Add sans-serif font setting)
 - rust-lang#135434 (Match Ergonomics 2024: update edition 2024 behavior of feature gates)
 - rust-lang#135739 (Clean up uses of the unstable `dwarf_version` option)
 - rust-lang#135882 (simplify `similar_tokens` from `Option<Vec<_>>` to `&[_]`)
 - rust-lang#136179 (Allow transmuting generic pattern types to and from their base)
 - rust-lang#136199 (Fix a couple Emscripten tests)
 - rust-lang#136251 (use impl Into<String> instead of explicit type args with bounds)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d7668d8 into rust-lang:master Jan 30, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 30, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2025
@rust-timer
Unrolled build for rust-lang#136199
1b991ef 
Rollup merge of rust-lang#136199 - purplesyringa:emscripten-tests, r=jieyouxu

Fix a couple Emscripten tests

This fixes a couple Emscripten tests where the correct fix is more or less obvious. A couple UI tests are still broken with this PR:

- `tests/ui/abi/numbers-arithmetic/return-float.rs` (rust-lang#136197)
- `tests/ui/no_std/no-std-unwind-binary.rs` (haven't debugged yet)
- `tests/ui/test-attrs/test-passed.rs` (haven't debugged this either)

`````@rustbot````` label +T-compiler +O-emscripten
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-compiletest Area: The compiletest test runner 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.
6 participants
@purplesyringa @rustbot @rust-log-analyzer @jieyouxu @bors @chenyukang