Merge 958836c into 05bb0be

.travis.yml

@@ -1,7 +1,7 @@
 language: c
 
 # container-based builds
-sudo: required
+sudo: false
 
 git:
   depth: 1
@@ -18,13 +18,15 @@ matrix:
     - compiler: gcc
       env: BUILD=cmake
     - compiler: clang
-      env: BUILD=cmake CMAKE_OPTION="-DUSE_VALGRIND=no -DNO_UNDEFINED=no" CFLAGS="-fsanitize=address -fsanitize=undefined"
+      # LSan does not work in containers https://github.com/travis-ci/travis-ci/issues/9033
+      sudo: true
+      env: BUILD=cmake CMAKE_OPTION="-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DUSE_VALGRIND=no -DNO_UNDEFINED=no" CFLAGS="-fsanitize=address -fsanitize=undefined"
     - compiler: gcc
       env: BUILD=cmake CMAKE_OPTION="-DENABLE_GCOV=yes -DUSE_VALGRIND=no" COVERALLS=yes
     - compiler: clang
-      env: BUILD=cmake CMAKE_OPTION="-DWITH_STATIC_SQLITE3=yes"
+      env: BUILD=cmake CMAKE_OPTION="-DWITH_INTERNAL_SQLITE3=yes"
     - compiler: gcc
-      env: BUILD=autotools CONFIGURE_OPTION="--with-static_sqlite3=yes"
+      env: BUILD=autotools CONFIGURE_OPTION="--with-internal-sqlite3=yes"
     - compiler: gcc
       env: BUILD=cmake CMAKE_OPTION="-DWITH_SQLITE3=no"
     - compiler: clang
@@ -34,14 +36,10 @@ matrix:
 before_install:
   - pip install --user cpp-coveralls
   - P_JOBS="-j$(getconf _NPROCESSORS_ONLN)"
-  - yes | sudo add-apt-repository ppa:kalakris/cmake
-  - sudo apt-get update -qq
-
-install: sudo apt-get install cmake
 
 script:
-  - if [ x$BUILD == xautotools ]; then ./autogen.sh && ./configure $CONFIGURE_OPTION && make $P_JOBS CFLAGS="$CFLAGS -Wall -Werror" && make $P_JOBS check && make $P_JOBS release && LC_ALL=c sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi
-  - if [ x$BUILD == xcmake ]; then CFLAGS="$CFLAGS -Wall -Werror" cmake . $CMAKE_OPTION && make $P_JOBS && make $P_JOBS check && LC_ALL=C sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi
+  - if [ x$BUILD == xautotools ]; then ./autogen.sh && ./configure $CONFIGURE_OPTION && make $P_JOBS CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-const-variable" && make $P_JOBS check && make $P_JOBS release && LC_ALL=c sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi
+  - if [ x$BUILD == xcmake ]; then CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-const-variable" cmake . $CMAKE_OPTION && make $P_JOBS && make $P_JOBS check && LC_ALL=C sort data/tsi.src > data/tsi.src.sort && diff data/tsi.src data/tsi.src.sort; fi
 
 after_success:
   - if [ x$COVERALLS == xyes ]; then coveralls --exclude src/tools --exclude contrib --exclude test --exclude thirdparty --exclude-pattern '.*CMake[^/]+\.c(?:pp)?' --exclude-pattern '.*/[_A-Z0-9]+\.c(?:pp)?' --exclude-pattern '[^\.]*\.h'; fi
@@ -59,11 +57,14 @@ addons:
   apt:
     sources:
     # sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
-    - kalakris-cmake
+    - llvm-toolchain-trusty-6.0
+    - ubuntu-toolchain-r-test
     packages:
     # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
     - cmake
     - cmake-data
     - texinfo
     - libsqlite3-dev
     - valgrind
+    - g++-4.9
+    - clang-6.0