better timing functions

scripts/travis_helper.sh

@@ -1,17 +1,41 @@
 #!/usr/bin/env bash
 
-function mapbox_time {
-    local NAME=$1 ; shift
-    travis_fold start "${NAME}"
-    travis_time_start
-    "$@"
-    travis_time_finish
-    travis_fold end "${NAME}"
+function mapbox_time_start {
+    local name=$1
+    mapbox_timer_name=$name
+
+    travis_fold start $name
+
+    mapbox_timer_id=$(printf %08x $(( RANDOM * RANDOM )))
+    eval "mapbox_start_time_$mapbox_timer_id=$(travis_nanoseconds)"
+    echo -en "travis_time:start:$mapbox_timer_id\n"
 }
 
-export -f travis_fold
-export -f travis_time_start
-export -f travis_time_finish
-export -f travis_nanoseconds
+function mapbox_time_finish {
+    local name=${1:-$mapbox_timer_name}
+    local timer_id=${2:-$mapbox_timer_id}
+    local timer_start="mapbox_start_time_$timer_id"
+    eval local start_time=\${$timer_start}
+    local end_time=$(travis_nanoseconds)
+    local duration=$(($end_time-$start_time))
+    echo -en "travis_time:end:$timer_id:start=$start_time,finish=$end_time,duration=$duration\n"
+
+    travis_fold end $name
+}
+
+function mapbox_time {
+    local name=$1 ; shift
+    mapbox_time_start $name
+    local timer_id=$mapbox_timer_id
+    echo "\$ $@"
+    $@
+    mapbox_time_finish $name $timer_id
+}
+
+
 export ANSI_CLEAR
+export -f travis_fold
+export -f travis_nanoseconds
 export -f mapbox_time
+export -f mapbox_time_start
+export -f mapbox_time_finish

scripts/travis_script.sh

@@ -16,12 +16,14 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "run_tests" \
     ./scripts/run_tests.sh
 
-    mapbox_time "compare_results" \
+    mapbox_time_start "compare_results"
     (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true))
+    mapbox_time_end
 
     if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
-        mapbox_time "deploy_results" \
+        mapbox_time_start "deploy_results"
         (cd ./node_modules/mapbox-gl-test-suite/ && ./bin/deploy_results.sh)
+        mapbox_time_end
     fi
 
 elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then