Skip to content

Commit 4369718

Browse files
authored
Rollup merge of rust-lang#123034 - bjorn3:test_ignores, r=compiler-errors
Add a bunch of needs-unwind annotations to tests To filter out tests that fail with cg_clif due to missing panic=unwind support.
2 parents 11f168f + 5f5dcae commit 4369718

File tree

12 files changed

+12
-16
lines changed

12 files changed

+12
-16
lines changed

compiler/rustc_codegen_cranelift/scripts/test_rustc_tests.sh

-15
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ rm tests/ui/parser/unclosed-delimiter-in-dep.rs # submodule contains //~ERROR
4141
# missing features
4242
# ================
4343

44-
# requires stack unwinding
45-
# FIXME add needs-unwind to these tests
46-
rm -r tests/run-make/libtest-junit
47-
rm tests/ui/asm/may_unwind.rs
48-
rm tests/ui/stable-mir-print/basic_function.rs
49-
50-
# extra warning about -Cpanic=abort for proc macros
51-
rm tests/ui/proc-macro/crt-static.rs
52-
rm tests/ui/proc-macro/proc-macro-deprecated-attr.rs
53-
rm tests/ui/proc-macro/quote-debug.rs
54-
rm tests/ui/proc-macro/no-missing-docs.rs
55-
rm tests/ui/rust-2018/proc-macro-crate-in-paths.rs
56-
rm tests/ui/proc-macro/allowed-signatures.rs
57-
rm tests/ui/proc-macro/no-mangle-in-proc-macro-issue-111888.rs
58-
5944
# vendor intrinsics
6045
rm tests/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
6146
rm tests/ui/asm/x86_64/evex512-implicit-feature.rs # unimplemented AVX512 x86 vendor intrinsic

tests/run-make/libtest-junit/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind contains should_panic test
23
include ../tools.mk
34

45
# Test expected libtest's junit output

tests/ui/asm/may_unwind.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ run-pass
22
//@ needs-asm-support
3+
//@ needs-unwind
34

45
#![feature(asm_unwind)]
56

tests/ui/proc-macro/allowed-signatures.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ check-pass
22
//@ force-host
33
//@ no-prefer-dynamic
4+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
45

56
#![crate_type = "proc-macro"]
67
#![allow(private_interfaces)]
@@ -9,7 +10,7 @@ use proc_macro::TokenStream;
910

1011
#[proc_macro]
1112
pub fn foo<T>(t: T) -> TokenStream {
12-
TokenStream::new()
13+
TokenStream::new()
1314
}
1415

1516
trait Project {

tests/ui/proc-macro/crt-static.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//@ force-host
88
//@ no-prefer-dynamic
99
//@ needs-dynamic-linking
10+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
1011

1112
#![crate_type = "proc-macro"]
1213

tests/ui/proc-macro/no-mangle-in-proc-macro-issue-111888.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ build-pass
22
//@ force-host
33
//@ no-prefer-dynamic
4+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
45
//@ aux-build:exports_no_mangle.rs
56
#![crate_type = "proc-macro"]
67

tests/ui/proc-macro/no-missing-docs.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//@ build-pass (FIXME(62277): could be check-pass?)
55
//@ force-host
66
//@ no-prefer-dynamic
7+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
78

89
#![crate_type = "proc-macro"]
910
#![deny(missing_docs)]

tests/ui/proc-macro/proc-macro-deprecated-attr.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ check-pass
22
//@ force-host
33
//@ no-prefer-dynamic
4+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
45

56
#![deny(deprecated)]
67

tests/ui/proc-macro/quote-debug.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ force-host
33
//@ no-prefer-dynamic
44
//@ compile-flags: -Z unpretty=expanded
5+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
56
//
67
// This file is not actually used as a proc-macro - instead,
78
// it's just used to show the output of the `quote!` macro

tests/ui/proc-macro/quote-debug.stdout

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//@ force-host
55
//@ no-prefer-dynamic
66
//@ compile-flags: -Z unpretty=expanded
7+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
78
//
89
// This file is not actually used as a proc-macro - instead,
910
// it's just used to show the output of the `quote!` macro

tests/ui/rust-2018/proc-macro-crate-in-paths.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ build-pass (FIXME(62277): could be check-pass?)
22
//@ force-host
33
//@ no-prefer-dynamic
4+
//@ needs-unwind compiling proc macros with panic=abort causes a warning
45

56
#![crate_type = "proc-macro"]
67
#![deny(rust_2018_compatibility)]

tests/ui/stable-mir-print/basic_function.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ compile-flags: -Z unpretty=stable-mir -Z mir-opt-level=3
22
//@ check-pass
33
//@ only-x86_64
4+
//@ needs-unwind unwind edges are different with panic=abort
45

56
fn foo(i: i32) -> i32 {
67
i + 1

0 commit comments

Comments
 (0)