processing: include non-optional testdata

qgis · Feb 4, 2016 · 2566061 · 2566061
1 parent 8b054e6
commit 2566061
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/python/plugins/processing/CMakeLists.txt b/python/plugins/processing/CMakeLists.txt
@@ -5,12 +5,10 @@ ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
 ADD_SUBDIRECTORY(modeler)
+ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(script)
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(ui)
-IF (ENABLE_TESTS)
-  ADD_SUBDIRECTORY(tests)
-ENDIF (ENABLE_TESTS)
 
 FILE(GLOB OTHER_FILES metadata.txt)
 FILE(GLOB PY_FILES *.py)

diff --git a/python/plugins/processing/tests/CMakeLists.txt b/python/plugins/processing/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ FILE(GLOB TEST_DATA_FILES data/*)
 PLUGIN_INSTALL(processing tests ${PY_FILES})
 PLUGIN_INSTALL(processing tests/data ${TEST_DATA_FILES})
 
-INCLUDE(UsePythonTest)
-
-ADD_PYTHON_TEST(ProcessingParametersTest ParametersTest.py)
+IF(ENABLE_TESTS)
+  INCLUDE(UsePythonTest)
+  ADD_PYTHON_TEST(ProcessingParametersTest ParametersTest.py)
+ENDIF(ENABLE_TESTS)