From a2e923de32d04012f201c2cc8fe4b79e425b5608 Mon Sep 17 00:00:00 2001 From: Niels Date: Wed, 10 Aug 2016 18:38:31 +0200 Subject: [PATCH] removed clang 3.5.x --- .travis.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 344aa219..f1db0a25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,18 +70,6 @@ matrix: # Linux / Clang - - os: linux - env: LLVM_VERSION=3.5.0 - compiler: clang - - - os: linux - env: LLVM_VERSION=3.5.1 - compiler: clang - - - os: linux - env: LLVM_VERSION=3.5.2 - compiler: clang - - os: linux env: LLVM_VERSION=3.6.0 compiler: clang @@ -116,9 +104,6 @@ matrix: cache: directories: - - ${TRAVIS_BUILD_DIR}/deps/llvm-3.5.2 - - ${TRAVIS_BUILD_DIR}/deps/llvm-3.5.1 - - ${TRAVIS_BUILD_DIR}/deps/llvm-3.5.0 - ${TRAVIS_BUILD_DIR}/deps/llvm-3.6.2 - ${TRAVIS_BUILD_DIR}/deps/llvm-3.6.1 - ${TRAVIS_BUILD_DIR}/deps/llvm-3.6.0 @@ -151,7 +136,7 @@ install: (cd ${LLVM_DIR}/build/projects/libcxx && make install -j2) (cd ${LLVM_DIR}/build/projects/libcxxabi && make install -j2) fi - export CXXFLAGS="-stdlib=libc++ -nostdinc++ -isystem ${LLVM_DIR}/install/include/c++/v1" + export CXXFLAGS="-nostdinc++ -isystem ${LLVM_DIR}/install/include/c++/v1" export LDFLAGS="-L ${LLVM_DIR}/install/lib -l c++ -l c++abi" export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LLVM_DIR}/install/lib" export PATH="${LLVM_DIR}/clang/bin:${PATH}" @@ -166,6 +151,9 @@ script: - $CXX --version - make - test/json_unit + - if [ `which valgrind` ]; then + valgrind --error-exitcode=1 --leak-check=full test/json_unit ; + fi - if [ `which brew` ]; then brew update ; brew tap nlohmann/json ;