diff options
| author | bors <bors@rust-lang.org> | 2021-09-26 23:31:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-26 23:31:01 +0000 |
| commit | 500e22e340ee260c3fcd0e34e20e5c5d71df04bf (patch) | |
| tree | 5cf9c7e94f924daf928f480a040497724dd71b94 /scripts | |
| parent | 1b34e2d678bc45a2877c18d93a7a5049f8f8ef84 (diff) | |
| parent | 5d3b8e7c1b259b82549d631f66b88bd041dce3fc (diff) | |
| download | rust-500e22e340ee260c3fcd0e34e20e5c5d71df04bf.tar.gz rust-500e22e340ee260c3fcd0e34e20e5c5d71df04bf.zip | |
Auto merge of #89092 - bjorn3:sync_cg_clif-2021-09-19, r=bjorn3
Sync rustc_codegen_cranelift Nothing exciting this time. Mostly internal refactorings. r? `@ghost` `@rustbot` label +A-codegen +A-cranelift +T-compiler
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/test_rustc_tests.sh | 2 | ||||
| -rwxr-xr-x | scripts/tests.sh | 4 |
2 files changed, 3 insertions, 3 deletions
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 |
