Detect panic strategy using `rustc --print cfg` by flba-eb · Pull Request #102134 · rust-lang/rust

flba-eb · 2022-09-22T10:51:19Z

Instead of relying on a command line parameter, detect if a target is able to unwind or not.
Ignore tests that require unwinding on targets that don't support it.

I did not find any place where the removed parameter has been used, but it feels a bit risky as
I'm new to this test framework.

r? bjorn3

rust-highfive · 2022-09-22T10:51:22Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jyn514 (or someone else) soon.

Please see the contribution instructions for more information.

flba-eb · 2022-09-22T11:01:54Z

r? @bjorn3

bjorn3 · 2022-09-22T11:06:02Z

Could you try removing all test directives that exclude wasm32 when this is done because of unwinding not being supported on wasm? And maybe see if the same is done for other platforms? That would also allow testing this PR works in the first place.

src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs

bjorn3

r=me with the above comment fixed.

bjorn3 · 2022-09-22T15:55:22Z

@bors r+

bors · 2022-09-22T15:55:24Z

📌 Commit 676f62f has been approved by bjorn3

It is now in the queue for this repository.

Detect panic strategy using `rustc --print cfg` Instead of relying on a command line parameter, detect if a target is able to unwind or not. Ignore tests that require unwinding on targets that don't support it. I did not find any place where the removed parameter has been used, but it feels a bit risky as I'm new to this test framework. r? bjorn3

matthiaskrgr · 2022-09-23T02:27:39Z

@bors r- failed in a rollup
https://github.com/rust-lang-ci/rust/actions/runs/3109749706/jobs/5040258469#step:25:15729

Instead of relying on a command line parameter, detect if a target is able to unwind or not. Ignore tests that require unwinding on targets that don't support it.

This test case actually requires std::process.

src/test/ui/extern-flag/empty-extern-arg.rs

src/test/ui/panic-handler/weak-lang-item.rs

bjorn3 · 2022-09-23T07:43:02Z

@bors r+

bors · 2022-09-23T07:43:03Z

📌 Commit 0be3cc8 has been approved by bjorn3

It is now in the queue for this repository.

bjorn3 · 2022-09-23T08:43:25Z

@bors r+

bors · 2022-09-23T08:43:27Z

📌 Commit ccd19c7 has been approved by bjorn3

It is now in the queue for this repository.

Detect panic strategy using `rustc --print cfg` Instead of relying on a command line parameter, detect if a target is able to unwind or not. Ignore tests that require unwinding on targets that don't support it. I did not find any place where the removed parameter has been used, but it feels a bit risky as I'm new to this test framework. r? bjorn3

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#102094 (Add missing documentation for `bool::from_str`) - rust-lang#102115 (Add examples to `bool::then` and `bool::then_some`) - rust-lang#102134 (Detect panic strategy using `rustc --print cfg`) - rust-lang#102137 (Don't convert valtree to constvalue during normalization) - rust-lang#102148 (add regression test for miri issue 2433) - rust-lang#102158 (rustdoc: clean up CSS/DOM for deprecation warnings) - rust-lang#102177 (Fix a typo in `std`'s root docs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…gs, r=Mark-Simulacrum Adding target_rustcflags to `compiletest` TargetCfg creation Adjustment to rust-lang#102134, ensures config returned by `rustc --target foo --print cfg` accurately reflects rustflags passed via `target_rustcflags`. Fixes breaking change of not correctly handling `x.py test ... --test-args "--target-rustcflags -Cpanic=abort --target-rustcflags -Zpanic_abort_tests"` cc `@djkoloski`

…, r=Mark-Simulacrum Adding target_rustcflags to `compiletest` TargetCfg creation Adjustment to rust-lang#102134, ensures config returned by `rustc --target foo --print cfg` accurately reflects rustflags passed via `target_rustcflags`. Fixes breaking change of not correctly handling `x.py test ... --test-args "--target-rustcflags -Cpanic=abort --target-rustcflags -Zpanic_abort_tests"` cc `@djkoloski`

…Simulacrum Adding target_rustcflags to `compiletest` TargetCfg creation Adjustment to rust-lang/rust#102134, ensures config returned by `rustc --target foo --print cfg` accurately reflects rustflags passed via `target_rustcflags`. Fixes breaking change of not correctly handling `x.py test ... --test-args "--target-rustcflags -Cpanic=abort --target-rustcflags -Zpanic_abort_tests"` cc `@djkoloski`

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#102094 (Add missing documentation for `bool::from_str`) - rust-lang#102115 (Add examples to `bool::then` and `bool::then_some`) - rust-lang#102134 (Detect panic strategy using `rustc --print cfg`) - rust-lang#102137 (Don't convert valtree to constvalue during normalization) - rust-lang#102148 (add regression test for miri issue 2433) - rust-lang#102158 (rustdoc: clean up CSS/DOM for deprecation warnings) - rust-lang#102177 (Fix a typo in `std`'s root docs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…Simulacrum Adding target_rustcflags to `compiletest` TargetCfg creation Adjustment to rust-lang/rust#102134, ensures config returned by `rustc --target foo --print cfg` accurately reflects rustflags passed via `target_rustcflags`. Fixes breaking change of not correctly handling `x.py test ... --test-args "--target-rustcflags -Cpanic=abort --target-rustcflags -Zpanic_abort_tests"` cc `@djkoloski`

rust-highfive assigned jyn514 Sep 22, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 22, 2022

rust-highfive assigned bjorn3 and unassigned jyn514 Sep 22, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 22, 2022

bjorn3 reviewed Sep 22, 2022

View reviewed changes

src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs Show resolved Hide resolved

bjorn3 approved these changes Sep 22, 2022

View reviewed changes

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 Sep 22, 2022

matthiaskrgr mentioned this pull request Sep 22, 2022

Rollup of 9 pull requests #102153

Closed

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 Sep 23, 2022

flba-eb added 3 commits September 23, 2022 08:19

Detect panic strategy using rustc --print cfg

7bfbaa3

Instead of relying on a command line parameter, detect if a target is able to unwind or not. Ignore tests that require unwinding on targets that don't support it.

Restore ignore tag

0b0027f

This test case actually requires std::process.

Adapt test results

10f3657

bjorn3 reviewed Sep 23, 2022

View reviewed changes

src/test/ui/extern-flag/empty-extern-arg.rs Show resolved Hide resolved

bjorn3 reviewed Sep 23, 2022

View reviewed changes

src/test/ui/panic-handler/weak-lang-item.rs Show resolved Hide resolved

ignore test cases when checking emscripten

0be3cc8

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 Sep 23, 2022

Repair stderr test result to added line

ccd19c7

matthiaskrgr mentioned this pull request Sep 23, 2022

Rollup of 7 pull requests #102180

Closed

matthiaskrgr mentioned this pull request Sep 23, 2022

Rollup of 7 pull requests #102192

Merged

bors merged commit 3de0d67 into rust-lang:master Sep 23, 2022

rustbot added this to the 1.66.0 milestone Sep 23, 2022

andrewpollack mentioned this pull request Sep 28, 2022

Adding target_rustcflags to compiletest TargetCfg creation #102438

Merged

Uh oh!

Conversation

flba-eb commented Sep 22, 2022

Uh oh!

rust-highfive commented Sep 22, 2022

Uh oh!

flba-eb commented Sep 22, 2022

Uh oh!

bjorn3 commented Sep 22, 2022

Uh oh!

Uh oh!

bjorn3 left a comment

Choose a reason for hiding this comment

Uh oh!

bjorn3 commented Sep 22, 2022

Uh oh!

bors commented Sep 22, 2022

Uh oh!

matthiaskrgr commented Sep 23, 2022

Uh oh!

Uh oh!

Uh oh!

bjorn3 commented Sep 23, 2022

Uh oh!

bors commented Sep 23, 2022

Uh oh!

bjorn3 commented Sep 23, 2022

Uh oh!

bors commented Sep 23, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants