about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-13 10:37:06 +0000
committerbors <bors@rust-lang.org>2014-11-13 10:37:06 +0000
commitf6c025013945cbd00ec4ac24b7ef1ac20db0b43a (patch)
treeeefe178775783d8585faaf8dd5c2fa0b87871642
parent5db8381c7e3506d50dbb2152ad0161b9e214ac3c (diff)
parent7f0b9d4465f7b1b3655cb4b80c7fe894cd6ef641 (diff)
downloadrust-f6c025013945cbd00ec4ac24b7ef1ac20db0b43a.tar.gz
rust-f6c025013945cbd00ec4ac24b7ef1ac20db0b43a.zip
auto merge of #18877 : michaelsproul/rust/panic-tests, r=alexcrichton
I'm fairly sure all these tests refer to task panics. I skim read them all, but there's a small chance I renamed something too eagerly.
-rw-r--r--src/test/run-fail/args-panic.rs (renamed from src/test/run-fail/args-fail.rs)0
-rw-r--r--src/test/run-fail/assert-eq-macro-panic.rs (renamed from src/test/run-fail/assert-eq-macro-fail.rs)0
-rw-r--r--src/test/run-fail/binop-panic.rs (renamed from src/test/run-fail/binop-fail.rs)0
-rw-r--r--src/test/run-fail/doublepanic.rs (renamed from src/test/run-fail/doublefail.rs)0
-rw-r--r--src/test/run-fail/explicit-panic-msg.rs (renamed from src/test/run-fail/explicit-fail-msg.rs)0
-rw-r--r--src/test/run-fail/explicit-panic.rs (renamed from src/test/run-fail/explicit-fail.rs)0
-rw-r--r--src/test/run-fail/expr-fn-panic.rs (renamed from src/test/run-fail/expr-fn-fail.rs)0
-rw-r--r--src/test/run-fail/expr-if-panic-fn.rs (renamed from src/test/run-fail/expr-if-fail-fn.rs)0
-rw-r--r--src/test/run-fail/expr-if-panic.rs (renamed from src/test/run-fail/expr-if-fail.rs)0
-rw-r--r--src/test/run-fail/expr-match-panic-fn.rs (renamed from src/test/run-fail/expr-match-fail-fn.rs)0
-rw-r--r--src/test/run-fail/expr-match-panic.rs (renamed from src/test/run-fail/expr-match-fail.rs)0
-rw-r--r--src/test/run-fail/extern-panic.rs (renamed from src/test/run-fail/extern-fail.rs)0
-rw-r--r--src/test/run-fail/fmt-panic.rs (renamed from src/test/run-fail/fmt-fail.rs)0
-rw-r--r--src/test/run-fail/for-each-loop-panic.rs (renamed from src/test/run-fail/for-each-loop-fail.rs)0
-rw-r--r--src/test/run-fail/if-check-panic.rs (renamed from src/test/run-fail/if-check-fail.rs)0
-rw-r--r--src/test/run-fail/main-panic.rs (renamed from src/test/run-fail/main-fail.rs)0
-rw-r--r--src/test/run-fail/match-bot-panic.rs (renamed from src/test/run-fail/match-bot-fail.rs)0
-rw-r--r--src/test/run-fail/native-panic.rs (renamed from src/test/run-fail/native-failure.rs)0
-rw-r--r--src/test/run-fail/panic-arg.rs (renamed from src/test/run-fail/fail-arg.rs)0
-rw-r--r--src/test/run-fail/panic-macro-any-wrapped.rs (renamed from src/test/run-fail/fail-macro-any-wrapped.rs)0
-rw-r--r--src/test/run-fail/panic-macro-any.rs (renamed from src/test/run-fail/fail-macro-any.rs)0
-rw-r--r--src/test/run-fail/panic-macro-explicit.rs (renamed from src/test/run-fail/fail-macro-explicit.rs)0
-rw-r--r--src/test/run-fail/panic-macro-fmt.rs (renamed from src/test/run-fail/fail-macro-fmt.rs)0
-rw-r--r--src/test/run-fail/panic-macro-owned.rs (renamed from src/test/run-fail/fail-macro-owned.rs)0
-rw-r--r--src/test/run-fail/panic-macro-static.rs (renamed from src/test/run-fail/fail-macro-static.rs)0
-rw-r--r--src/test/run-fail/panic-main.rs (renamed from src/test/run-fail/fail-main.rs)0
-rw-r--r--src/test/run-fail/panic-non-utf8.rs (renamed from src/test/run-fail/fail-non-utf8.rs)0
-rw-r--r--src/test/run-fail/panic-parens.rs (renamed from src/test/run-fail/fail-parens.rs)0
-rw-r--r--src/test/run-fail/panic-task-name-none.rs (renamed from src/test/run-fail/fail-task-name-none.rs)0
-rw-r--r--src/test/run-fail/panic-task-name-owned.rs (renamed from src/test/run-fail/fail-task-name-owned.rs)0
-rw-r--r--src/test/run-fail/panic-task-name-send-str.rs (renamed from src/test/run-fail/fail-task-name-send-str.rs)0
-rw-r--r--src/test/run-fail/panic-task-name-static.rs (renamed from src/test/run-fail/fail-task-name-static.rs)0
-rw-r--r--src/test/run-fail/panic.rs (renamed from src/test/run-fail/fail.rs)0
-rw-r--r--src/test/run-fail/result-get-panic.rs (renamed from src/test/run-fail/result-get-fail.rs)0
-rw-r--r--src/test/run-fail/rt-set-exit-status-panic.rs (renamed from src/test/run-fail/rt-set-exit-status-fail.rs)0
-rw-r--r--src/test/run-fail/rt-set-exit-status-panic2.rs (renamed from src/test/run-fail/rt-set-exit-status-fail2.rs)0
-rw-r--r--src/test/run-fail/test-panic.rs (renamed from src/test/run-fail/test-fail.rs)0
-rw-r--r--src/test/run-fail/unimplemented-macro-panic.rs (renamed from src/test/run-fail/unimplemented-macro-fail.rs)0
-rw-r--r--src/test/run-fail/unique-panic.rs (renamed from src/test/run-fail/unique-fail.rs)0
-rw-r--r--src/test/run-fail/unreachable-macro-panic.rs12
-rw-r--r--src/test/run-fail/while-body-panics.rs (renamed from src/test/run-fail/while-body-fails.rs)0
-rw-r--r--src/test/run-fail/while-panic.rs (renamed from src/test/run-fail/while-fail.rs)0
-rw-r--r--src/test/run-pass/expr-if-panic-all.rs (renamed from src/test/run-pass/expr-if-fail-all.rs)0
-rw-r--r--src/test/run-pass/expr-if-panic.rs (renamed from src/test/run-pass/expr-if-fail.rs)0
-rw-r--r--src/test/run-pass/expr-match-panic-all.rs (renamed from src/test/run-pass/expr-match-fail-all.rs)0
-rw-r--r--src/test/run-pass/expr-match-panic.rs (renamed from src/test/run-pass/expr-match-fail.rs)0
-rw-r--r--src/test/run-pass/for-loop-panic.rs (renamed from src/test/run-pass/for-loop-fail.rs)0
-rw-r--r--src/test/run-pass/panic-during-tld-destroy.rs (renamed from src/test/run-pass/fail-during-tld-destroy.rs)0
-rw-r--r--src/test/run-pass/panic-in-dtor-drops-fields.rs (renamed from src/test/run-pass/fail-in-dtor-drops-fields.rs)0
-rw-r--r--src/test/run-pass/parse-panic.rs (renamed from src/test/run-pass/parse-fail.rs)0
-rw-r--r--src/test/run-pass/slice-panic-1.rs (renamed from src/test/run-pass/slice-fail-1.rs)0
-rw-r--r--src/test/run-pass/slice-panic-2.rs (renamed from src/test/run-pass/slice-fail-2.rs)0
-rw-r--r--src/test/run-pass/vector-sort-panic-safe.rs (renamed from src/test/run-pass/vector-sort-failure-safe.rs)0
53 files changed, 12 insertions, 0 deletions
diff --git a/src/test/run-fail/args-fail.rs b/src/test/run-fail/args-panic.rs
index 4878ec59fd4..4878ec59fd4 100644
--- a/src/test/run-fail/args-fail.rs
+++ b/src/test/run-fail/args-panic.rs
diff --git a/src/test/run-fail/assert-eq-macro-fail.rs b/src/test/run-fail/assert-eq-macro-panic.rs
index 69ed025070b..69ed025070b 100644
--- a/src/test/run-fail/assert-eq-macro-fail.rs
+++ b/src/test/run-fail/assert-eq-macro-panic.rs
diff --git a/src/test/run-fail/binop-fail.rs b/src/test/run-fail/binop-panic.rs
index ac85b218ec0..ac85b218ec0 100644
--- a/src/test/run-fail/binop-fail.rs
+++ b/src/test/run-fail/binop-panic.rs
diff --git a/src/test/run-fail/doublefail.rs b/src/test/run-fail/doublepanic.rs
index 3835a16a5c2..3835a16a5c2 100644
--- a/src/test/run-fail/doublefail.rs
+++ b/src/test/run-fail/doublepanic.rs
diff --git a/src/test/run-fail/explicit-fail-msg.rs b/src/test/run-fail/explicit-panic-msg.rs
index ae6e72bdd4f..ae6e72bdd4f 100644
--- a/src/test/run-fail/explicit-fail-msg.rs
+++ b/src/test/run-fail/explicit-panic-msg.rs
diff --git a/src/test/run-fail/explicit-fail.rs b/src/test/run-fail/explicit-panic.rs
index 4699897bf8a..4699897bf8a 100644
--- a/src/test/run-fail/explicit-fail.rs
+++ b/src/test/run-fail/explicit-panic.rs
diff --git a/src/test/run-fail/expr-fn-fail.rs b/src/test/run-fail/expr-fn-panic.rs
index 8cf018fb770..8cf018fb770 100644
--- a/src/test/run-fail/expr-fn-fail.rs
+++ b/src/test/run-fail/expr-fn-panic.rs
diff --git a/src/test/run-fail/expr-if-fail-fn.rs b/src/test/run-fail/expr-if-panic-fn.rs
index 987bee55c60..987bee55c60 100644
--- a/src/test/run-fail/expr-if-fail-fn.rs
+++ b/src/test/run-fail/expr-if-panic-fn.rs
diff --git a/src/test/run-fail/expr-if-fail.rs b/src/test/run-fail/expr-if-panic.rs
index f04c94a3bf4..f04c94a3bf4 100644
--- a/src/test/run-fail/expr-if-fail.rs
+++ b/src/test/run-fail/expr-if-panic.rs
diff --git a/src/test/run-fail/expr-match-fail-fn.rs b/src/test/run-fail/expr-match-panic-fn.rs
index 069c1d5ed35..069c1d5ed35 100644
--- a/src/test/run-fail/expr-match-fail-fn.rs
+++ b/src/test/run-fail/expr-match-panic-fn.rs
diff --git a/src/test/run-fail/expr-match-fail.rs b/src/test/run-fail/expr-match-panic.rs
index d5c005b7029..d5c005b7029 100644
--- a/src/test/run-fail/expr-match-fail.rs
+++ b/src/test/run-fail/expr-match-panic.rs
diff --git a/src/test/run-fail/extern-fail.rs b/src/test/run-fail/extern-panic.rs
index 21a332a46cb..21a332a46cb 100644
--- a/src/test/run-fail/extern-fail.rs
+++ b/src/test/run-fail/extern-panic.rs
diff --git a/src/test/run-fail/fmt-fail.rs b/src/test/run-fail/fmt-panic.rs
index 22e81480867..22e81480867 100644
--- a/src/test/run-fail/fmt-fail.rs
+++ b/src/test/run-fail/fmt-panic.rs
diff --git a/src/test/run-fail/for-each-loop-fail.rs b/src/test/run-fail/for-each-loop-panic.rs
index 472c8ae15b9..472c8ae15b9 100644
--- a/src/test/run-fail/for-each-loop-fail.rs
+++ b/src/test/run-fail/for-each-loop-panic.rs
diff --git a/src/test/run-fail/if-check-fail.rs b/src/test/run-fail/if-check-panic.rs
index 1ead81b0091..1ead81b0091 100644
--- a/src/test/run-fail/if-check-fail.rs
+++ b/src/test/run-fail/if-check-panic.rs
diff --git a/src/test/run-fail/main-fail.rs b/src/test/run-fail/main-panic.rs
index b750501c265..b750501c265 100644
--- a/src/test/run-fail/main-fail.rs
+++ b/src/test/run-fail/main-panic.rs
diff --git a/src/test/run-fail/match-bot-fail.rs b/src/test/run-fail/match-bot-panic.rs
index 2b1672ad4e5..2b1672ad4e5 100644
--- a/src/test/run-fail/match-bot-fail.rs
+++ b/src/test/run-fail/match-bot-panic.rs
diff --git a/src/test/run-fail/native-failure.rs b/src/test/run-fail/native-panic.rs
index 0b261676cb2..0b261676cb2 100644
--- a/src/test/run-fail/native-failure.rs
+++ b/src/test/run-fail/native-panic.rs
diff --git a/src/test/run-fail/fail-arg.rs b/src/test/run-fail/panic-arg.rs
index 4d4f9317510..4d4f9317510 100644
--- a/src/test/run-fail/fail-arg.rs
+++ b/src/test/run-fail/panic-arg.rs
diff --git a/src/test/run-fail/fail-macro-any-wrapped.rs b/src/test/run-fail/panic-macro-any-wrapped.rs
index e25390a7986..e25390a7986 100644
--- a/src/test/run-fail/fail-macro-any-wrapped.rs
+++ b/src/test/run-fail/panic-macro-any-wrapped.rs
diff --git a/src/test/run-fail/fail-macro-any.rs b/src/test/run-fail/panic-macro-any.rs
index b73c66c4f21..b73c66c4f21 100644
--- a/src/test/run-fail/fail-macro-any.rs
+++ b/src/test/run-fail/panic-macro-any.rs
diff --git a/src/test/run-fail/fail-macro-explicit.rs b/src/test/run-fail/panic-macro-explicit.rs
index a8565549a03..a8565549a03 100644
--- a/src/test/run-fail/fail-macro-explicit.rs
+++ b/src/test/run-fail/panic-macro-explicit.rs
diff --git a/src/test/run-fail/fail-macro-fmt.rs b/src/test/run-fail/panic-macro-fmt.rs
index ac50f02cf33..ac50f02cf33 100644
--- a/src/test/run-fail/fail-macro-fmt.rs
+++ b/src/test/run-fail/panic-macro-fmt.rs
diff --git a/src/test/run-fail/fail-macro-owned.rs b/src/test/run-fail/panic-macro-owned.rs
index 2f695c4e4b7..2f695c4e4b7 100644
--- a/src/test/run-fail/fail-macro-owned.rs
+++ b/src/test/run-fail/panic-macro-owned.rs
diff --git a/src/test/run-fail/fail-macro-static.rs b/src/test/run-fail/panic-macro-static.rs
index c62162da09b..c62162da09b 100644
--- a/src/test/run-fail/fail-macro-static.rs
+++ b/src/test/run-fail/panic-macro-static.rs
diff --git a/src/test/run-fail/fail-main.rs b/src/test/run-fail/panic-main.rs
index 877ea9cd0a4..877ea9cd0a4 100644
--- a/src/test/run-fail/fail-main.rs
+++ b/src/test/run-fail/panic-main.rs
diff --git a/src/test/run-fail/fail-non-utf8.rs b/src/test/run-fail/panic-non-utf8.rs
index 8b013199369..8b013199369 100644
--- a/src/test/run-fail/fail-non-utf8.rs
+++ b/src/test/run-fail/panic-non-utf8.rs
diff --git a/src/test/run-fail/fail-parens.rs b/src/test/run-fail/panic-parens.rs
index 06655e4c681..06655e4c681 100644
--- a/src/test/run-fail/fail-parens.rs
+++ b/src/test/run-fail/panic-parens.rs
diff --git a/src/test/run-fail/fail-task-name-none.rs b/src/test/run-fail/panic-task-name-none.rs
index 3f8abc41ff7..3f8abc41ff7 100644
--- a/src/test/run-fail/fail-task-name-none.rs
+++ b/src/test/run-fail/panic-task-name-none.rs
diff --git a/src/test/run-fail/fail-task-name-owned.rs b/src/test/run-fail/panic-task-name-owned.rs
index 0a303475a29..0a303475a29 100644
--- a/src/test/run-fail/fail-task-name-owned.rs
+++ b/src/test/run-fail/panic-task-name-owned.rs
diff --git a/src/test/run-fail/fail-task-name-send-str.rs b/src/test/run-fail/panic-task-name-send-str.rs
index 73fca246590..73fca246590 100644
--- a/src/test/run-fail/fail-task-name-send-str.rs
+++ b/src/test/run-fail/panic-task-name-send-str.rs
diff --git a/src/test/run-fail/fail-task-name-static.rs b/src/test/run-fail/panic-task-name-static.rs
index 21c019e1a74..21c019e1a74 100644
--- a/src/test/run-fail/fail-task-name-static.rs
+++ b/src/test/run-fail/panic-task-name-static.rs
diff --git a/src/test/run-fail/fail.rs b/src/test/run-fail/panic.rs
index 54ccc98bcd9..54ccc98bcd9 100644
--- a/src/test/run-fail/fail.rs
+++ b/src/test/run-fail/panic.rs
diff --git a/src/test/run-fail/result-get-fail.rs b/src/test/run-fail/result-get-panic.rs
index 6098b97c79a..6098b97c79a 100644
--- a/src/test/run-fail/result-get-fail.rs
+++ b/src/test/run-fail/result-get-panic.rs
diff --git a/src/test/run-fail/rt-set-exit-status-fail.rs b/src/test/run-fail/rt-set-exit-status-panic.rs
index e524a2432ac..e524a2432ac 100644
--- a/src/test/run-fail/rt-set-exit-status-fail.rs
+++ b/src/test/run-fail/rt-set-exit-status-panic.rs
diff --git a/src/test/run-fail/rt-set-exit-status-fail2.rs b/src/test/run-fail/rt-set-exit-status-panic2.rs
index 1cfc6c36a63..1cfc6c36a63 100644
--- a/src/test/run-fail/rt-set-exit-status-fail2.rs
+++ b/src/test/run-fail/rt-set-exit-status-panic2.rs
diff --git a/src/test/run-fail/test-fail.rs b/src/test/run-fail/test-panic.rs
index cd2ec834d82..cd2ec834d82 100644
--- a/src/test/run-fail/test-fail.rs
+++ b/src/test/run-fail/test-panic.rs
diff --git a/src/test/run-fail/unimplemented-macro-fail.rs b/src/test/run-fail/unimplemented-macro-panic.rs
index 7eff1fee625..7eff1fee625 100644
--- a/src/test/run-fail/unimplemented-macro-fail.rs
+++ b/src/test/run-fail/unimplemented-macro-panic.rs
diff --git a/src/test/run-fail/unique-fail.rs b/src/test/run-fail/unique-panic.rs
index 07c9a21c5c1..07c9a21c5c1 100644
--- a/src/test/run-fail/unique-fail.rs
+++ b/src/test/run-fail/unique-panic.rs
diff --git a/src/test/run-fail/unreachable-macro-panic.rs b/src/test/run-fail/unreachable-macro-panic.rs
new file mode 100644
index 00000000000..07e05c6fed9
--- /dev/null
+++ b/src/test/run-fail/unreachable-macro-panic.rs
@@ -0,0 +1,12 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// error-pattern:internal error: entered unreachable code
+fn main() { unreachable!() }
diff --git a/src/test/run-fail/while-body-fails.rs b/src/test/run-fail/while-body-panics.rs
index 6a7d0a1d73e..6a7d0a1d73e 100644
--- a/src/test/run-fail/while-body-fails.rs
+++ b/src/test/run-fail/while-body-panics.rs
diff --git a/src/test/run-fail/while-fail.rs b/src/test/run-fail/while-panic.rs
index f6081e497bf..f6081e497bf 100644
--- a/src/test/run-fail/while-fail.rs
+++ b/src/test/run-fail/while-panic.rs
diff --git a/src/test/run-pass/expr-if-fail-all.rs b/src/test/run-pass/expr-if-panic-all.rs
index 0dd7ddc3f84..0dd7ddc3f84 100644
--- a/src/test/run-pass/expr-if-fail-all.rs
+++ b/src/test/run-pass/expr-if-panic-all.rs
diff --git a/src/test/run-pass/expr-if-fail.rs b/src/test/run-pass/expr-if-panic.rs
index aa4240c60f1..aa4240c60f1 100644
--- a/src/test/run-pass/expr-if-fail.rs
+++ b/src/test/run-pass/expr-if-panic.rs
diff --git a/src/test/run-pass/expr-match-fail-all.rs b/src/test/run-pass/expr-match-panic-all.rs
index 3b33c18bbbd..3b33c18bbbd 100644
--- a/src/test/run-pass/expr-match-fail-all.rs
+++ b/src/test/run-pass/expr-match-panic-all.rs
diff --git a/src/test/run-pass/expr-match-fail.rs b/src/test/run-pass/expr-match-panic.rs
index d8ee21dfdc6..d8ee21dfdc6 100644
--- a/src/test/run-pass/expr-match-fail.rs
+++ b/src/test/run-pass/expr-match-panic.rs
diff --git a/src/test/run-pass/for-loop-fail.rs b/src/test/run-pass/for-loop-panic.rs
index d157da3139f..d157da3139f 100644
--- a/src/test/run-pass/for-loop-fail.rs
+++ b/src/test/run-pass/for-loop-panic.rs
diff --git a/src/test/run-pass/fail-during-tld-destroy.rs b/src/test/run-pass/panic-during-tld-destroy.rs
index 2f0d6cf90aa..2f0d6cf90aa 100644
--- a/src/test/run-pass/fail-during-tld-destroy.rs
+++ b/src/test/run-pass/panic-during-tld-destroy.rs
diff --git a/src/test/run-pass/fail-in-dtor-drops-fields.rs b/src/test/run-pass/panic-in-dtor-drops-fields.rs
index 46924c74a8c..46924c74a8c 100644
--- a/src/test/run-pass/fail-in-dtor-drops-fields.rs
+++ b/src/test/run-pass/panic-in-dtor-drops-fields.rs
diff --git a/src/test/run-pass/parse-fail.rs b/src/test/run-pass/parse-panic.rs
index 0dbba3654b6..0dbba3654b6 100644
--- a/src/test/run-pass/parse-fail.rs
+++ b/src/test/run-pass/parse-panic.rs
diff --git a/src/test/run-pass/slice-fail-1.rs b/src/test/run-pass/slice-panic-1.rs
index b07cf595968..b07cf595968 100644
--- a/src/test/run-pass/slice-fail-1.rs
+++ b/src/test/run-pass/slice-panic-1.rs
diff --git a/src/test/run-pass/slice-fail-2.rs b/src/test/run-pass/slice-panic-2.rs
index 0ac7a2001fc..0ac7a2001fc 100644
--- a/src/test/run-pass/slice-fail-2.rs
+++ b/src/test/run-pass/slice-panic-2.rs
diff --git a/src/test/run-pass/vector-sort-failure-safe.rs b/src/test/run-pass/vector-sort-panic-safe.rs
index ce9cc68bd36..ce9cc68bd36 100644
--- a/src/test/run-pass/vector-sort-failure-safe.rs
+++ b/src/test/run-pass/vector-sort-panic-safe.rs