new travis file

Author: danpoe

.travis.yml

@@ -1,22 +1,43 @@
 language: cpp
 
-os:
-  - linux
-  - osx
 sudo: required
 
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            # newer g++ version (also pulls libstdc++)
+            - g++-4.9
+            - libwww-perl
+    - os: linux
+      dist: trusty
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            # newer g++ version (also pulls libstdc++)
+            - g++-4.9
+            - libwww-perl
+      before_install:
+        - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90
+    - os: osx
+      compiler: clang
+    - os: osx
+      compiler: gcc
+
 addons:
   apt:
     packages:
       - libwww-perl
 
-compiler:
-  - gcc
-  - clang
-
-before_install:
-  - if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] ; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get -qq update && sudo apt-get -qq install g++-4.8 gcc-4.8 && sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90 ; fi
-
 install:
   - chmod a+x regression/failed-tests-printer.pl
   - cd src && make minisat2-download