diff options
| author | Brad Leege <bleege@gmail.com> | 2016-06-09 15:10:05 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-06-09 15:10:05 -0500 |
| commit | 3972044308410bc5281e267b5247a3a0898c777a (patch) | |
| tree | 95bdbee967eb783be701847fc07072868c9040c2 /.travis.yml | |
| parent | b90571107d6fa5dd970d77c0b67029de8cd3461a (diff) | |
| parent | 40211abd9a6cb6a3b0eb8dbe61e1ccb605d19677 (diff) | |
| download | qtlocation-mapboxgl-3972044308410bc5281e267b5247a3a0898c777a.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index eb779e2454..ddc0c3ee5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,13 @@ addons_shortcuts: addons_qt4: &qt4 apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'gdb', 'g++-5', 'gcc-5', + packages: [ 'g++-5', 'gcc-5', 'mesa-utils', 'qt4-default' ] addons_qt5: &qt5 apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'gdb', 'g++-5', 'gcc-5', - 'mesa-utils', 'qt5-default', 'libqt5opengl5-dev', 'qtdeclarative5-dev', 'qtpositioning5-dev', 'qtlocation5-dev' ] + packages: [ 'g++-5', 'gcc-5', + 'mesa-utils', 'libc6-dbg', 'qt5-default', 'libqt5opengl5-dev', 'qtdeclarative5-dev', 'qtpositioning5-dev', 'qtlocation5-dev' ] env: global: @@ -109,7 +109,8 @@ matrix: env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 addons: *qt4 script: - - make qt-app test-qt + - make qt-app + - make test-qt # Qt 5 - Release - os: linux @@ -120,7 +121,9 @@ matrix: env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 addons: *qt5 script: - - make qt-app qt-qml-app test-qt + - make qt-app + - make qt-qml-app + - make test-valgrind-qt cache: directories: |