summaryrefslogtreecommitdiff
path: root/scripts/emcc-tests.sh
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2020-09-24 15:48:13 -0700
committerGitHub <noreply@github.com>2020-09-24 15:48:13 -0700
commit13e43b16b368e24727e9e368b78c925320380c9d (patch)
treed729c38a7e16942b7a04158c0ed73a2ff777f635 /scripts/emcc-tests.sh
parentf61ec303bca392fcec18a3c6116f9fa5fca17a1a (diff)
downloadbinaryen-13e43b16b368e24727e9e368b78c925320380c9d.tar.gz
binaryen-13e43b16b368e24727e9e368b78c925320380c9d.tar.bz2
binaryen-13e43b16b368e24727e9e368b78c925320380c9d.zip
Cleanup emcc-tests.sh (#3170)
- Use ninja - Use a sub-directory - Don't use emmake when running make/ninja (this is redundant if you use emconfigure to configure the build).
Diffstat (limited to 'scripts/emcc-tests.sh')
-rwxr-xr-xscripts/emcc-tests.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/emcc-tests.sh b/scripts/emcc-tests.sh
index 691d67fa6..ec3c5ec48 100755
--- a/scripts/emcc-tests.sh
+++ b/scripts/emcc-tests.sh
@@ -2,15 +2,16 @@
set -e
+mkdir -p emcc-build
echo "emcc-tests: build:wasm"
-emcmake cmake -DCMAKE_BUILD_TYPE=Release
-emmake make -j4 binaryen_wasm
+emcmake cmake -B emcc-build -DCMAKE_BUILD_TYPE=Release -G Ninja
+ninja -C emcc-build binaryen_wasm
echo "emcc-tests: test:wasm"
-./check.py binaryenjs_wasm
+./check.py --binaryen-bin=emcc-build/bin binaryenjs_wasm
echo "emcc-tests: done:wasm"
echo "emcc-tests: build:js"
-emmake make -j4 binaryen_js
+ninja -C emcc-build binaryen_js
echo "emcc-tests: test:js"
-./check.py binaryenjs
+./check.py --binaryen-bin=emcc-build/bin binaryenjs
echo "emcc-tests: done:js"