diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-27 12:36:48 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-27 12:36:48 +0200 |
| commit | 312cae1a05af9046b44f810b267c3e81acdb29e5 (patch) | |
| tree | 2a636885d6582f7945826cd703e216d88f5deac4 /scripts/travis_script.sh | |
| parent | 489b6642322065111c41bccbcda8ee92ef1f2a44 (diff) | |
| parent | c8d76867db12149fbbe9c4652268c9c1cf0c7891 (diff) | |
| download | qtlocation-mapboxgl-312cae1a05af9046b44f810b267c3e81acdb29e5.tar.gz | |
Merge pull request #451 from mapbox/noncopyable-vao
VertexArrayObject and ElementGroup should be noncopyable
Diffstat (limited to 'scripts/travis_script.sh')
| -rwxr-xr-x | scripts/travis_script.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index f8325e41cc..2fc6029b44 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -10,7 +10,11 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then make linux -j4 BUILDTYPE=${BUILDTYPE} make test -j4 BUILDTYPE=${BUILDTYPE} ./scripts/run_tests.sh - (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true; [[ $TRAVIS_PULL_REQUEST = "false" ]] && ./bin/deploy_results.sh)) + (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true)) + + if [ "${TRAVIS_PULL_REQUEST}" == "false" ] ; then + (cd ./node_modules/mapbox-gl-test-suite/ && ./bin/deploy_results.sh) + fi elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # |