From dbd602d5a822464a664bfdd877de40af610f7e8f Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Mon, 5 Jun 2017 18:57:29 +0200
Subject: [PATCH] Really run Travis tests in Mac env

The sudo:required seems to make it switch to Linux
---
 .travis.yml       |  3 ---
 scripts/travis.sh | 12 ++++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eef4fe69c..86f14bfac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ os:
   - osx
 script:
   - scripts/travis.sh
-sudo: required
-services:
-  - docker
 # Uncomment once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed
 # after_success:
 #    - bash <(curl -s https://codecov.io/bash)
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 8cbd2ed6a..405875409 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -25,7 +25,9 @@ launchTestRepo() {
 }
 
 launchProxyRepos() {
-  ./scripts/launch-proxies.sh
+  if [ "$(uname)" != "Darwin" ]; then
+    ./scripts/launch-proxies.sh
+  fi
 }
 
 integrationTestsRequirements() {
@@ -107,7 +109,13 @@ runJsTests() {
 }
 
 runJvmTests() {
-  sbt ++$SCALA_VERSION jvm/test jvm/it:test
+  if [ "$(uname)" == "Darwin" ]; then
+    IT="testsJVM/it:test" # don't run proxy-tests in particular
+  else
+    IT="jvm/it:test"
+  fi
+
+  sbt ++$SCALA_VERSION jvm/test $IT
 }
 
 validateReadme() {