From 3d5de9ee2532c73010a502b13369e14a3036c896 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Tue, 16 Jun 2015 10:14:24 +0200
Subject: [PATCH] Be more verbose with debug info on travis

---
 .travis.yml                            | 3 ++-
 qgis-test-travis.ctest                 | 2 +-
 tests/src/python/test_qgsappstartup.py | 9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ce2d52c956..0defe8f0ea5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,8 @@ install:
   - cd build
   - cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF
           -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=ON
-          -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON ..
+          -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 
 before_script:
   - printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf
diff --git a/qgis-test-travis.ctest b/qgis-test-travis.ctest
index 17a1c6a39c2..c3290b1e49f 100644
--- a/qgis-test-travis.ctest
+++ b/qgis-test-travis.ctest
@@ -13,7 +13,7 @@ IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
 ELSE()
   SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
 ENDIF()
-SET (CTEST_BUILD_CONFIGURATION "Release")
+SET (CTEST_BUILD_CONFIGURATION "RelWithDebInfo")
 
 
 SET (INITIAL_CACHE "
diff --git a/tests/src/python/test_qgsappstartup.py b/tests/src/python/test_qgsappstartup.py
index 11d954c6e94..baed42e3c8b 100644
--- a/tests/src/python/test_qgsappstartup.py
+++ b/tests/src/python/test_qgsappstartup.py
@@ -47,7 +47,7 @@ class TestPyQgsAppStartup(unittest.TestCase):
     # TODO: refactor parameters to **kwargs to handle all startup combinations
     def doTestStartup(self, option='', testDir='', testFile='',
                       loadPlugins=False, customization=False,
-                      timeOut=30, env=None):
+                      timeOut=15, env=None):
         """Run QGIS with the given option. Wait for testFile to be created.
         If time runs out, fail.
         """
@@ -106,7 +106,8 @@ class TestPyQgsAppStartup(unittest.TestCase):
             assert self.doTestStartup(option="--configpath",
                                       testDir=os.path.join(self.TMP_DIR, p),
                                       testFile="qgis.db",
-                                      timeOut=30), "config path %s" % p
+                                      timeOut=15), "config path %s" % p
+
     @unittest.expectedFailure
     def testPluginPath(self):
         for t in ['test_plugins', 'test plugins', u'test_pluginsé€']:
@@ -129,7 +130,7 @@ class TestPyQgsAppStartup(unittest.TestCase):
                 option="--optionspath",
                 testDir=testDir,
                 testFile="plugin_started.txt",
-                timeOut=30,
+                timeOut=15,
                 loadPlugins=True,
                 env={'QGIS_PLUGINPATH':
                          str(QtCore.QString(testDir).toLocal8Bit())})
@@ -151,7 +152,7 @@ class TestPyQgsAppStartup(unittest.TestCase):
         msg = 'Failed to create test file from executing PYQGIS_STARTUP file'
         assert self.doTestStartup(
             testFile=testfilepath,
-            timeOut=30,
+            timeOut=15,
             env={'PYQGIS_STARTUP': testmod}), msg