Abstract xvfb into linux only

alkaline-ml · Jul 7, 2017 · 4594ab3 · 4594ab3
1 parent c330885
commit 4594ab3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -73,11 +73,7 @@ matrix:
            DEPLOY=false CACHEC=true
 
 install: source build_tools/travis/install.sh
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 5 # give xvfb some time to start by sleeping for 5 seconds
-
+before_script: bash build_tools/travis/before_script.sh
 script: bash build_tools/travis/test_script.sh
 after_success: source build_tools/travis/after_success.sh
 

diff --git a/build_tools/travis/before_script.sh b/build_tools/travis/before_script.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+# if it's a linux build, we need to sleep before test:
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+  export DISPLAY=:99.0
+  sh -e /etc/init.d/xvfb start
+  sleep 5 # give xvfb some time to start by sleeping for 5 seconds
+fi