diff options
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rwxr-xr-x | check.py | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 3328c0071..ea0d1fd2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: false -dist: trusty +dist: bionic language: cpp stages: @@ -64,7 +64,7 @@ jobs: - ./scripts/gen-s-parser.py | diff src/gen-s-parser.inc - - 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 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + - cmake ${TRAVIS_BUILD_DIR} -DCMAKE_C_FLAGS="$COMPILER_FLAGS" -DCMAKE_CXX_FLAGS="$COMPILER_FLAGS" -DCMAKE_EXE_LINKER_FLAGS="$LINKER_FLAGS" -DCMAKE_INSTALL_PREFIX=install -DCMAKE_EXPORT_COMPILE_COMMANDS=ON # clang-tidy-diff.sh may not exist when BUILD_SUBDIR is a subdirectory - if [ -f clang-tidy-diff.sh ]; then ./clang-tidy-diff.sh; fi - make -j2 install @@ -87,13 +87,14 @@ jobs: - <<: *test-ubuntu env: | COMPILER_FLAGS="-fsanitize=thread" + LINKER_FLAGS="-fsanitize=thread" - # Build with gcc 5 and run tests on the host system (Ubuntu). + # Build with gcc 7 and run tests on the host system (Ubuntu). - <<: *test-ubuntu compiler: gcc env: | - CC="gcc-5" - CXX="g++-5" + CC="gcc-7" + CXX="g++-7" # Build the .js outputs using emcc - &test-emcc @@ -482,6 +482,9 @@ def run_gcc_tests(): '-I' + os.path.join(options.binaryen_root, 'src'), '-g', '-L' + libpath, '-pthread'] if src.endswith('.cpp'): extra += ['-std=c++11'] + if os.environ.get('COMPILER_FLAGS'): + for f in os.environ.get('COMPILER_FLAGS').split(' '): + extra.append(f) print 'build: ', ' '.join(extra) subprocess.check_call(extra) # Link against the binaryen C library DSO, using an executable-relative rpath |