Look for bin/binaryen_js.js directly, instead of expecting us to copy it. (#2508)

Author: kripken

scripts/test/shared.py

@@ -184,7 +184,9 @@ def is_exe(fpath):
 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):

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!"