Skip to content

Commit dc42150

Browse files
authored
Rollup merge of rust-lang#135823 - ferrocene:ja-gh135819, r=jieyouxu
make UI tests that use `--test` work on panic=abort targets By passing `-Zpanic_abort_test`. fixes rust-lang#135819
2 parents 315ad11 + ece8b0c commit dc42150

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
//@ compile-flags: --test
1+
// -Zpanic_abort_tests makes this test work on panic=abort targets and
2+
// it's a no-op on panic=unwind targets
3+
//@ compile-flags: --test -Zpanic_abort_tests
24
//@ run-pass
35

46
#![feature(core_intrinsics, generic_assert)]

tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
//@ compile-flags: --test
1+
// -Zpanic_abort_tests makes this test work on panic=abort targets and
2+
// it's a no-op on panic=unwind targets
3+
//@ compile-flags: --test -Zpanic_abort_tests
24
// ignore-tidy-linelength
35
//@ run-pass
46

0 commit comments

Comments
 (0)