about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Wood <david@davidtw.co>2018-08-13 17:12:20 +0200
committerDavid Wood <david@davidtw.co>2018-08-14 11:12:12 +0200
commit4b2464592c482f846392ad69b1f79f6753572cdf (patch)
tree9ae66545141b2695241aacc791d7725d8029b611
parentf7f7c1eef39e945b48a36729291dfe69b51be35d (diff)
downloadrust-4b2464592c482f846392ad69b1f79f6753572cdf.tar.gz
rust-4b2464592c482f846392ad69b1f79f6753572cdf.zip
Moved problematic tests on wasm32-unknown back to compile-fail.
-rw-r--r--src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs25
-rw-r--r--src/test/compile-fail/two-panic-runtimes.rs (renamed from src/test/ui/panic-runtime/two-panic-runtimes.rs)0
-rw-r--r--src/test/ui/panic-runtime/two-panic-runtimes.stderr4
3 files changed, 25 insertions, 4 deletions
diff --git a/src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs b/src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs
new file mode 100644
index 00000000000..d9848a554ab
--- /dev/null
+++ b/src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs
@@ -0,0 +1,25 @@
+// 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]
+#![feature(lang_items)]
+
+use core::panic::PanicInfo;
+
+#[lang = "panic_impl"]
+fn panic_impl(info: &PanicInfo) -> ! { loop {} }
+#[lang = "eh_personality"]
+fn eh_personality() {}
+#[lang = "eh_unwind_resume"]
+fn eh_unwind_resume() {}
diff --git a/src/test/ui/panic-runtime/two-panic-runtimes.rs b/src/test/compile-fail/two-panic-runtimes.rs
index 0fe0da2fa2c..0fe0da2fa2c 100644
--- a/src/test/ui/panic-runtime/two-panic-runtimes.rs
+++ b/src/test/compile-fail/two-panic-runtimes.rs
diff --git a/src/test/ui/panic-runtime/two-panic-runtimes.stderr b/src/test/ui/panic-runtime/two-panic-runtimes.stderr
deleted file mode 100644
index 0c81a103049..00000000000
--- a/src/test/ui/panic-runtime/two-panic-runtimes.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: cannot link together two panic runtimes: panic_runtime_unwind and panic_runtime_unwind2
-
-error: aborting due to previous error
-