diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-16 05:50:10 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-16 05:50:10 -0700 |
| commit | 3d6304e8c3d9433199ae1b928fcf935ce1a43bb8 (patch) | |
| tree | ce61c147c6f3aba182df12676eb55a2e3d12d6bb /scripts/travis_script.sh | |
| parent | e211ee620d2cd64840019d682f61800e26dba7d4 (diff) | |
| download | qtlocation-mapboxgl-3d6304e8c3d9433199ae1b928fcf935ce1a43bb8.tar.gz | |
remove spaces from fold command and put in separate file
Diffstat (limited to 'scripts/travis_script.sh')
| -rwxr-xr-x | scripts/travis_script.sh | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 1c61dfa9dc..d4ebeb12d6 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -3,24 +3,26 @@ set -e set -o pipefail +. ./scripts/travis_helper.sh + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # build & test Linux # - mapbox_time "compile program" \ + mapbox_time "compile_program" \ make linux -j4 BUILDTYPE=${BUILDTYPE} - mapbox_time "install tests" \ + mapbox_time "install_tests" \ make test -j4 BUILDTYPE=${BUILDTYPE} - mapbox_time "run tests" \ + mapbox_time "run_tests" \ ./scripts/run_tests.sh - mapbox_time "compare results" \ + mapbox_time "compare_results" \ (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true)) if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then - mapbox_time "deploy results" \ + mapbox_time "deploy_results" \ (cd ./node_modules/mapbox-gl-test-suite/ && ./bin/deploy_results.sh) fi @@ -28,10 +30,10 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # # build OS X # - mapbox_time "create osx project" \ + mapbox_time "create_osx_project" \ make xproj-cli - mapbox_time "build osx" \ + mapbox_time "build_osx" \ xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs 4 # @@ -39,12 +41,12 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # git submodule init - mapbox_time "load submodules" \ + mapbox_time "load_submodules" \ git submodule update - mapbox_time "create ios project" \ + mapbox_time "create_ios_project" \ make iproj-cli - mapbox_time "build ios" \ + mapbox_time "build_ios" \ xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs 4 fi |