Revert "Merge pull request #1429 from mapbox/travis-setup"

This reverts commit 9a233c7ed295a73da1abf3a7feffe6eec2cf9963, reversing
changes made to 642024af6da577fe4a50e262b4a0b4e2aff7ebaf.

12 files changed, 51 insertions, 41 deletions

diff --git a/.travis.yml b/.travis.yml
index dd1fb1448e..2f50535cc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,20 +82,14 @@ env:
     - secure: "nQqSM8rd7OHtV4MqmNqVnkrVHqxKqQsaWRYk4/nPdhbeVWtTtkk0df711LrF1TUtbEPEewHxYUvTZ/UXmwJNeoKdzTHavI8hnatRkgjyxGERPn1il1Otelht9I+LQQHf+plrpRjVWBrNIW0Zox1B3cqn6d3NglpbXrEQ2EjYGNA="
     - KIF_SCREENSHOTS="${TRAVIS_BUILD_DIR}/screenshots"
 
-before_install:
-- source ./scripts/travis_helper.sh
-
 install:
 - ./scripts/${FLAVOR}/install.sh
 
-before_script:
-- if [ -f ./scripts/${FLAVOR}/setup.sh ]; then source ./scripts/${FLAVOR}/setup.sh; fi
-
 script:
 - ./scripts/${FLAVOR}/run.sh
 
 after_failure:
-- "[ -f ./scripts/${FLAVOR}/run.sh ] && ./scripts/${FLAVOR}/run.sh"
+- "[ -f scripts/${FLAVOR}/run.sh ] && scripts/${FLAVOR}/run.sh"
 
 notifications:
   slack:
diff --git a/scripts/android/install.sh b/scripts/android/install.sh
index fe2b816064..656465cf2f 100755
--- a/scripts/android/install.sh
+++ b/scripts/android/install.sh
@@ -3,6 +3,8 @@
 set -e
 set -o pipefail
 
+source ./scripts/travis_helper.sh
+
 mapbox_time "checkout_mason" \
 git submodule update --init .mason
 
diff --git a/scripts/android/run.sh b/scripts/android/run.sh
index 38749f79f5..7a909ffe3c 100755
--- a/scripts/android/run.sh
+++ b/scripts/android/run.sh
@@ -9,6 +9,8 @@ export HOST=android
 export MASON_PLATFORM=android
 export MASON_ANDROID_ABI=${ANDROID_ABI:-arm-v7}
 
+source ./scripts/travis_helper.sh
+
 # Add Mason to PATH
 export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
 
diff --git a/scripts/ios/install.sh b/scripts/ios/install.sh
index 50f43c26b0..274557c5d7 100755
--- a/scripts/ios/install.sh
+++ b/scripts/ios/install.sh
@@ -3,6 +3,8 @@
 set -e
 set -o pipefail
 
+source ./scripts/travis_helper.sh
+
 mapbox_time "checkout_mason" \
 git submodule update --init .mason
 export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index 35162ce5d1..3d23c0623b 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -4,6 +4,8 @@ set -e
 set -o pipefail
 set -u
 
+source ./scripts/travis_helper.sh
+
 NAME=MapboxGL
 OUTPUT=build/ios/pkg
 IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh
index e25f9a3025..20695c40c1 100755
--- a/scripts/ios/run.sh
+++ b/scripts/ios/run.sh
@@ -6,6 +6,8 @@ set -u
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
+source ./scripts/travis_helper.sh
+
 # Add Mason to PATH
 export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
 
diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh
index 1504da2a1f..a6ffacf5fe 100755
--- a/scripts/linux/install.sh
+++ b/scripts/linux/install.sh
@@ -3,6 +3,8 @@
 set -e
 set -o pipefail
 
+source ./scripts/travis_helper.sh
+
 mapbox_time "checkout_mason" \
 git submodule update --init .mason
 export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
diff --git a/scripts/linux/run.sh b/scripts/linux/run.sh
index e6ddfc9814..c4731b97ec 100755
--- a/scripts/linux/run.sh
+++ b/scripts/linux/run.sh
@@ -5,6 +5,34 @@ set -o pipefail
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
+source ./scripts/travis_helper.sh
+
+# Add Mason to PATH
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+
+# Set the core file limit to unlimited so a core file is generated upon crash
+ulimit -c unlimited -S
+
+################################################################################
+# X Server setup
+################################################################################
+
+# Start the mock X server
+if [ -f /etc/init.d/xvfb ] ; then
+    mapbox_time "start_xvfb" \
+    sh -e /etc/init.d/xvfb start
+    sleep 2 # sometimes, xvfb takes some time to start up
+fi
+
+# Make sure we're connecting to xvfb
+export DISPLAY=:99.0
+
+# Make sure we're loading the 10.4.3 libs we installed manually
+export LD_LIBRARY_PATH="`mason prefix mesa 10.4.3`/lib:${LD_LIBRARY_PATH:-}"
+
+mapbox_time "glxinfo" \
+glxinfo
+
 ################################################################################
 # Build
 ################################################################################
diff --git a/scripts/linux/setup.sh b/scripts/linux/setup.sh
deleted file mode 100755
index 15b664862e..0000000000
--- a/scripts/linux/setup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-# Set the core file limit to unlimited so a core file is generated upon crash
-ulimit -c unlimited -S
-
-################################################################################
-# X Server setup
-################################################################################
-
-# Start the mock X server
-if [ -f /etc/init.d/xvfb ] ; then
-    mapbox_time "start_xvfb" \
-    sh -e /etc/init.d/xvfb start
-    sleep 2 # sometimes, xvfb takes some time to start up
-fi
-
-# Make sure we're connecting to xvfb
-export DISPLAY=:99.0
-
-# Make sure we're loading the 10.4.3 libs we installed manually
-export LD_LIBRARY_PATH="`mason prefix mesa 10.4.3`/lib:${LD_LIBRARY_PATH:-}"
-
-mapbox_time "glxinfo" \
-glxinfo
diff --git a/scripts/osx/install.sh b/scripts/osx/install.sh
index a430b5495d..1994d371d0 100755
--- a/scripts/osx/install.sh
+++ b/scripts/osx/install.sh
@@ -3,6 +3,8 @@
 set -e
 set -o pipefail
 
+source ./scripts/travis_helper.sh
+
 mapbox_time "checkout_mason" \
 git submodule update --init .mason
 export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh
index be9088d2f6..b84ed04c21 100755
--- a/scripts/osx/run.sh
+++ b/scripts/osx/run.sh
@@ -5,6 +5,14 @@ set -o pipefail
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
+source ./scripts/travis_helper.sh
+
+# Add Mason to PATH
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+
+# Set the core file limit to unlimited so a core file is generated upon crash
+ulimit -c unlimited -S
+
 ################################################################################
 # Build
 ################################################################################
diff --git a/scripts/osx/setup.sh b/scripts/osx/setup.sh
deleted file mode 100755
index 881a5b40a0..0000000000
--- a/scripts/osx/setup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-# Set the core file limit to unlimited so a core file is generated upon crash
-ulimit -c unlimited -S