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

Fix some test annotations #97920

Merged
merged 1 commit into from
Jun 13, 2022
Merged

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jun 9, 2022

These are necessary for running the rustc test suite with cg_clif.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 9, 2022
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2022
@bjorn3 bjorn3 force-pushed the test_annotation_fixes branch from 0dbfd3d to 6afcd27 Compare June 9, 2022 16:35
@Dylan-DPC
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 12, 2022

📌 Commit 6afcd27 has been approved by Dylan-DPC

@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 Jun 12, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 12, 2022
…an-DPC

Fix some test annotations

These are necessary for running the rustc test suite with cg_clif.
@Dylan-DPC
Copy link
Member

fails in rollup

@Dylan-DPC
Copy link
Member

@bors r-

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 12, 2022
These are necessary for running the rustc test suite with cg_clif
@bjorn3 bjorn3 force-pushed the test_annotation_fixes branch from 6afcd27 to 2f47edb Compare June 12, 2022 13:15
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 12, 2022

I thought I could drop the wasm ignore annotations when adding needs-unwind, but it seems not. Reverted that change.

@Dylan-DPC
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 12, 2022

📌 Commit 2f47edb has been approved by Dylan-DPC

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 12, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 12, 2022
…an-DPC

Fix some test annotations

These are necessary for running the rustc test suite with cg_clif.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2022
…piler-errors

Rollup of 3 pull requests

Successful merges:

 - rust-lang#97920 (Fix some test annotations)
 - rust-lang#97950 (Clarify `#[derive(PartialEq)]` on enums)
 - rust-lang#98011 (Add documentation for error E0208)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6efaaed into rust-lang:master Jun 13, 2022
@bors
Copy link
Contributor

bors commented Jun 13, 2022

⌛ Testing commit 2f47edb with merge c570ab5...

@rustbot rustbot added this to the 1.63.0 milestone Jun 13, 2022
@bjorn3 bjorn3 deleted the test_annotation_fixes branch June 14, 2022 09:58
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.

6 participants