Add clang 3.8 to Travis CI build and remove old build script

.travis.yml

@@ -9,31 +9,50 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-5', 'valgrind']
-      env: COMPILER=g++-5
+          packages: ['g++-5']
+      env:
+        - CXX_COMPILER=g++-5
+        - C_COMPILER=gcc-5
 
     - os: linux
       compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
-          packages: ['clang-3.6', 'valgrind']
-      env: COMPILER=clang++-3.6
+          packages: ['clang-3.6']
+      env:
+        - CXX_COMPILER=clang++-3.6
+        - C_COMPILER=clang-3.6
+        - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-DBOOST_NO_CXX11_ALLOCATOR"
 
     - os: linux
       compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
-          packages: ['clang-3.7', 'valgrind']
-      env: COMPILER=clang++-3.7
+          packages: ['clang-3.7']
+      env:
+        - CXX_COMPILER=clang++-3.7
+        - C_COMPILER=clang-3.7
+        - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-DBOOST_NO_CXX11_ALLOCATOR"
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8']
+          packages: ['clang-3.8', 'libc++-dev', 'libc++abi-dev']
+      env:
+        - CXX_COMPILER=clang++-3.8
+        - C_COMPILER=clang-3.8
+        - CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
 
 before_install:
   - sudo apt-get update -qq
-
-install:
-  - sudo apt-get install -y --force-yes libboost1.55-dev libboost-regex1.55-dev
+  - sudo apt-get install -y --force-yes libboost1.55-dev
 
 script:
-  - CXX=$COMPILER ./travis.sh
-
+  - mkdir build && cd build
+  - cmake $CMAKE_FLAGS -DCMAKE_CXX_COMPILER=$CXX_COMPILER -DCMAKE_C_COMPILER=$C_COMPILER ..
+  - VERBOSE=1 make
+  - ./test_suite

travis.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -e   # (errexit) Exit if any subcommand or pipeline returns a non-zero status
-set -u   # (nounset) Exit on any attempt to use an uninitialised variable
-
-: ${CXX:=}
-: ${TRAVIS:=false}
-
-echo -n "Checking that we're running on Travis CI..."
-if [[ $TRAVIS == 'true' ]]; then
-	echo " OK"
-else
-	echo " Nope."
-	echo "This script is only intended for use on Travis CI."
-	echo "Set the TRAVIS environment variable to 'true' to override."
-	exit 1
-fi
-
-mkdir -p build
-pushd build > /dev/null
-
-# Boost does not correctly identify version of libstdc++ used by clang
-CMAKE_FLAGS=
-if [[ $CXX == 'clang++' ]]; then
-	CMAKE_FLAGS=-DCMAKE_CXX_FLAGS=-DBOOST_NO_CXX11_ALLOCATOR
-	echo "Additional flags to pass to cmake: $CMAKE_FLAGS"
-fi
-
-echo "Attempting to build and run test suite with C++11 support enabled..."
-cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=enabled ..
-VERBOSE=1 make
-./test_suite
-make clean
-
-popd > /dev/null
-