From 82f74e6dd059a22e32f1848c36dd7adc16d8707c Mon Sep 17 00:00:00 2001
From: Nadav Samet <thesamet@gmail.com>
Date: Sat, 10 Jun 2017 21:05:04 -0700
Subject: [PATCH] Travis: break e2e and proptest into separate virtual machines
 for each scala version.

---
 .travis.yml | 25 ++++++++++++++++++-------
 proptest.sh |  3 +++
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100755 proptest.sh

diff --git a/.travis.yml b/.travis.yml
index fcd3a12ab..e89ef381a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,22 @@ scala:
 - 2.11.11
 - 2.12.2
 
+env:
+- TEST_SCRIPT=e2e.sh
+- TEST_SCRIPT=proptest.sh
+
+matrix:
+  exclude:
+  - scala: 2.10.6
+    env: TEST_SCRIPT=e2e.sh
+  include:
+  - scala: 2.11.11
+    env: TEST_SCRIPT=__misc__
+    script:
+    - cd examples && sbt test && cd ..
+    - ./test_generated_code_checked_in.sh
+    - sbt -J-Xmx4500M ++$TRAVIS_SCALA_VERSION universal:packageBin
+
 # These directories are cached to S3 at the end of the build
 cache:
   directories:
@@ -14,13 +30,7 @@ cache:
   - $HOME/.sbt/boot/
 
 script:
-- if [[ $TRAVIS_SCALA_VERSION != 2.10.* ]]; then ./e2e.sh; fi
-- cd examples && sbt test && cd ..
-- sbt -J-Xmx4500M ++$TRAVIS_SCALA_VERSION test
-- sbt -J-Xmx4500M ++$TRAVIS_SCALA_VERSION universal:packageBin
-
-- ./test_generated_code_checked_in.sh
-
+- ./$TEST_SCRIPT
 # Tricks to avoid unnecessary cache updates
 - find $HOME/.sbt -name "*.lock" | xargs rm
 - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
@@ -35,4 +45,5 @@ deploy:
     repo: scalapb/ScalaPB
     tags: true
     scala: 2.11.11
+    condition: "$TEST_SCRIPT = __misc__"
 
diff --git a/proptest.sh b/proptest.sh
new file mode 100755
index 000000000..509c50322
--- /dev/null
+++ b/proptest.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+set -e
+sbt -J-Xmx4500M ++$TRAVIS_SCALA_VERSION test