Skip to content

Commit 7ce4edf

Browse files
committedJun 25, 2015
[CTest] Enable individual tests depending on appropriate cmake options
1 parent 113efca commit 7ce4edf

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed
 

‎i18n/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ ADD_CUSTOM_TARGET (translations ALL
3232
DEPENDS ${QM_FILES})
3333

3434
# first compile sources, then compile translations
35-
ADD_DEPENDENCIES (translations ${QGIS_APP_NAME})
35+
IF (WITH_DESKTOP)
36+
ADD_DEPENDENCIES (translations ${QGIS_APP_NAME})
37+
ENDIF (WITH_DESKTOP)
38+
3639

3740
INSTALL (FILES ${QM_FILES}
3841
DESTINATION ${QGIS_DATA_DIR}/i18n)

‎tests/src/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ IF (ENABLE_TESTS)
33
ADD_SUBDIRECTORY(gui)
44
ADD_SUBDIRECTORY(analysis)
55
ADD_SUBDIRECTORY(providers)
6-
ADD_SUBDIRECTORY(app)
6+
IF (WITH_DESKTOP)
7+
ADD_SUBDIRECTORY(app)
8+
ENDIF (WITH_DESKTOP)
79
IF (WITH_BINDINGS)
810
ADD_SUBDIRECTORY(python)
911
ENDIF (WITH_BINDINGS)

‎tests/src/python/CMakeLists.txt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ SET (ENABLE_PGTEST FALSE CACHE BOOL "Enable PostgreSQL provider tests")
22

33
INCLUDE(UsePythonTest)
44
ADD_PYTHON_TEST(PyQgsApplication test_qgsapplication.py)
5-
ADD_PYTHON_TEST(PyQgsLocalServer test_qgis_local_server.py)
65
ADD_PYTHON_TEST(PyQgsFontUtils test_qgsfontutils.py)
76
ADD_PYTHON_TEST(PyQgsFeature test_qgsfeature.py)
87
ADD_PYTHON_TEST(PyQgsFeatureIterator test_qgsfeatureiterator.py)
@@ -35,22 +34,32 @@ ADD_PYTHON_TEST(PyQgsExpression test_qgsexpression.py)
3534
ADD_PYTHON_TEST(PyQgsPalLabelingBase test_qgspallabeling_base.py)
3635
ADD_PYTHON_TEST(PyQgsPalLabelingCanvas test_qgspallabeling_canvas.py)
3736
ADD_PYTHON_TEST(PyQgsPalLabelingComposer test_qgspallabeling_composer.py)
38-
ADD_PYTHON_TEST(PyQgsPalLabelingServer test_qgspallabeling_server.py)
3937
ADD_PYTHON_TEST(PyQgsVectorFileWriter test_qgsvectorfilewriter.py)
4038
ADD_PYTHON_TEST(PyQgsZonalStatistics test_qgszonalstatistics.py)
41-
ADD_PYTHON_TEST(PyQgsAppStartup test_qgsappstartup.py)
4239
ADD_PYTHON_TEST(PyQgsDistanceArea test_qgsdistancearea.py)
4340
ADD_PYTHON_TEST(PyQgsGraduatedSymbolRendererV2 test_qgsgraduatedsymbolrendererv2.py)
4441
ADD_PYTHON_TEST(PyQgsNetworkContentFetcher test_qgsnetworkcontentfetcher.py)
4542
ADD_PYTHON_TEST(PyQgsEditWidgets test_qgseditwidgets.py)
4643
ADD_PYTHON_TEST(PyQgsRangeWidgets test_qgsrangewidgets.py)
4744
ADD_PYTHON_TEST(PyQgsAttributeTableModel test_qgsattributetablemodel.py)
48-
IF (ENABLE_PGTEST)
49-
ADD_PYTHON_TEST(PyQgsPostgresProvider test_provider_postgres.py)
50-
ENDIF (ENABLE_PGTEST)
5145
ADD_PYTHON_TEST(PyQgsSpatialiteProvider test_provider_spatialite.py)
5246
ADD_PYTHON_TEST(PyQgsShapefileProvider test_provider_shapefile.py)
5347
ADD_PYTHON_TEST(PyQgsMemoryProvider test_provider_memory.py)
48+
49+
# Add optional tests which depend on certain cmake options
50+
IF (WITH_SERVER)
51+
ADD_PYTHON_TEST(PyQgsPalLabelingServer test_qgspallabeling_server.py)
52+
ADD_PYTHON_TEST(PyQgsLocalServer test_qgis_local_server.py)
53+
ENDIF (WITH_SERVER)
54+
55+
IF (WITH_DESKTOP)
56+
ADD_PYTHON_TEST(PyQgsAppStartup test_qgsappstartup.py)
57+
ENDIF (WITH_DESKTOP)
58+
59+
IF (ENABLE_PGTEST)
60+
ADD_PYTHON_TEST(PyQgsPostgresProvider test_provider_postgres.py)
61+
ENDIF (ENABLE_PGTEST)
62+
5463
IF (WITH_APIDOC)
5564
ADD_PYTHON_TEST(PyQgsDocCoverage test_qgsdoccoverage.py)
5665
ENDIF (WITH_APIDOC)

0 commit comments

Comments
 (0)
Please sign in to comment.