summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/test/shared.py4
-rwxr-xr-xtravis-emcc-tests.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index 9ba94d574..1ec42bc59 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -184,7 +184,9 @@ WASM_REDUCE = [os.path.join(options.binaryen_bin, 'wasm-reduce')]
WASM_METADCE = [os.path.join(options.binaryen_bin, 'wasm-metadce')]
WASM_EMSCRIPTEN_FINALIZE = [os.path.join(options.binaryen_bin,
'wasm-emscripten-finalize')]
-BINARYEN_JS = os.path.join(options.binaryen_root, 'out', 'binaryen.js')
+# Due to cmake limitations, we emit binaryen_js.js (see CMakeLists.txt
+# for why).
+BINARYEN_JS = os.path.join(options.binaryen_bin, 'binaryen_js.js')
def wrap_with_valgrind(cmd):
diff --git a/travis-emcc-tests.sh b/travis-emcc-tests.sh
index 488c2d848..5dde9d0ed 100755
--- a/travis-emcc-tests.sh
+++ b/travis-emcc-tests.sh
@@ -4,8 +4,6 @@ set -e
echo "travis-test build"
emconfigure cmake -DCMAKE_BUILD_TYPE=Release
emmake make -j4 binaryen_js
-mkdir -p out
-cp bin/binaryen_js.js out/binaryen.js
echo "travis-test test"
python3 -m scripts.test.binaryenjs
echo "travis-test yay!"