From 5d3b8e7c1b259b82549d631f66b88bd041dce3fc Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sun, 19 Sep 2021 13:56:58 +0200
Subject: Merge commit '61667dedf55e3e5aa584f7ae2bd0471336b92ce9' into
 sync_cg_clif-2021-09-19

---
 scripts/test_rustc_tests.sh | 2 +-
 scripts/tests.sh            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/test_rustc_tests.sh b/scripts/test_rustc_tests.sh
index 0ac49dd3574..b714d47fec2 100755
--- a/scripts/test_rustc_tests.sh
+++ b/scripts/test_rustc_tests.sh
@@ -11,7 +11,7 @@ pushd rust
 cargo install ripgrep
 
 rm -r src/test/ui/{extern/,panics/,unsized-locals/,thinlto/,simd*,*lto*.rs,linkage*,unwind-*.rs} || true
-for test in $(rg --files-with-matches "asm!|catch_unwind|should_panic|lto" src/test/ui); do
+for test in $(rg --files-with-matches "asm!|catch_unwind|should_panic|lto|// needs-asm-support" src/test/ui); do
   rm $test
 done
 
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 0eef710239b..28a7980d661 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -137,8 +137,8 @@ function extended_sysroot_tests() {
     fi
     popd
 
-    pushd stdsimd
-    echo "[TEST] rust-lang/stdsimd"
+    pushd portable-simd
+    echo "[TEST] rust-lang/portable-simd"
     ../build/cargo clean
     ../build/cargo build --all-targets --target $TARGET_TRIPLE
     if [[ "$HOST_TRIPLE" = "$TARGET_TRIPLE" ]]; then
-- 
cgit 1.4.1-3-g733a5