tracks/cpp/.travis.yml in trackler-2.2.1.45 vs tracks/cpp/.travis.yml in trackler-2.2.1.46

@@ -1,19 +1,39 @@
----
 dist: trusty
-sudo: required
+sudo: false 
 language: cpp
-compiler:
-- gcc
-- clang
+
+matrix:
+  include:
+    # GCC 4.9
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+      env: MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+
+    # Clang 3.8
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+          packages:
+            - clang-3.8
+      env: MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
+
 before_install:
-- sudo add-apt-repository -y ppa:samuel-bachmann/boost
-- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-- sudo apt-get -qq -d update
+  - sudo add-apt-repository -y ppa:samuel-bachmann/boost
+  - sudo apt-get -y -d update
+  - eval "${MATRIX_EVAL}"
 install:
-- sudo apt-get -qq install boost1.60 cmake g++-4.8
-- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
+  - sudo apt-get -y install libboost-regex1.60-dev libboost-test1.60-dev libboost-date-time1.60-dev
 script:
-- bin/fetch-configlet
-- bin/configlet lint .
-- cmake -G "Unix Makefiles"
-- make
+  - bin/fetch-configlet
+  - bin/configlet lint .
+  - cmake -G "Unix Makefiles"
+  - make
+