Fix clang

.travis.yml

@@ -8,29 +8,24 @@ dist: trusty
 
 matrix:
   include:
-    # Test default clang
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          packages:
-            - valgrind
-
-    # Test clang-3.8
-    - env: CLANG_VERSION=3.8
+    # Test clang-3.6
+    # TODO: clang 3.7+ packages from http://llvm.org/apt do not support sanitizers yet, see https://llvm.org/bugs/show_bug.cgi?id=22757
+    - env: CLANG_VERSION=3.6
       os: linux
       addons:
         apt:
           packages:
             - valgrind
             - util-linux
-            - clang-3.8
+            - clang-3.6
+            - libclang-common-3.6-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise
+            - llvm-toolchain-precise-3.6
 
     # Test default gcc
-    - os: linux
+    - env: GCC_VERSION=4.8
+      os: linux
       compiler: gcc
       addons:
         apt:
@@ -57,6 +52,10 @@ env:
 before_install:
     - 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 [ "$GCC_VERSION" == "4.8" ]; then export CXX="g++" CC="gcc"; fi
+    - which $CXX
+    - which $CC
+    - which valgrind
 
 install:
     - pip install --user cpp-coveralls
@@ -67,7 +66,7 @@ install:
 script:
     - ./autogen.sh
     - ./configure && make -j2 distcheck VERBOSE=1 && make clean
-    - ./configure --enable-valgrind-tests CFLAGS="-fsanitize=undefined -fno-sanitize-recover" CXXFLAGS="-fsanitize=undefined -fno-sanitize-recover" && make -j2 distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-valgrind-tests CFLAGS=\"-fsanitize=undefined -fno-sanitize-recover\" CXXFLAGS=\"-fsanitize=undefined -fno-sanitize-recover\"" VERBOSE=1 && make clean
+    - if [ "$GCC_VERSION" != "4.8" ]; then ./configure --enable-valgrind-tests CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" CXXFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" && make -j2 distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-valgrind-tests CFLAGS=\"-fsanitize=undefined -fno-sanitize-recover=undefined\" CXXFLAGS=\"-fsanitize=undefined -fno-sanitize-recover=undefined\"" VERBOSE=1 && make clean; fi
     - if [ "$CC" = "gcc" ]; then ./configure --enable-code-coverage && make -j2 && make check; fi
 
 after_success: