Skip to content

Commit 2c0ccc3

Browse files
committed
Run wasm tests like all other tests
1 parent 0bd5460 commit 2c0ccc3

File tree

13 files changed

+800
-732
lines changed

13 files changed

+800
-732
lines changed

.travis.yml

-17
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,6 @@ matrix:
3030
env: TARGET=x86_64-apple-darwin NO_ADD=1
3131
script: ci/run.sh
3232
- env: TARGET=wasm32-unknown-unknown
33-
before_script:
34-
- git clone --recursive https://github.com/WebAssembly/wabt
35-
- (cd wabt && git reset --hard a0bdeb7 && make -j4)
36-
- export PATH=$PATH:$PWD/wabt/bin
37-
- git clone https://github.com/rustwasm/wasm-bindgen
38-
- (cd wasm-bindgen && cargo install --path crates/cli)
39-
script:
40-
- cargo build --target wasm32-unknown-unknown -p stdsimd
41-
- cargo build --target wasm32-unknown-unknown -p stdsimd --release
42-
- cargo rustc --target wasm32-unknown-unknown -p stdsimd --release --example wasm -- -C lto
43-
- wasm2wat target/wasm32-unknown-unknown/release/examples/wasm.wasm -o wasm.wat
44-
- cat wasm.wat
45-
- grep current_memory wasm.wat
46-
- grep grow_memory wasm.wat
47-
- cd crates/wasm-test
48-
- cargo test --target=$TARGET
49-
- cargo test --target=$TARGET --release
5033
- env: TARGET=thumbv6m-none-eabi NOSTD=1
5134
- env: TARGET=thumbv7m-none-eabi NOSTD=1
5235
- env: TARGET=thumbv7em-none-eabi NOSTD=1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update -y && apt-get install -y --no-install-recommends \
4+
ca-certificates \
5+
clang \
6+
cmake \
7+
curl \
8+
git \
9+
libc6-dev \
10+
make \
11+
python \
12+
xz-utils
13+
14+
# Install `wasm2wat`
15+
RUN git clone --recursive https://github.com/WebAssembly/wabt
16+
RUN make -C wabt -j$(nproc)
17+
ENV PATH=$PATH:/wabt/bin
18+
19+
# Install `wasm-bindgen-test-runner`
20+
RUN curl -L https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.15/wasm-bindgen-0.2.15-x86_64-unknown-linux-musl.tar.gz \
21+
| tar xzf -
22+
ENV PATH=$PATH:/wasm-bindgen-0.2.15-x86_64-unknown-linux-musl
23+
ENV CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner
24+
25+
# Install `node`
26+
RUN curl https://nodejs.org/dist/v10.8.0/node-v10.8.0-linux-x64.tar.xz | tar xJf -
27+
ENV PATH=$PATH:/node-v10.8.0-linux-x64/bin

ci/run.sh

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ case ${TARGET} in
3939
*android*)
4040
export STDSIMD_DISABLE_ASSERT_INSTR=1
4141
;;
42+
wasm32*)
43+
# export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+simd128"
44+
;;
45+
4246
*)
4347
;;
4448
esac

coresimd/wasm32/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
//! WASM32 intrinsics
22
33
#[macro_use]
4+
#[cfg(not(test))]
45
mod simd128;
6+
#[cfg(test)]
7+
pub mod simd128;
58
pub use self::simd128::*;
69

710
extern "C" {

0 commit comments

Comments
 (0)