Skip to content

Commit 3d5de9e

Browse files
committed
Be more verbose with debug info on travis
1 parent 2458eaf commit 3d5de9e

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ install:
5050
- cd build
5151
- cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF
5252
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=ON
53-
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON ..
53+
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON
54+
-DCMAKE_BUILD_TYPE=RelWithDebInfo ..
5455

5556
before_script:
5657
- printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf

qgis-test-travis.ctest

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
1313
ELSE()
1414
SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
1515
ENDIF()
16-
SET (CTEST_BUILD_CONFIGURATION "Release")
16+
SET (CTEST_BUILD_CONFIGURATION "RelWithDebInfo")
1717

1818

1919
SET (INITIAL_CACHE "

tests/src/python/test_qgsappstartup.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def tearDownClass(cls):
4747
# TODO: refactor parameters to **kwargs to handle all startup combinations
4848
def doTestStartup(self, option='', testDir='', testFile='',
4949
loadPlugins=False, customization=False,
50-
timeOut=30, env=None):
50+
timeOut=15, env=None):
5151
"""Run QGIS with the given option. Wait for testFile to be created.
5252
If time runs out, fail.
5353
"""
@@ -106,7 +106,8 @@ def testConfigPath(self):
106106
assert self.doTestStartup(option="--configpath",
107107
testDir=os.path.join(self.TMP_DIR, p),
108108
testFile="qgis.db",
109-
timeOut=30), "config path %s" % p
109+
timeOut=15), "config path %s" % p
110+
110111
@unittest.expectedFailure
111112
def testPluginPath(self):
112113
for t in ['test_plugins', 'test plugins', u'test_pluginsé€']:
@@ -129,7 +130,7 @@ def testPluginPath(self):
129130
option="--optionspath",
130131
testDir=testDir,
131132
testFile="plugin_started.txt",
132-
timeOut=30,
133+
timeOut=15,
133134
loadPlugins=True,
134135
env={'QGIS_PLUGINPATH':
135136
str(QtCore.QString(testDir).toLocal8Bit())})
@@ -151,7 +152,7 @@ def testPyQgisStartupEnvVar(self):
151152
msg = 'Failed to create test file from executing PYQGIS_STARTUP file'
152153
assert self.doTestStartup(
153154
testFile=testfilepath,
154-
timeOut=30,
155+
timeOut=15,
155156
env={'PYQGIS_STARTUP': testmod}), msg
156157

157158

0 commit comments

Comments
 (0)