fix and expand panic tests

RalfJung · RalfJung · commit 0978e4f37fb8 · 2019-11-29T13:18:54.000+01:00
diff --git a/tests/compile-fail/div-by-zero-2.rs b/tests/compile-fail/div-by-zero-2.rs
diff --git a/tests/compile-fail/overflowing-lsh-neg.rs b/tests/compile-fail/overflowing-lsh-neg.rs
diff --git a/tests/compile-fail/overflowing-rsh-1.rs b/tests/compile-fail/overflowing-rsh-1.rs
diff --git a/tests/compile-fail/panic/panic_abort1.rs b/tests/compile-fail/panic/panic_abort1.rs
diff --git a/tests/compile-fail/panic/panic_abort2.rs b/tests/compile-fail/panic/panic_abort2.rs
diff --git a/tests/compile-fail/panic/panic_abort3.rs b/tests/compile-fail/panic/panic_abort3.rs
diff --git a/tests/compile-fail/panic/panic_abort4.rs b/tests/compile-fail/panic/panic_abort4.rs
diff --git a/tests/run-pass/panic/catch_panic.rs b/tests/run-pass/panic/catch_panic.rs
diff --git a/tests/run-pass/panic/catch_panic.stderr b/tests/run-pass/panic/catch_panic.stderr
diff --git a/tests/run-pass/panic/div-by-zero-2.rs b/tests/run-pass/panic/div-by-zero-2.rs
@@ -0,0 +1,6 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
+#![allow(const_err)]
+
+fn main() {
+    let _n = 1 / 0;
+}
diff --git a/tests/run-pass/panic/div-by-zero-2.stderr b/tests/run-pass/panic/div-by-zero-2.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at 'attempt to divide by zero', $DIR/div-by-zero-2.rs:5:14
diff --git a/tests/run-pass/panic/overflowing-lsh-neg.rs b/tests/run-pass/panic/overflowing-lsh-neg.rs
@@ -0,0 +1,7 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
+#![allow(exceeding_bitshifts)]
+#![allow(const_err)]
+
+fn main() {
+    let _n = 2i64 << -1;
+}
diff --git a/tests/run-pass/panic/overflowing-lsh-neg.stderr b/tests/run-pass/panic/overflowing-lsh-neg.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at 'attempt to shift left with overflow', $DIR/overflowing-lsh-neg.rs:6:14
diff --git a/tests/run-pass/panic/overflowing-rsh-1.rs b/tests/run-pass/panic/overflowing-rsh-1.rs
@@ -0,0 +1,6 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
+#![allow(exceeding_bitshifts, const_err)]
+
+fn main() {
+    let _n = 1i64 >> 64;
+}
diff --git a/tests/run-pass/panic/overflowing-rsh-1.stderr b/tests/run-pass/panic/overflowing-rsh-1.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at 'attempt to shift right with overflow', $DIR/overflowing-rsh-1.rs:5:14
diff --git a/tests/run-pass/panic/overflowing-rsh-2.rs b/tests/run-pass/panic/overflowing-rsh-2.rs
@@ -1,6 +1,7 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
 #![allow(exceeding_bitshifts, const_err)]
 
 fn main() {
     // Make sure we catch overflows that would be hidden by first casting the RHS to u32
-    let _n = 1i64 >> (u32::max_value() as i64 + 1); //~ ERROR attempt to shift right with overflow
+    let _n = 1i64 >> (u32::max_value() as i64 + 1);
 }
diff --git a/tests/run-pass/panic/overflowing-rsh-2.stderr b/tests/run-pass/panic/overflowing-rsh-2.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at 'attempt to shift right with overflow', $DIR/overflowing-rsh-2.rs:6:14
diff --git a/tests/run-pass/panic/panic1.rs b/tests/run-pass/panic/panic1.rs
@@ -0,0 +1,4 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
+fn main() {
+    std::panic!("panicking from libstd");
+}
diff --git a/tests/run-pass/panic/panic1.stderr b/tests/run-pass/panic/panic1.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at 'panicking from libstd', $DIR/panic1.rs:3:5
diff --git a/tests/run-pass/panic/panic2.rs b/tests/run-pass/panic/panic2.rs
@@ -0,0 +1,4 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
+fn main() {
+    std::panic!("{}-panicking from libstd", 42);
+}
diff --git a/tests/run-pass/panic/panic2.stderr b/tests/run-pass/panic/panic2.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at '42-panicking from libstd', $DIR/panic2.rs:3:5
diff --git a/tests/run-pass/panic/panic3.rs b/tests/run-pass/panic/panic3.rs
@@ -0,0 +1,4 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
+fn main() {
+    core::panic!("panicking from libcore");
+}
diff --git a/tests/run-pass/panic/panic3.stderr b/tests/run-pass/panic/panic3.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at 'panicking from libcore', $DIR/panic3.rs:3:5
diff --git a/tests/run-pass/panic/panic4.rs b/tests/run-pass/panic/panic4.rs
@@ -0,0 +1,4 @@
+// ignore-windows: Unwind panicking does not currently work on Windows
+fn main() {
+    core::panic!("{}-panicking from libcore", 42);
+}
diff --git a/tests/run-pass/panic/panic4.stderr b/tests/run-pass/panic/panic4.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at '42-panicking from libcore', $DIR/panic4.rs:3:5
diff --git a/tests/run-pass/panic/transmute_fat2.rs b/tests/run-pass/panic/transmute_fat2.rs
@@ -7,5 +7,5 @@ fn main() {
     let bad = unsafe {
         std::mem::transmute::<u64, &[u8]>(42)
     };
-    bad[0]; //~ ERROR index out of bounds: the len is 0 but the index is 0
+    bad[0];
 }
diff --git a/tests/run-pass/panic/transmute_fat2.stderr b/tests/run-pass/panic/transmute_fat2.stderr
@@ -0,0 +1 @@
+thread 'main' panicked at 'index out of bounds: the len is 0 but the index is 0', $DIR/transmute_fat2.rs:10:5
