Commit 3930eecd authored by Andrew Bauer's avatar Andrew Bauer
Browse files

Better way to add coprocessing test labels.

Change-Id: Ia05ac921125f116b92051291d5e5512c5a500f98
parent 76e2ef44
......@@ -41,7 +41,8 @@ add_test(NAME CoProcessingTestPythonScript
-DCOPROCESSING_TEST_SCRIPT=${CMAKE_CURRENT_SOURCE_DIR}/PythonScriptTest.py
-P ${CMAKE_CURRENT_SOURCE_DIR}/CoProcessingTestPythonScript.cmake)
set_tests_properties(CoProcessingTestPythonScript PROPERTIES LABELS "PARAVIEW CATALYST")
set(CP_LABELS PARAVIEW CATALYST)
set_tests_properties(CoProcessingTestPythonScript PROPERTIES LABELS "${CP_LABELS}")
if (PARAVIEW_USE_MPI)
add_test(NAME PCoProcessingTestPythonScript
......@@ -60,7 +61,7 @@ if (PARAVIEW_USE_MPI)
# both the parallel and the serial tests create the same output images
# so we run this one serially so that they don't interfere.
set_tests_properties(PCoProcessingTestPythonScript PROPERTIES RUN_SERIAL ON)
set_tests_properties(PCoProcessingTestPythonScript PROPERTIES LABELS "PARAVIEW CATALYST")
set_tests_properties(PCoProcessingTestPythonScript PROPERTIES LABELS "${CP_LABELS}")
endif()
if (PARAVIEW_BUILD_QT_GUI)
......@@ -75,5 +76,5 @@ if (PARAVIEW_BUILD_QT_GUI)
-DCOPROCESSING_DATA_DIR:PATH=${PARAVIEW_DATA_ROOT}
-DCOPROCESSING_OUTPUTCHECK_SCRIPT:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/outputcheck.py
-P ${CMAKE_CURRENT_SOURCE_DIR}/CoProcessingFullWorkflowTest.cmake)
set_tests_properties(CoProcessingFullWorkflow PROPERTIES LABELS "PARAVIEW CATALYST")
set_tests_properties(CoProcessingFullWorkflow PROPERTIES LABELS "${CP_LABELS}")
endif()
......@@ -100,5 +100,6 @@ IF (BUILD_TESTING AND BUILD_SHARED_LIBS)
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/Testing/CoProcessingGUI.xml )
SET_TESTS_PROPERTIES(pv.CoProcessingGUI PROPERTIES RUN_SERIAL ON)
# we overwrite existing labels so we have to add both ParaView and Catalyst.
SET_TESTS_PROPERTIES(pv.CoProcessingGUI PROPERTIES LABELS "PARAVIEW CATALYST")
set(CP_LABELS PARAVIEW CATALYST)
SET_TESTS_PROPERTIES(pv.CoProcessingGUI PROPERTIES LABELS "${CP_LABELS}")
ENDIF (BUILD_TESTING AND BUILD_SHARED_LIBS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment