Skip to content

Ignore panic configuration for test/bench profiles#3175

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:bench-abort
Nov 3, 2016
Merged

Ignore panic configuration for test/bench profiles#3175
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:bench-abort

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

Both of these profiles link to libtest, so it's invalid to configure them with
panic="abort". To prevent confusing errors just ignore the configuration for
now.

Closes #3166

@rust-highfive

Copy link
Copy Markdown

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton

Copy link
Copy Markdown
Member Author

ping r? @brson

@bors

bors commented Nov 2, 2016

Copy link
Copy Markdown
Contributor

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

Both of these profiles link to libtest, so it's invalid to configure them with
`panic="abort"`. To prevent confusing errors just ignore the configuration for
now.

Closes rust-lang#3166
@brson

brson commented Nov 3, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 3, 2016

Copy link
Copy Markdown
Contributor

📌 Commit 0f44202 has been approved by brson

@bors

bors commented Nov 3, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit 0f44202 with merge cb524b7...

bors added a commit that referenced this pull request Nov 3, 2016
Ignore `panic` configuration for test/bench profiles

Both of these profiles link to libtest, so it's invalid to configure them with
`panic="abort"`. To prevent confusing errors just ignore the configuration for
now.

Closes #3166
@bors

bors commented Nov 3, 2016

Copy link
Copy Markdown
Contributor

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64
Approved by: brson
Pushing cb524b7 to master...

@bors bors merged commit 0f44202 into rust-lang:master Nov 3, 2016
@alexcrichton alexcrichton deleted the bench-abort branch November 3, 2016 17:49
@alecmocatta

Copy link
Copy Markdown

@alexcrichton In light of harness = false, does a blanket ignore of panic = "abort" for test/bench profiles still make sense?

I just tried this and was surprised to get `panic` setting is ignored for `test` profile, given that the integration test I wanted to run doesn't link to libtest.

@alexcrichton

Copy link
Copy Markdown
Member Author

@alecmocatta this PR is nearly two years old and is, uh, very far out of cache. Perhaps a new issue could be opened?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cannot run benchmarks with panic = "abort"

6 participants