summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-08-27 18:09:08 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-08-27 18:09:08 -0400
commit53f2b125c2ff583fee62c95d56d988bc330d60d5 (patch)
tree2847a7e03b22fe93a0f7f40ee45917419f423826 /scripts
parentcb2b57a7c5497ac15e8b417950430a222d32e959 (diff)
downloadqtlocation-mapboxgl-53f2b125c2ff583fee62c95d56d988bc330d60d5.tar.gz
merge platform/node/scripts/* into scripts/node/run.sh
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/node/run.sh29
1 files changed, 21 insertions, 8 deletions
diff --git a/scripts/node/run.sh b/scripts/node/run.sh
index 118e1ed252..232823f034 100755
--- a/scripts/node/run.sh
+++ b/scripts/node/run.sh
@@ -21,11 +21,24 @@ pushd platform/node && npm install --build-from-source && popd
# Test
################################################################################
-mapbox_time "checkout_test_suite" \
-git submodule update --init test/suite
-
-mapbox_time "run_tests" \
-pushd platform/node && npm test && popd
-
-mapbox_time "run_render_tests" \
-pushd platform/node && npm run test-suite && popd
+# Travis OS X has no GPU
+if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
+ mapbox_time "checkout_test_suite" \
+ git submodule update --init test/suite
+
+ mapbox_time "run_tests" \
+ pushd platform/node && npm test && popd
+
+ mapbox_time "run_render_tests" \
+ pushd platform/node && npm run test-suite && popd
+
+ if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
+ # Install and add awscli to PATH for uploading the results
+ mapbox_time "install_awscli" \
+ pip install --user awscli
+ export PATH="`python -m site --user-base`/bin:${PATH}"
+
+ mapbox_time "deploy_results" \
+ pushd test/suite && ./bin/deploy_results.sh && popd
+ fi
+fi