diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-12 09:59:27 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-12 09:59:27 +1100 |
| commit | 30c80af0d28e0cf11dfe212395ca7253e070c5ad (patch) | |
| tree | 839229138217527cb94aab702f791199761da15d /.travis.yml | |
| parent | 80016cd4697b46df6a9f40a8cd7b88b27afd318e (diff) | |
| download | qtlocation-mapboxgl-30c80af0d28e0cf11dfe212395ca7253e070c5ad.tar.gz | |
Fix bash error
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9cef28fd00..817dc77fcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,6 @@ env: before_install: - sudo service mysql stop - sudo service postgresql stop -- sudo ps aux - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh @@ -57,8 +56,8 @@ before_install: - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export JAVA_HOME="$(pwd)/jdk1.7.0_71"; fi - export ANDROID_HOME="$(pwd)/android-sdk" - ./scripts/travis_before_install.sh -- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi -- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then glxinfo; fi +- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi +- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi install: - make config.gypi |