diff options
| -rw-r--r-- | .travis.yml | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 512953b2b..bde120906 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,16 @@ jobs: - ./check.py --test-waterfall --only-prepare script: - flake8 - - cmake . -DCMAKE_C_FLAGS="$COMPILER_FLAGS" -DCMAKE_CXX_FLAGS="$COMPILER_FLAGS" - - make -j2 - - ./check.py --test-waterfall + - BUILD_SUBDIR=${BUILD_SUBDIR:-.} + - mkdir -p ${BUILD_SUBDIR} && cd ${BUILD_SUBDIR} + - cmake ${TRAVIS_BUILD_DIR} -DCMAKE_C_FLAGS="$COMPILER_FLAGS" -DCMAKE_CXX_FLAGS="$COMPILER_FLAGS" -DCMAKE_INSTALL_PREFIX=install + - make -j2 install + - cd ${TRAVIS_BUILD_DIR} + - ./check.py --test-waterfall --binaryen-bin=${BUILD_SUBDIR}/install/bin + + - <<: *test-ubuntu + env: | + BUILD_SUBDIR=out - <<: *test-ubuntu env: | @@ -66,13 +73,13 @@ jobs: language: node_js sudo: required services: - - docker + - docker before_install: - - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash + - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash script: - # run binaryen.js and wasm.js tests before and after building, so we see if the bundled - # version is good too - - docker exec -it emscripten bash ./travis-emcc-tests.sh + # run binaryen.js and wasm.js tests before and after building, so we see if the bundled + # version is good too + - docker exec -it emscripten bash ./travis-emcc-tests.sh # Build with gcc 6.3 and run tests on Alpine Linux (inside chroot). # Note: Alpine uses musl libc. |