Skip to content

Commit afe85f0

Browse files
committed
feat(ci): update test-various for wasm32-unknown-unknown
1 parent 3f2acf2 commit afe85f0

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/ci/docker/host-x86_64/test-various/Dockerfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update && apt-get install -y --no-install-recommends \
55
clang-11 \
66
llvm-11 \
7+
gcc-multilib \
78
g++ \
89
make \
910
ninja-build \
@@ -59,8 +60,8 @@ RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v19.0
5960
tar -xJ
6061
ENV PATH "$PATH:/wasmtime-v19.0.0-x86_64-linux"
6162

62-
ENV WASM_TARGETS=wasm32-wasip1
63-
ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_TARGETS \
63+
ENV WASM_WASIP_TARGET=wasm32-wasip1
64+
ENV WASM_WASIP_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_WASIP_TARGET \
6465
tests/run-make \
6566
tests/ui \
6667
tests/mir-opt \
@@ -69,6 +70,12 @@ ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_T
6970
tests/assembly \
7071
library/core
7172

73+
ENV WASM_BARE_TARGET=wasm32-unknown-unknown \
74+
CC_wasm32_unknown_unknown=clang-11 \
75+
CXX_wasm32_unknown_unknown=clang++-11
76+
ENV WASM_BARE_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_BARE_TARGET \
77+
tests/run-make/wasm-builtins-no-linker-warning
78+
7279
ENV NVPTX_TARGETS=nvptx64-nvidia-cuda
7380
ENV NVPTX_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $NVPTX_TARGETS \
7481
tests/run-make \
@@ -90,4 +97,4 @@ ENV UEFI_TARGETS=aarch64-unknown-uefi,i686-unknown-uefi,x86_64-unknown-uefi \
9097
ENV UEFI_SCRIPT python3 /checkout/x.py --stage 2 build --host='' --target $UEFI_TARGETS && \
9198
python3 -u /uefi_qemu_test/run.py
9299

93-
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT && $UEFI_SCRIPT
100+
ENV SCRIPT $WASM_BARE_SCRIPT && $WASM_WASIP_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT && $UEFI_SCRIPT

0 commit comments

Comments
 (0)