From 832f5406d48ef0b410f41980bffa4f42e7421555 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Tue, 19 Aug 2014 12:24:03 -0700
Subject: [PATCH 1/2] bring back Linux tests in separate script

---
 scripts/run_linux_tests.sh | 10 ++++++++++
 scripts/travis_script.sh   |  6 +-----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100755 scripts/run_linux_tests.sh

diff --git a/scripts/run_linux_tests.sh b/scripts/run_linux_tests.sh
new file mode 100755
index 000000000..716594824
--- /dev/null
+++ b/scripts/run_linux_tests.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+cd build/Testing
+
+for TEST in ./test_* ; do
+    ${TEST}
+done
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 61c2e5205..015e74ebe 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -9,11 +9,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     #
     make linux -j4 BUILDTYPE=${BUILDTYPE}
     make test -j4 BUILDTYPE=${BUILDTYPE}
-    cd build/Testing
-    for TEST in ./test_* ; do
-        ${TEST}
-    done
-    cd ../..
+    ./scripts/run_linux_tests.sh
     (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true; ./bin/deploy_results.sh))
 elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
     #

From d094998885ab8211cbf894701bf6dd4e869e14d5 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Wed, 20 Aug 2014 11:21:16 -0700
Subject: [PATCH 2/2] rename tests script

---
 scripts/{run_linux_tests.sh => run_tests.sh} | 0
 scripts/travis_script.sh                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename scripts/{run_linux_tests.sh => run_tests.sh} (100%)

diff --git a/scripts/run_linux_tests.sh b/scripts/run_tests.sh
similarity index 100%
rename from scripts/run_linux_tests.sh
rename to scripts/run_tests.sh
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 015e74ebe..4f02c5b7e 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -9,7 +9,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     #
     make linux -j4 BUILDTYPE=${BUILDTYPE}
     make test -j4 BUILDTYPE=${BUILDTYPE}
-    ./scripts/run_linux_tests.sh
+    ./scripts/run_tests.sh
     (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true; ./bin/deploy_results.sh))
 elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
     #