Moved problematic tests on dist-x86_64-musl back to compile-fail.

7 files changed, 70 insertions, 12 deletions

diff --git a/src/test/compile-fail/auxiliary/panic-runtime-unwind.rs b/src/test/compile-fail/auxiliary/panic-runtime-unwind.rs
new file mode 100644
index 00000000000..4bb36839d98
--- /dev/null
+++ b/src/test/compile-fail/auxiliary/panic-runtime-unwind.rs
@@ -0,0 +1,27 @@
+// Copyright 2016 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.
+
+// compile-flags:-C panic=unwind
+// no-prefer-dynamic
+
+#![feature(panic_runtime)]
+#![crate_type = "rlib"]
+
+#![no_std]
+#![panic_runtime]
+
+#[no_mangle]
+pub extern fn __rust_maybe_catch_panic() {}
+
+#[no_mangle]
+pub extern fn __rust_start_panic() {}
+
+#[no_mangle]
+pub extern fn rust_eh_personality() {}
diff --git a/src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs b/src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs
new file mode 100644
index 00000000000..4bb36839d98
--- /dev/null
+++ b/src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs
@@ -0,0 +1,27 @@
+// Copyright 2016 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.
+
+// compile-flags:-C panic=unwind
+// no-prefer-dynamic
+
+#![feature(panic_runtime)]
+#![crate_type = "rlib"]
+
+#![no_std]
+#![panic_runtime]
+
+#[no_mangle]
+pub extern fn __rust_maybe_catch_panic() {}
+
+#[no_mangle]
+pub extern fn __rust_start_panic() {}
+
+#[no_mangle]
+pub extern fn rust_eh_personality() {}
diff --git a/src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs b/src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs
new file mode 100644
index 00000000000..2183338b249
--- /dev/null
+++ b/src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs
@@ -0,0 +1,16 @@
+// Copyright 2016 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.
+
+// no-prefer-dynamic
+
+#![crate_type = "rlib"]
+#![no_std]
+
+extern crate panic_runtime_unwind;
diff --git a/src/test/ui/panic-runtime/want-abort-got-unwind.rs b/src/test/compile-fail/want-abort-got-unwind.rs
index b178006411b..b178006411b 100644
--- a/src/test/ui/panic-runtime/want-abort-got-unwind.rs
+++ b/src/test/compile-fail/want-abort-got-unwind.rs
diff --git a/src/test/ui/panic-runtime/want-abort-got-unwind2.rs b/src/test/compile-fail/want-abort-got-unwind2.rs
index de8e010c3cb..de8e010c3cb 100644
--- a/src/test/ui/panic-runtime/want-abort-got-unwind2.rs
+++ b/src/test/compile-fail/want-abort-got-unwind2.rs
diff --git a/src/test/ui/panic-runtime/want-abort-got-unwind.stderr b/src/test/ui/panic-runtime/want-abort-got-unwind.stderr
deleted file mode 100644
index 69064b75ac5..00000000000
--- a/src/test/ui/panic-runtime/want-abort-got-unwind.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: cannot link together two panic runtimes: panic_unwind and panic_runtime_unwind
-
-error: the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/panic-runtime/want-abort-got-unwind2.stderr b/src/test/ui/panic-runtime/want-abort-got-unwind2.stderr
deleted file mode 100644
index 69064b75ac5..00000000000
--- a/src/test/ui/panic-runtime/want-abort-got-unwind2.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: cannot link together two panic runtimes: panic_unwind and panic_runtime_unwind
-
-error: the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
-
-error: aborting due to 2 previous errors
-