Fixed travis

This commit is contained in:
gabime 2018-08-14 01:19:29 +03:00
parent cb0d8cfbbd
commit 1dba3162c4

View File

@ -82,11 +82,17 @@ matrix:
addons: *clang6 addons: *clang6
before_install: before_script:
- if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi - if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
- if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi - if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi
- which $CXX
- which $CC
- which valgrind
- $CXX --version
- cmake --version
- valgrind --version
install: script:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- mkdir -p build && cd build - mkdir -p build && cd build
- | - |
@ -99,17 +105,9 @@ install:
-DSPDLOG_SANITIZE_ADDRESS=$ASAN \ -DSPDLOG_SANITIZE_ADDRESS=$ASAN \
-DSPDLOG_SANITIZE_THREAD=$TSAN -DSPDLOG_SANITIZE_THREAD=$TSAN
- make VERBOSE=1 -j2 - make VERBOSE=1 -j2
before_script:
- which $CXX
- which $CC
- which valgrind
- $CXX --version
- cmake --version
- valgrind --version
script:
- ctest -j2 --output-on-failure - ctest -j2 --output-on-failure
notifications: notifications:
email: false email: false