Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/ui/test-attrs/test-panic-abort-disabled.rs b/tests/ui/test-attrs/test-panic-abort-disabled.rs
new file mode 100644
index 000000000..874dbdb42
--- /dev/null
+++ b/tests/ui/test-attrs/test-panic-abort-disabled.rs
@@ -0,0 +1,20 @@
+// error-pattern:building tests with panic=abort is not supported
+// no-prefer-dynamic
+// compile-flags: --test -Cpanic=abort -Zpanic-abort-tests=no
+// run-flags: --test-threads=1
+
+// ignore-wasm no panic or subprocess support
+// ignore-emscripten no panic or subprocess support
+
+#![cfg(test)]
+
+#[test]
+fn it_works() {
+    assert_eq!(1 + 1, 2);
+}
+
+#[test]
+#[should_panic]
+fn it_panics() {
+    assert_eq!(1 + 1, 4);
+}