diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/compare_images.sh | 6 | ||||
-rwxr-xr-x | scripts/linux/after_script.sh | 15 | ||||
-rwxr-xr-x | scripts/linux/run.sh | 6 | ||||
-rw-r--r-- | scripts/main.mk | 4 | ||||
-rwxr-xr-x | scripts/node/after_script.sh | 13 | ||||
-rwxr-xr-x | scripts/node/run.sh | 15 |
6 files changed, 13 insertions, 46 deletions
diff --git a/scripts/compare_images.sh b/scripts/compare_images.sh deleted file mode 100755 index 2407726469..0000000000 --- a/scripts/compare_images.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -(cd ./test/suite/ && ./bin/compare_images.py native) diff --git a/scripts/linux/after_script.sh b/scripts/linux/after_script.sh deleted file mode 100755 index c38af0a797..0000000000 --- a/scripts/linux/after_script.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 ./test/suite/ && ./bin/deploy_results.sh) - mapbox_time_finish -fi diff --git a/scripts/linux/run.sh b/scripts/linux/run.sh index 42d2a16d90..31272ea1c2 100755 --- a/scripts/linux/run.sh +++ b/scripts/linux/run.sh @@ -27,11 +27,5 @@ make test -j${JOBS} BUILDTYPE=${BUILDTYPE} # Test ################################################################################ -mapbox_time "checkout_test_suite" \ -git submodule update --init test/suite - mapbox_time "run_tests" \ make test-* BUILDTYPE=${BUILDTYPE} - -mapbox_time "compare_results" \ -./scripts/compare_images.sh diff --git a/scripts/main.mk b/scripts/main.mk index 65f283b219..3639a780a7 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -46,10 +46,6 @@ SUBMODULES += src/mbgl/util/geojsonvt/geojsonvt.hpp src/mbgl/util/geojsonvt/geojsonvt.hpp: ./scripts/flock.py .git/Submodule.lock git submodule update --init src/mbgl/util/geojsonvt -SUBMODULES += test/suite/package.json -test/suite/package.json: - ./scripts/flock.py .git/Submodule.lock git submodule update --init test/suite - ifeq ($(HOST),ios) SUBMODULES += platform/ios/vendor/SMCalloutView/SMCalloutView.h platform/ios/vendor/SMCalloutView/SMCalloutView.h: diff --git a/scripts/node/after_script.sh b/scripts/node/after_script.sh index d78e820e92..237f9fe600 100755 --- a/scripts/node/after_script.sh +++ b/scripts/node/after_script.sh @@ -35,3 +35,16 @@ if test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE"; then npm test fi fi + +if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then + # Install and add awscli to PATH for uploading the results + pip install --user awscli + export PATH="`python -m site --user-base`/bin:${PATH}" + + REPO_NAME=$(basename $TRAVIS_REPO_SLUG) + gzip --stdout node_modules/mapbox-gl-test-suite/tests/index.html | \ + aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \ + - s3://mapbox/$REPO_NAME/tests/$TRAVIS_JOB_NUMBER/index.html + + echo http://mapbox.s3.amazonaws.com/$REPO_NAME/tests/$TRAVIS_JOB_NUMBER/index.html +fi diff --git a/scripts/node/run.sh b/scripts/node/run.sh index 8566fc3b3a..22db3fdedd 100755 --- a/scripts/node/run.sh +++ b/scripts/node/run.sh @@ -26,24 +26,9 @@ npm install --build-from-source # 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" \ npm test mapbox_time "run_render_tests" \ npm run test-suite - - 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}" - - pushd test/suite - mapbox_time "deploy_results" \ - ./bin/deploy_results.sh - popd - fi fi |