diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-18 21:43:57 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | c6313681d2c54bd4f333688f141a8062bce5a30d (patch) | |
| tree | bbf406dd5db0cfc6fead0ca96c1ba36f8543236b | |
| parent | 6b44aa9095316c7823880f25a745490e271c3400 (diff) | |
| download | qtlocation-mapboxgl-c6313681d2c54bd4f333688f141a8062bce5a30d.tar.gz | |
[build] Re-enable Qt bots
| -rw-r--r-- | .travis.yml | 47 | ||||
| -rw-r--r-- | platform/qt/bitrise-qt4.yml | 2 | ||||
| -rw-r--r-- | platform/qt/bitrise-qt5.yml | 3 | ||||
| -rwxr-xr-x | scripts/valgrind.sh | 2 |
4 files changed, 29 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 8dda5e5e22..8715a7c752 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,30 +121,31 @@ matrix: script: - make tidy - # # Qt 4 - Release - # - os: linux - # sudo: required - # dist: trusty - # language: cpp - # compiler: "qt4-gcc5-release" - # env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 - # addons: *qt4 - # script: - # - make qt-app - # - LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so make test-qt-Memory.*:*.Load + # Qt 4 - Release + - os: linux + sudo: required + dist: trusty + language: cpp + compiler: "qt4-gcc5-release" + env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 WITH_QT_4=1 + addons: *qt4 + script: + - make qt-app + - LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so make run-qt-test-Memory.*:*.Load - # # Qt 5 - Release - # - os: linux - # sudo: required - # dist: trusty - # language: cpp - # compiler: "qt5-gcc5-release" - # env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 - # addons: *qt5 - # script: - # - make qt-app - # - make qt-qml-app - # - make test-valgrind-qt--*.Load + # Qt 5 - Release + - os: linux + sudo: required + dist: trusty + language: cpp + compiler: "qt5-gcc5-release" + env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 + addons: *qt5 + script: + - make qt-app + - make qt-qml-app + - make qt-test + - scripts/valgrind.sh build/qt-linux-x86_64/Release/mbgl-test --gtest_filter=-*.Load cache: directories: diff --git a/platform/qt/bitrise-qt4.yml b/platform/qt/bitrise-qt4.yml index baa58a0308..ed7ddb534f 100644 --- a/platform/qt/bitrise-qt4.yml +++ b/platform/qt/bitrise-qt4.yml @@ -34,8 +34,8 @@ workflows: brew link qt brew linkapps qt export BUILDTYPE=Debug + export WITH_QT_4=1 make qt-app - make test-qt-* - is_debug: 'yes' - slack: title: Post to Slack diff --git a/platform/qt/bitrise-qt5.yml b/platform/qt/bitrise-qt5.yml index 9c60e45119..3af48208a5 100644 --- a/platform/qt/bitrise-qt5.yml +++ b/platform/qt/bitrise-qt5.yml @@ -33,10 +33,11 @@ workflows: brew install qt5 brew link qt5 --force brew linkapps qt5 + ln -s /usr/local/Cellar/qt5/5.6.1-1/mkspecs /usr/local/mkspecs + ln -s /usr/local/Cellar/qt5/5.6.1-1/plugins /usr/local/plugins export BUILDTYPE=Debug make qt-app make qt-qml-app - make test-qt-* - is_debug: 'yes' - slack: title: Post to Slack diff --git a/scripts/valgrind.sh b/scripts/valgrind.sh index 009e18c432..4009063c80 100755 --- a/scripts/valgrind.sh +++ b/scripts/valgrind.sh @@ -3,6 +3,8 @@ set -e set -o pipefail +.mason/mason install valgrind latest + PARAMS="\ --leak-check=full \ --show-leak-kinds=definite \ |