Skip to content

Commit

Permalink
Rollup merge of rust-lang#123034 - bjorn3:test_ignores, r=compiler-er…
Browse files Browse the repository at this point in the history
…rors

Add a bunch of needs-unwind annotations to tests

To filter out tests that fail with cg_clif due to missing panic=unwind support.
  • Loading branch information
matthiaskrgr authored Mar 25, 2024
2 parents 11f168f + 5f5dcae commit 4369718
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 16 deletions.
15 changes: 0 additions & 15 deletions compiler/rustc_codegen_cranelift/scripts/test_rustc_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,6 @@ rm tests/ui/parser/unclosed-delimiter-in-dep.rs # submodule contains //~ERROR
# missing features
# ================

# requires stack unwinding
# FIXME add needs-unwind to these tests
rm -r tests/run-make/libtest-junit
rm tests/ui/asm/may_unwind.rs
rm tests/ui/stable-mir-print/basic_function.rs

# extra warning about -Cpanic=abort for proc macros
rm tests/ui/proc-macro/crt-static.rs
rm tests/ui/proc-macro/proc-macro-deprecated-attr.rs
rm tests/ui/proc-macro/quote-debug.rs
rm tests/ui/proc-macro/no-missing-docs.rs
rm tests/ui/rust-2018/proc-macro-crate-in-paths.rs
rm tests/ui/proc-macro/allowed-signatures.rs
rm tests/ui/proc-macro/no-mangle-in-proc-macro-issue-111888.rs

# vendor intrinsics
rm tests/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
rm tests/ui/asm/x86_64/evex512-implicit-feature.rs # unimplemented AVX512 x86 vendor intrinsic
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/libtest-junit/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# ignore-cross-compile
# needs-unwind contains should_panic test
include ../tools.mk

# Test expected libtest's junit output
Expand Down
1 change: 1 addition & 0 deletions tests/ui/asm/may_unwind.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//@ run-pass
//@ needs-asm-support
//@ needs-unwind

#![feature(asm_unwind)]

Expand Down
3 changes: 2 additions & 1 deletion tests/ui/proc-macro/allowed-signatures.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//@ check-pass
//@ force-host
//@ no-prefer-dynamic
//@ needs-unwind compiling proc macros with panic=abort causes a warning

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

#[proc_macro]
pub fn foo<T>(t: T) -> TokenStream {
TokenStream::new()
TokenStream::new()
}

trait Project {
Expand Down
1 change: 1 addition & 0 deletions tests/ui/proc-macro/crt-static.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//@ force-host
//@ no-prefer-dynamic
//@ needs-dynamic-linking
//@ needs-unwind compiling proc macros with panic=abort causes a warning

#![crate_type = "proc-macro"]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//@ build-pass
//@ force-host
//@ no-prefer-dynamic
//@ needs-unwind compiling proc macros with panic=abort causes a warning
//@ aux-build:exports_no_mangle.rs
#![crate_type = "proc-macro"]

Expand Down
1 change: 1 addition & 0 deletions tests/ui/proc-macro/no-missing-docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//@ build-pass (FIXME(62277): could be check-pass?)
//@ force-host
//@ no-prefer-dynamic
//@ needs-unwind compiling proc macros with panic=abort causes a warning

#![crate_type = "proc-macro"]
#![deny(missing_docs)]
Expand Down
1 change: 1 addition & 0 deletions tests/ui/proc-macro/proc-macro-deprecated-attr.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//@ check-pass
//@ force-host
//@ no-prefer-dynamic
//@ needs-unwind compiling proc macros with panic=abort causes a warning

#![deny(deprecated)]

Expand Down
1 change: 1 addition & 0 deletions tests/ui/proc-macro/quote-debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//@ force-host
//@ no-prefer-dynamic
//@ compile-flags: -Z unpretty=expanded
//@ needs-unwind compiling proc macros with panic=abort causes a warning
//
// This file is not actually used as a proc-macro - instead,
// it's just used to show the output of the `quote!` macro
Expand Down
1 change: 1 addition & 0 deletions tests/ui/proc-macro/quote-debug.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//@ force-host
//@ no-prefer-dynamic
//@ compile-flags: -Z unpretty=expanded
//@ needs-unwind compiling proc macros with panic=abort causes a warning
//
// This file is not actually used as a proc-macro - instead,
// it's just used to show the output of the `quote!` macro
Expand Down
1 change: 1 addition & 0 deletions tests/ui/rust-2018/proc-macro-crate-in-paths.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//@ build-pass (FIXME(62277): could be check-pass?)
//@ force-host
//@ no-prefer-dynamic
//@ needs-unwind compiling proc macros with panic=abort causes a warning

#![crate_type = "proc-macro"]
#![deny(rust_2018_compatibility)]
Expand Down
1 change: 1 addition & 0 deletions tests/ui/stable-mir-print/basic_function.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//@ compile-flags: -Z unpretty=stable-mir -Z mir-opt-level=3
//@ check-pass
//@ only-x86_64
//@ needs-unwind unwind edges are different with panic=abort

fn foo(i: i32) -> i32 {
i + 1
Expand Down

0 comments on commit 4369718

Please sign in to comment.