summary refs log tree commit diff
path: root/src/test/ui/panic-runtime
diff options
context:
space:
mode:
authorDavid Wood <david@davidtw.co>2018-08-13 11:56:01 +0200
committerDavid Wood <david@davidtw.co>2018-08-14 11:12:12 +0200
commitf7f7c1eef39e945b48a36729291dfe69b51be35d (patch)
tree141b06fea7e4d14a870e4f383243012298fadf93 /src/test/ui/panic-runtime
parentb8b7a3c30ede8788b0727b04c70f0bc452a1c3ec (diff)
downloadrust-f7f7c1eef39e945b48a36729291dfe69b51be35d.tar.gz
rust-f7f7c1eef39e945b48a36729291dfe69b51be35d.zip
Moved problematic tests on dist-x86_64-musl back to compile-fail.
Diffstat (limited to 'src/test/ui/panic-runtime')
-rw-r--r--src/test/ui/panic-runtime/want-abort-got-unwind.rs17
-rw-r--r--src/test/ui/panic-runtime/want-abort-got-unwind.stderr6
-rw-r--r--src/test/ui/panic-runtime/want-abort-got-unwind2.rs18
-rw-r--r--src/test/ui/panic-runtime/want-abort-got-unwind2.stderr6
4 files changed, 0 insertions, 47 deletions
diff --git a/src/test/ui/panic-runtime/want-abort-got-unwind.rs b/src/test/ui/panic-runtime/want-abort-got-unwind.rs
deleted file mode 100644
index b178006411b..00000000000
--- a/src/test/ui/panic-runtime/want-abort-got-unwind.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.
-
-// error-pattern:is not compiled with this crate's panic strategy `abort`
-// aux-build:panic-runtime-unwind.rs
-// compile-flags:-C panic=abort
-
-extern crate panic_runtime_unwind;
-
-fn main() {}
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.rs b/src/test/ui/panic-runtime/want-abort-got-unwind2.rs
deleted file mode 100644
index de8e010c3cb..00000000000
--- a/src/test/ui/panic-runtime/want-abort-got-unwind2.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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.
-
-// error-pattern:is not compiled with this crate's panic strategy `abort`
-// aux-build:panic-runtime-unwind.rs
-// aux-build:wants-panic-runtime-unwind.rs
-// compile-flags:-C panic=abort
-
-extern crate wants_panic_runtime_unwind;
-
-fn main() {}
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
-