diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-03 19:46:35 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-03 19:46:35 +1100 |
| commit | 1bffbb09082cb399f4eb19d85f5d8fcb767a4498 (patch) | |
| tree | 6e741f86a0c651e2544e947b9b3aa9c5f2396008 /scripts | |
| parent | 21460f0c6a304f9788d57b57bd6599c8c11056aa (diff) | |
| download | qtlocation-mapboxgl-1bffbb09082cb399f4eb19d85f5d8fcb767a4498.tar.gz | |
Use TESTMUNK in travis to start Testmunk
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis_script.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 316d124017..6fc9edd92b 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -9,10 +9,13 @@ git submodule update --init styles if [[ $MASON_PLATFORM == "android" ]]; then mapbox_time "compile_program" \ make android -j$JOBS BUILDTYPE=${BUILDTYPE} - - mapbox_time_start "upload_testmunk" - (cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk) - mapbox_time_finish + + if [[ $TESTMUNK == "yes" ]]; then + mapbox_time_start "upload_testmunk" + (cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk) + mapbox_time_finish + fi + elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # build & test Linux |