Skip to content

Commit 2c0e1be

Browse files
Re-enable wasm32 tests in CI
These were previously disabled but the relevant fix in Cargo has long since landed.
1 parent 1275cc1 commit 2c0e1be

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

src/ci/docker/host-x86_64/wasm32/Dockerfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,4 @@ ENV EMCC_CFLAGS=-O1
5050
# Emscripten installation is user-specific
5151
ENV NO_CHANGE_USER=1
5252

53-
# FIXME: Re-enable these tests once https://github.com/rust-lang/cargo/pull/7476
54-
# is picked up by CI
55-
ENV SCRIPT python3 ../x.py test --stage 2 --target $TARGETS \
56-
--exclude library/core \
57-
--exclude library/alloc \
58-
--exclude library/proc_macro \
59-
--exclude library/std \
60-
--exclude library/term \
61-
--exclude library/test
53+
ENV SCRIPT python3 ../x.py test --stage 2 --target $TARGETS
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1+
# only-wasm32-bare
2+
13
-include ../../run-make-fulldeps/tools.mk
24

3-
ifeq ($(TARGET),wasm32-unknown-unknown)
45
all:
56
$(RUSTC) foo.rs -C lto -O --target wasm32-unknown-unknown
67
wc -c < $(TMPDIR)/foo.wasm
78
[ "`wc -c < $(TMPDIR)/foo.wasm`" -lt "25000" ]
8-
else
9-
all:
10-
endif

0 commit comments

Comments
 (0)