diff options
| -rwxr-xr-x | platform/node/scripts/deploy_results.sh | 15 | ||||
| -rwxr-xr-x | platform/node/scripts/install_node.sh | 13 | ||||
| -rwxr-xr-x | platform/node/scripts/travis_test.sh | 10 | ||||
| -rwxr-xr-x | scripts/node/run.sh | 29 |
4 files changed, 21 insertions, 46 deletions
diff --git a/platform/node/scripts/deploy_results.sh b/platform/node/scripts/deploy_results.sh deleted file mode 100755 index adbed4c2d8..0000000000 --- a/platform/node/scripts/deploy_results.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -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_start "deploy_results" - (cd ./node_modules/mapbox-gl-test-suite/ && ./bin/deploy_results.sh) - mapbox_time_finish -fi diff --git a/platform/node/scripts/install_node.sh b/platform/node/scripts/install_node.sh deleted file mode 100755 index 311b004243..0000000000 --- a/platform/node/scripts/install_node.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -# Mason exists on PATH from sourcing mbgl install script -mapbox_time $NODE_EXE \ -mason install $NODE_EXE $NODE_VERSION - -export PATH="`mason prefix $NODE_EXE $NODE_VERSION`/bin":"$PATH" - -$NODE_EXE --version -npm --version diff --git a/platform/node/scripts/travis_test.sh b/platform/node/scripts/travis_test.sh deleted file mode 100755 index 70fff88aa4..0000000000 --- a/platform/node/scripts/travis_test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -# Travis OS X has no GPU -if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - npm test - ./scripts/deploy_results.sh -fi 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 |