WIP: Quick and dirty - get WASM to pass CI

tcharding · Jul 21, 2023 · ecb97c9 · ecb97c9
1 parent c6b103a
commit ecb97c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/contrib/_test.sh b/contrib/_test.sh
@@ -83,21 +83,6 @@ if [ "$DO_DOCS" = true ]; then
     RUSTDOCFLAGS="-D warnings" cargo +stable doc --all-features
 fi
 
-# Webassembly stuff
-if [ "$DO_WASM" = true ]; then
-    clang --version
-    CARGO_TARGET_DIR=wasm cargo install --force wasm-pack
-
-    cp Cargo.toml orig-Cargo.toml
-    printf '\n[lib]\ncrate-type = ["cdylib", "rlib"]\n' >> Cargo.toml
-
-    CC=clang wasm-pack build
-    CC=clang wasm-pack test --node
-
-    rm Cargo.toml
-    mv orig-Cargo.toml Cargo.toml
-fi
-
 # Address Sanitizer
 if [ "$DO_ASAN" = true ]; then
     clang --version

diff --git a/contrib/test.sh b/contrib/test.sh
@@ -6,6 +6,19 @@ REPO_DIR=$(git rev-parse --show-toplevel)
 
 DEPS="recent minimal"
 
+# Webassembly stuff
+if [ "$DO_WASM" = true ]; then
+    clang --version
+    CARGO_TARGET_DIR=wasm cargo install --force wasm-pack
+
+    printf '\n[lib]\ncrate-type = ["cdylib", "rlib"]\n' >> Cargo.toml
+
+    CC=clang wasm-pack build
+    CC=clang wasm-pack test --node
+
+    exit 0
+fi
+
 for dep in $DEPS
 do
 	cp "Cargo-$dep.lock" Cargo.lock