From c6313681d2c54bd4f333688f141a8062bce5a30d Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Mon, 18 Jul 2016 21:43:57 +0300
Subject: [build] Re-enable Qt bots

---
 .travis.yml                 | 47 +++++++++++++++++++++++----------------------
 platform/qt/bitrise-qt4.yml |  2 +-
 platform/qt/bitrise-qt5.yml |  3 ++-
 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 \
-- 
cgit v1.2.1