From 3d6304e8c3d9433199ae1b928fcf935ce1a43bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Thu, 16 Oct 2014 05:50:10 -0700
Subject: remove spaces from fold command and put in separate file

---
 scripts/travis_script.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'scripts/travis_script.sh')

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
-- 
cgit v1.2.1