diff options
Diffstat (limited to 'scripts/travis_script.sh')
| -rwxr-xr-x | scripts/travis_script.sh | 16 |
1 files changed, 8 insertions, 8 deletions
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 |