divide and conquer

.travis.yml

@@ -1,6 +1,15 @@
 sudo: true
 
+os:
+ - linux
+ - osx
+ 
 language: java
+ - jdk: oraclejdk7
+ 
+compiler: clang
+
+osx_image: xcode8.1
 
 env:
  - TARGET=java
@@ -13,14 +22,6 @@ env:
  - TARGET=swift
  
 matrix:
-  include:
-    - os: linux
-      env: CXX=g++-5
-      compiler: clang
-      jdk: oraclejdk7
-    - os: osx
-      compiler: clang
-      osx_image: xcode8.1
   exclude:
     - os: linux
       env: TARGET=swift
@@ -40,13 +41,10 @@ matrix:
       env: TARGET=go
       
 before_install:
-  - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh
-  - fi
+  - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh; fi
 
 script:
-  - cd runtime-testsuite
-  - ../.travis/run-tests-$TARGET.sh
-  - fi
+  - cd runtime-testsuite; ../.travis/run-tests-$TARGET.sh; fi
 
 addons:
   apt:

.travis/before-install-linux-cpp.sh

@@ -6,3 +6,5 @@ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328
 sudo add-apt-repository ppa:fkrull/deadsnakes -y
 sudo add-apt-repository ppa:rwky/nodejs -y
 sudo apt-get update -qq
+
+export CXX=g++-5