diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 12:02:39 -0400 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 12:02:39 -0400 |
commit | 86230821e4da9605f5ac4a53d011835d37fc73e4 (patch) | |
tree | 77693f0be69c3fb978ba9b47fa2835bfe065099b /scripts | |
parent | 15cf30652cf6b6d9a52bc6eb9815fd2e19ab78e3 (diff) | |
download | qtlocation-mapboxgl-86230821e4da9605f5ac4a53d011835d37fc73e4.tar.gz |
use test suite as submodule instead of using npm
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/compare_images.sh | 6 | ||||
-rwxr-xr-x | scripts/travis_install_test_suite.sh | 9 | ||||
-rwxr-xr-x | scripts/travis_script.sh | 16 |
3 files changed, 14 insertions, 17 deletions
diff --git a/scripts/compare_images.sh b/scripts/compare_images.sh new file mode 100755 index 0000000000..4329478fb2 --- /dev/null +++ b/scripts/compare_images.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +(cd ./test/suite/ && (./bin/compare_images.js || true)) diff --git a/scripts/travis_install_test_suite.sh b/scripts/travis_install_test_suite.sh deleted file mode 100755 index cb2422d70c..0000000000 --- a/scripts/travis_install_test_suite.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - # - # we'll need the test suite on Linux - # - mapbox_time "install_test_suite" \ - npm install git+https://github.com/mapbox/mapbox-gl-test-suite.git -fi diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 5fa5a3f5f3..c224617314 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -13,16 +13,18 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then mapbox_time "compile_tests" \ make test -j$JOBS BUILDTYPE=${BUILDTYPE} + mapbox_time "checkout_test_suite" \ + git submodule update --init test/suite + mapbox_time "run_tests" \ ./scripts/run_tests.sh - mapbox_time_start "compare_results" - (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true)) - mapbox_time_finish + mapbox_time "compare_results" \ + ./scripts/compare_images.sh if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then mapbox_time_start "deploy_results" - (cd ./node_modules/mapbox-gl-test-suite/ && ./bin/deploy_results.sh) + (cd ./test/suite/ && ./bin/deploy_results.sh) mapbox_time_finish fi @@ -39,10 +41,8 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # # build iOS # - git submodule init - - mapbox_time "load_submodules" \ - git submodule update + mapbox_time "checkout_cocoa_bindings" \ + git submodule update --init ios/mapbox-gl-cocoa mapbox_time "create_ios_project" \ make build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj |