From 62e603527d8fd16695c5a3958e4aaab925104fdb Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 28 May 2023 11:04:15 +0000 Subject: [PATCH] Don't explicitly remove needs-unwind tests Compiletest now respects panic=abort in the --print cfg output --- scripts/test_rustc_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test_rustc_tests.sh b/scripts/test_rustc_tests.sh index db304332a9d..1b69be43086 100755 --- a/scripts/test_rustc_tests.sh +++ b/scripts/test_rustc_tests.sh @@ -11,12 +11,12 @@ pushd rust command -v rg >/dev/null 2>&1 || cargo install ripgrep rm -r tests/ui/{unsized-locals/,lto/,linkage*} || true -for test in $(rg --files-with-matches "lto|// needs-asm-support|// needs-unwind" tests/{codegen-units,ui,incremental}); do +for test in $(rg --files-with-matches "lto|// needs-asm-support" tests/{codegen-units,ui,incremental}); do rm $test done for test in tests/run-make/**/Makefile; do - if rg "# needs-asm-support|# needs-unwind" $test >/dev/null; then + if rg "# needs-asm-support" $test >/dev/null; then rm -r $(dirname $test) fi done