summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2014-08-19 12:24:03 -0700
committerJustin R. Miller <incanus@codesorcery.net>2014-08-19 12:24:03 -0700
commit832f5406d48ef0b410f41980bffa4f42e7421555 (patch)
tree4fa9f3a1c77236d332b40239fae09d929af97221 /scripts
parentada88f59e9e1ac8e00a2ce68b2230b375dab565e (diff)
downloadqtlocation-mapboxgl-832f5406d48ef0b410f41980bffa4f42e7421555.tar.gz
bring back Linux tests in separate script
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/run_linux_tests.sh10
-rwxr-xr-xscripts/travis_script.sh6
2 files changed, 11 insertions, 5 deletions
diff --git a/scripts/run_linux_tests.sh b/scripts/run_linux_tests.sh
new file mode 100755
index 0000000000..7165948248
--- /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 61c2e52059..015e74ebe3 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
#