summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2018-03-16 13:17:45 -0700
committerGitHub <noreply@github.com>2018-03-16 13:17:45 -0700
commitc52f23608e33ab972cfa187409e8c78793103d4b (patch)
treeea6420919019356b11b53d8cc433235c7a8e613b
parent963b585bf66a6b9a31c13f244f1e6612d0c96991 (diff)
downloadbinaryen-c52f23608e33ab972cfa187409e8c78793103d4b.tar.gz
binaryen-c52f23608e33ab972cfa187409e8c78793103d4b.tar.bz2
binaryen-c52f23608e33ab972cfa187409e8c78793103d4b.zip
use jsvu to get spidermonkey (#1443)
jsvu is an easy way to get JS VMs. This uses it to get SpiderMonkey, which is then used to check asm.js validation in the wasm2asm tests.
-rw-r--r--.travis.yml6
-rw-r--r--scripts/test/shared.py2
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 39cf9e6e2..a41368a67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ jobs:
stage: test
compiler: clang
python: 2.7
- node_js: 7
+ node_js: 9
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
@@ -25,6 +25,10 @@ jobs:
- export ASAN_OPTIONS="symbolize=1"
install:
- pip install --user flake8==3.4.1
+ # get jsvu in order to get more js engines
+ - npm install jsvu -g
+ - export PATH="${HOME}/.jsvu:${PATH}"
+ - jsvu --os=linux64 --engines=spidermonkey
before_script:
# Check the style of a subset of Python code until the other code is updated.
- flake8 ./scripts/
diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index b48202e98..23f10ca2c 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -155,7 +155,7 @@ NATIVECC = (os.environ.get('CC') or which('mingw32-gcc') or
NATIVEXX = (os.environ.get('CXX') or which('mingw32-g++') or
which('g++') or which('clang++'))
NODEJS = which('nodejs') or which('node')
-MOZJS = which('mozjs')
+MOZJS = which('mozjs') or which('spidermonkey')
EMCC = which('emcc')
BINARYEN_INSTALL_DIR = os.path.dirname(options.binaryen_bin)