summaryrefslogtreecommitdiff
path: root/scripts/travis_script.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/travis_script.sh')
-rwxr-xr-xscripts/travis_script.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index f1cad6b9d3..f306dbcb79 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -7,26 +7,46 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
#
# build & test Linux
#
+ mapbox_time "compile_program" \
make linux -j4 BUILDTYPE=${BUILDTYPE}
+
+ mapbox_time "compile_tests" \
make test -j4 BUILDTYPE=${BUILDTYPE}
+
+ 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
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)
+ mapbox_time_finish
fi
elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
#
# build OS X
#
+ mapbox_time "create_osx_project" \
make xproj-cli
+
+ mapbox_time "build_osx" \
xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs 4
+
#
# build iOS
#
git submodule init
+
+ mapbox_time "load_submodules" \
git submodule update
+
+ mapbox_time "create_ios_project" \
make iproj-cli
+
+ mapbox_time "build_ios" \
xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs 4
fi