divide and conquer

.travis.yml

@@ -25,9 +25,38 @@ env:
  - TARGET=swift
  
 matrix:
+  include:
+    - env: TARGET=cpp
+      addons:
+		  apt:
+		    sources:
+		      - ubuntu-toolchain-r-test
+		      - llvm-toolchain-precise-3.7
+		    packages:
+		      - g++-5
+		      - uuid-dev
+		      - clang-3.7
   exclude:
     - os: linux
       env: TARGET=swift
+    - os: linux
+      env: TARGET=csharp
+      jdk: oraclejdk7
+    - os: linux
+      env: TARGET=python2
+      jdk: oraclejdk7
+    - os: linux
+      env: TARGET=python3
+      jdk: oraclejdk7
+    - os: linux
+      env: TARGET=javascript
+      jdk: oraclejdk7
+    - os: linux
+      env: TARGET=cpp
+      jdk: oraclejdk7
+    - os: linux
+      env: TARGET=go
+      jdk: oraclejdk7
     - os: osx
       env: TARGET=java
     - os: osx
@@ -42,24 +71,6 @@ matrix:
       env: TARGET=cpp
     - os: osx
       env: TARGET=go
-    - os: osx
-      env: TARGET=csharp
-      jdk: oraclejdk7
-    - os: osx
-      env: TARGET=python2
-      jdk: oraclejdk7
-    - os: osx
-      env: TARGET=python3
-      jdk: oraclejdk7
-    - os: osx
-      env: TARGET=javascript
-      jdk: oraclejdk7
-    - os: osx
-      env: TARGET=cpp
-      jdk: oraclejdk7
-    - os: osx
-      env: TARGET=go
-      jdk: oraclejdk7
       
 before_install:
   - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh
@@ -68,12 +79,3 @@ script:
   - cd runtime-testsuite
   - ../.travis/run-tests-$TARGET.sh
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.7
-    packages:
-      - g++-5
-      - uuid-dev
-      - clang-3.7

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

@@ -6,12 +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
-sudo apt-get install -qq python3.5
-sudo apt-get install -qq nodejs
-echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.12.1 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
-sudo apt-get install -qq mono-complete
 eval "$(sudo gimme 1.7.3)"
-
 ( go version ; go env ) || true
-python --version
-python3 --version

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

@@ -4,4 +4,5 @@ set -euo pipefail
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 sudo add-apt-repository ppa:fkrull/deadsnakes -y
+sudo add-apt-repository ppa:rwky/nodejs -y
 sudo apt-get update -qq

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

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+sudo add-apt-repository ppa:fkrull/deadsnakes -y
+sudo add-apt-repository ppa:rwky/nodejs -y
+sudo apt-get update -qq
+sudo apt-get install -qq nodejs