Skip to content

Commit 53d89e8

Browse files
committed
Fix tests
1 parent 542c82e commit 53d89e8

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.github/workflows/stdarch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ jobs:
133133
if: ${{ !matrix.cargo_runner }}
134134
run: |
135135
cd build_sysroot/sysroot_src/library/stdarch/
136-
CHANNEL=release TARGET=x86_64-unknown-linux-gnu ../../../../cargo.sh test
136+
CHANNEL=release TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ../../../../cargo.sh test
137137
138138
- name: Run stdarch tests
139139
if: ${{ matrix.cargo_runner }}
140140
run: |
141141
cd build_sysroot/sysroot_src/library/stdarch/
142-
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu ../../../../cargo.sh test -- --skip rtm --skip tbm --skip sse4a
142+
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ../../../../cargo.sh test -- --skip rtm --skip tbm --skip sse4a

failing-ui-tests.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,6 @@ tests/ui/issues/issue-29948.rs
6767
tests/ui/panic-while-printing.rs
6868
tests/ui/enum-discriminant/get_discr.rs
6969
tests/ui/panics/nested_panic_caught.rs
70+
tests/ui/simd/intrinsic/generic-bswap-byte.rs
71+
tests/ui/const_prop/ice-issue-111353.rs
72+
tests/ui/process/println-with-broken-pipe.rs

test.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,14 +346,18 @@ function test_rustc() {
346346
git checkout -- tests/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
347347

348348
rm -r tests/ui/{abi*,extern/,unsized-locals/,proc-macro/,threads-sendsync/,thinlto/,borrowck/,chalkify/bugs/,test*,*lto*.rs,consts/const-float-bits-reject-conv.rs,consts/issue-miri-1910.rs} || true
349-
rm tests/ui/mir/mir_heavy_promoted.rs # this tests is oom-killed in the CI.
349+
rm tests/ui/mir/mir_heavy_promoted.rs # this test is oom-killed in the CI.
350+
# Tests generating errors.
351+
rm tests/ui/consts/const-eval/nonnull_as_ref_ub.rs tests/ui/consts/issue-94675.rs
350352
for test in $(rg --files-with-matches "thread|lto" tests/ui); do
351353
rm $test
352354
done
353355
git checkout tests/ui/lto/auxiliary/dylib.rs
354356
git checkout tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice.rs
355357
git checkout tests/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs
356358
git checkout tests/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs
359+
git checkout tests/ui/imports/ambiguous-1.rs
360+
git checkout tests/ui/imports/ambiguous-4-extern.rs
357361

358362
RUSTC_ARGS="$TEST_FLAGS -Csymbol-mangling-version=v0 -Zcodegen-backend="$(pwd)"/../target/"$CHANNEL"/librustc_codegen_gcc."$dylib_ext" --sysroot "$(pwd)"/../build_sysroot/sysroot"
359363

0 commit comments

Comments
 (0)