From f7f7c1eef39e945b48a36729291dfe69b51be35d Mon Sep 17 00:00:00 2001 From: David Wood Date: Mon, 13 Aug 2018 11:56:01 +0200 Subject: Moved problematic tests on dist-x86_64-musl back to compile-fail. --- .../compile-fail/auxiliary/panic-runtime-unwind.rs | 27 ++++++++++++++++++++++ .../auxiliary/panic-runtime-unwind2.rs | 27 ++++++++++++++++++++++ .../auxiliary/wants-panic-runtime-unwind.rs | 16 +++++++++++++ src/test/compile-fail/want-abort-got-unwind.rs | 17 ++++++++++++++ src/test/compile-fail/want-abort-got-unwind2.rs | 18 +++++++++++++++ src/test/ui/panic-runtime/want-abort-got-unwind.rs | 17 -------------- .../ui/panic-runtime/want-abort-got-unwind.stderr | 6 ----- .../ui/panic-runtime/want-abort-got-unwind2.rs | 18 --------------- .../ui/panic-runtime/want-abort-got-unwind2.stderr | 6 ----- 9 files changed, 105 insertions(+), 47 deletions(-) create mode 100644 src/test/compile-fail/auxiliary/panic-runtime-unwind.rs create mode 100644 src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs create mode 100644 src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs create mode 100644 src/test/compile-fail/want-abort-got-unwind.rs create mode 100644 src/test/compile-fail/want-abort-got-unwind2.rs delete mode 100644 src/test/ui/panic-runtime/want-abort-got-unwind.rs delete mode 100644 src/test/ui/panic-runtime/want-abort-got-unwind.stderr delete mode 100644 src/test/ui/panic-runtime/want-abort-got-unwind2.rs delete mode 100644 src/test/ui/panic-runtime/want-abort-got-unwind2.stderr (limited to 'src/test') 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 or the MIT license +// , 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 or the MIT license +// , 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 or the MIT license +// , 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/compile-fail/want-abort-got-unwind.rs b/src/test/compile-fail/want-abort-got-unwind.rs new file mode 100644 index 00000000000..b178006411b --- /dev/null +++ b/src/test/compile-fail/want-abort-got-unwind.rs @@ -0,0 +1,17 @@ +// 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 or the MIT license +// , 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/compile-fail/want-abort-got-unwind2.rs b/src/test/compile-fail/want-abort-got-unwind2.rs new file mode 100644 index 00000000000..de8e010c3cb --- /dev/null +++ b/src/test/compile-fail/want-abort-got-unwind2.rs @@ -0,0 +1,18 @@ +// 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 or the MIT license +// , 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-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 or the MIT license -// , 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 or the MIT license -// , 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 - -- cgit 1.4.1-3-g733a5