Commit 38d2ecbd authored by jcfr's avatar jcfr
Browse files

COMP: Rename LAUNCH_EXE into Slicer_LAUNCH_COMMAND

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16677 3bd1e089-480b-0410-8dfb-8563597acbee
parent c00f37e7
...@@ -7,5 +7,5 @@ set_target_properties(PrettyPrintTableTest ...@@ -7,5 +7,5 @@ set_target_properties(PrettyPrintTableTest
PROPERTIES RUNTIME_OUTPUT_DIRECTORY PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${BRAINSCommonLibProject_BINARY_DIR}) ${BRAINSCommonLibProject_BINARY_DIR})
add_test(NAME PrettyPrintTableTest COMMAND ${LAUNCH_EXE} $<TARGET_FILE:PrettyPrintTableTest>) add_test(NAME PrettyPrintTableTest COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:PrettyPrintTableTest>)
...@@ -34,7 +34,7 @@ target_link_libraries(SimpleDiffeomorphicRegistrationCLP BRAINSDemonWarpLIB) ...@@ -34,7 +34,7 @@ target_link_libraries(SimpleDiffeomorphicRegistrationCLP BRAINSDemonWarpLIB)
add_test( add_test(
NAME ValidateLIB NAME ValidateLIB
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:SimpleDiffeomorphicRegistrationCLP> COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:SimpleDiffeomorphicRegistrationCLP>
${BRAINSDemonWarp_SOURCE_DIR}/TestingBRAINSDemonWarp/ANON0006_20_T1_dbg_splayed.nii.gz ${BRAINSDemonWarp_SOURCE_DIR}/TestingBRAINSDemonWarp/ANON0006_20_T1_dbg_splayed.nii.gz
${BRAINSDemonWarp_SOURCE_DIR}/TestingBRAINSDemonWarp/ANON0006_20_T1_sag_twisted.nii.gz ${BRAINSDemonWarp_SOURCE_DIR}/TestingBRAINSDemonWarp/ANON0006_20_T1_sag_twisted.nii.gz
${BRAINSDemonWarp_BINARY_DIR}/orientedImagesDemons_lib_test.nii.gz ${BRAINSDemonWarp_BINARY_DIR}/orientedImagesDemons_lib_test.nii.gz
......
...@@ -16,12 +16,12 @@ endif(WIN32) ...@@ -16,12 +16,12 @@ endif(WIN32)
add_executable( BRAINSDemonWarpCLPTests BRAINSDemonWarpCLPTests.cxx ${BRAINSDemonWarp_SOURCE_DIR}/BRAINSDemonWarpPrimary.cxx) add_executable( BRAINSDemonWarpCLPTests BRAINSDemonWarpCLPTests.cxx ${BRAINSDemonWarp_SOURCE_DIR}/BRAINSDemonWarpPrimary.cxx)
target_link_libraries(BRAINSDemonWarpCLPTests BRAINSDemonWarpCommonLib ${BRAINSWARP_ITK_LIBS} ${OPTIONAL_DEBUG_LINK_LIBRARIES}) target_link_libraries(BRAINSDemonWarpCLPTests BRAINSDemonWarpCommonLib ${BRAINSWARP_ITK_LIBS} ${OPTIONAL_DEBUG_LINK_LIBRARIES})
set_target_properties(BRAINSDemonWarpCLPTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BRAINSDemonWarp_BINARY_DIR}) set_target_properties(BRAINSDemonWarpCLPTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BRAINSDemonWarp_BINARY_DIR})
set(BRAINS_Demon_Warp_TESTS ${LAUNCH_EXE} $<TARGET_FILE:BRAINSDemonWarpCLPTests> ) set(BRAINS_Demon_Warp_TESTS ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:BRAINSDemonWarpCLPTests> )
add_executable( VBRAINSDemonWarpCLPTests VBRAINSDemonWarpCLPTests.cxx ${BRAINSDemonWarp_SOURCE_DIR}/VBRAINSDemonWarpPrimary.cxx) add_executable( VBRAINSDemonWarpCLPTests VBRAINSDemonWarpCLPTests.cxx ${BRAINSDemonWarp_SOURCE_DIR}/VBRAINSDemonWarpPrimary.cxx)
target_link_libraries(VBRAINSDemonWarpCLPTests BRAINSDemonWarpCommonLib ${BRAINSWARP_ITK_LIBS} ${OPTIONAL_DEBUG_LINK_LIBRARIES}) target_link_libraries(VBRAINSDemonWarpCLPTests BRAINSDemonWarpCommonLib ${BRAINSWARP_ITK_LIBS} ${OPTIONAL_DEBUG_LINK_LIBRARIES})
set_target_properties(VBRAINSDemonWarpCLPTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BRAINSDemonWarp_BINARY_DIR}) set_target_properties(VBRAINSDemonWarpCLPTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BRAINSDemonWarp_BINARY_DIR})
set(VBRAINS_Demon_Warp_TESTS ${LAUNCH_EXE} $<TARGET_FILE:VBRAINSDemonWarpCLPTests> ) set(VBRAINS_Demon_Warp_TESTS ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:VBRAINSDemonWarpCLPTests> )
include(${BRAINS_CMAKE_HELPER_DIR}/MIDAS.cmake) include(${BRAINS_CMAKE_HELPER_DIR}/MIDAS.cmake)
set(MIDAS_KEY_DIR "${PROJECT_SOURCE_DIR}/../BRAINSCommonLib/TestData") set(MIDAS_KEY_DIR "${PROJECT_SOURCE_DIR}/../BRAINSCommonLib/TestData")
......
...@@ -17,14 +17,14 @@ set(MIDAS_KEY_DIR "${PROJECT_SOURCE_DIR}/../BRAINSCommonLib/TestData") ...@@ -17,14 +17,14 @@ set(MIDAS_KEY_DIR "${PROJECT_SOURCE_DIR}/../BRAINSCommonLib/TestData")
#add_test( #add_test(
# NAME BRATestImage # NAME BRATestImage
# COMMAND ${LAUNCH_EXE} $<TARGET_FILE:BRATestImage> # COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:BRATestImage>
# ${BRAINSROIAuto_BINARY_DIR}/sphere.nii.gz # ${BRAINSROIAuto_BINARY_DIR}/sphere.nii.gz
# ${BRAINSROIAuto_BINARY_DIR}/GeneratedMaskSphere.nii.gz # ${BRAINSROIAuto_BINARY_DIR}/GeneratedMaskSphere.nii.gz
# ) # )
midas_add_test( midas_add_test(
NAME BRAINSROIAutoTest_GenerateBrainMask NAME BRAINSROIAutoTest_GenerateBrainMask
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:BRAINSROIAuto> COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:BRAINSROIAuto>
--inputVolume MIDAS{test.nii.gz.md5} --inputVolume MIDAS{test.nii.gz.md5}
--outputROIMaskVolume ${TESTING_BINARY_DIR}/BRAINSROIAutoTest_GenerateBrainMask.nii.gz --outputROIMaskVolume ${TESTING_BINARY_DIR}/BRAINSROIAutoTest_GenerateBrainMask.nii.gz
--ROIAutoDilateSize 10 --ROIAutoDilateSize 10
...@@ -34,7 +34,7 @@ set_tests_properties ( BRAINSROIAutoTest_GenerateBrainMask PROPERTIES DEPENDS BR ...@@ -34,7 +34,7 @@ set_tests_properties ( BRAINSROIAutoTest_GenerateBrainMask PROPERTIES DEPENDS BR
midas_add_test( midas_add_test(
NAME BRAINSROIAutoTest_CompareBrainMasks NAME BRAINSROIAutoTest_CompareBrainMasks
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:BRATestCompare> COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:BRATestCompare>
MIDAS{BRAINSROIAutoTest_GenerateBrainMask.result.nii.gz.md5} MIDAS{BRAINSROIAutoTest_GenerateBrainMask.result.nii.gz.md5}
${TESTING_BINARY_DIR}/BRAINSROIAutoTest_GenerateBrainMask.nii.gz ${TESTING_BINARY_DIR}/BRAINSROIAutoTest_GenerateBrainMask.nii.gz
) )
......
...@@ -14,7 +14,7 @@ target_link_libraries(BRAINSResampleTest BRAINSCommonLib ${ITK_LIBRARIES}) ...@@ -14,7 +14,7 @@ target_link_libraries(BRAINSResampleTest BRAINSCommonLib ${ITK_LIBRARIES})
set_target_properties(BRAINSResampleTest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set_target_properties(BRAINSResampleTest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
add_dependencies(BRAINSResampleTest BRAINSResample) add_dependencies(BRAINSResampleTest BRAINSResample)
set(BRAINSResample_TESTS ${LAUNCH_EXE} $<TARGET_FILE:BRAINSResampleTest>) set(BRAINSResample_TESTS ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:BRAINSResampleTest>)
SETIFEMPTY(MIDAS_REST_URL "http://midas.kitware.com/api/rest" CACHE STRING "The MIDAS server where testing data resides") SETIFEMPTY(MIDAS_REST_URL "http://midas.kitware.com/api/rest" CACHE STRING "The MIDAS server where testing data resides")
include(${BRAINS_CMAKE_HELPER_DIR}/MIDAS.cmake) include(${BRAINS_CMAKE_HELPER_DIR}/MIDAS.cmake)
......
...@@ -29,8 +29,8 @@ add_executable(${CLP}Test ${CLP}Test.cxx) ...@@ -29,8 +29,8 @@ add_executable(${CLP}Test ${CLP}Test.cxx)
add_dependencies(${CLP}Test ${CLP}) add_dependencies(${CLP}Test ${CLP})
target_link_libraries(${CLP}Test ITKIO ITKBasicFilters) target_link_libraries(${CLP}Test ITKIO ITKBasicFilters)
set (DicomToNrrdConverterEXE ${LAUNCH_EXE} ${DicomToNrrdConverter_BINARY_DIR}/../bin/${CLP} ) set (DicomToNrrdConverterEXE ${Slicer_LAUNCH_COMMAND} ${DicomToNrrdConverter_BINARY_DIR}/../bin/${CLP} )
set (DicomToNrrdConverter_TESTS ${LAUNCH_EXE} ${DicomToNrrdConverter_BINARY_DIR}/../bin/${CLP}Test ) set (DicomToNrrdConverter_TESTS ${Slicer_LAUNCH_COMMAND} ${DicomToNrrdConverter_BINARY_DIR}/../bin/${CLP}Test )
if(NOT SETIFEMPTY) if(NOT SETIFEMPTY)
macro(SETIFEMPTY) macro(SETIFEMPTY)
...@@ -52,7 +52,7 @@ add_test(DicomToNrrdConverterTest ${DicomToNrrdConverter_TESTS} ...@@ -52,7 +52,7 @@ add_test(DicomToNrrdConverterTest ${DicomToNrrdConverter_TESTS}
--help --help
) )
add_test(DicomToNrrdConverterDWICompareTest ${LAUNCH_EXE} ${DWICompareEXE} add_test(DicomToNrrdConverterDWICompareTest ${Slicer_LAUNCH_COMMAND} ${DWICompareEXE}
--help --help
) )
......
...@@ -27,7 +27,7 @@ set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary") ...@@ -27,7 +27,7 @@ set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary")
# DicomToNrrdConverter tests # DicomToNrrdConverter tests
add_test( add_test(
NAME ${CLP}Test NAME ${CLP}Test
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${CLP}Test> COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${CLP}Test>
ModuleEntryPoint ModuleEntryPoint
--inputDicomDirectory ${TEST_DATA}/DWIDicom --inputDicomDirectory ${TEST_DATA}/DWIDicom
--outputDirectory ${TEMP} --outputDirectory ${TEMP}
......
set(Launcher_Command ${LAUNCH_EXE}) set(Launcher_Command ${Slicer_LAUNCH_COMMAND})
if(USE_VALGRIND) if(USE_VALGRIND)
set(Launcher_Command "${Slicer_BINARY_DIR}/Scripts/runValgrindForOneModule.sh") set(Launcher_Command "${Slicer_BINARY_DIR}/Scripts/runValgrindForOneModule.sh")
endif() endif()
......
...@@ -49,7 +49,7 @@ if (BUILD_TESTING) ...@@ -49,7 +49,7 @@ if (BUILD_TESTING)
#SET_TARGET_PROPERTIES(ImageCompare PROPERTIES LABELS ${CLP}) #SET_TARGET_PROPERTIES(ImageCompare PROPERTIES LABELS ${CLP})
set(testname ${PROJECT_NAME}_N3_Brain2D_1) set(testname ${PROJECT_NAME}_N3_Brain2D_1)
add_test(NAME ${testname} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${PROJECT_NAME}> add_test(NAME ${testname} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${PROJECT_NAME}>
--inputImage --inputImage
${TEST_DATA_DIR}/t81slice.nii.gz ${TEST_DATA_DIR}/t81slice.nii.gz
--inputMask --inputMask
...@@ -77,7 +77,7 @@ if (BUILD_TESTING) ...@@ -77,7 +77,7 @@ if (BUILD_TESTING)
#SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${PROJECT_NAME}) #SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${PROJECT_NAME})
set(testname ${PROJECT_NAME}_N3_Brain2D_2) set(testname ${PROJECT_NAME}_N3_Brain2D_2)
add_test(NAME ${testname} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${PROJECT_NAME}> add_test(NAME ${testname} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${PROJECT_NAME}>
--inputImage --inputImage
${TEST_DATA_DIR}/he3volume.nii.gz ${TEST_DATA_DIR}/he3volume.nii.gz
--inputMask --inputMask
...@@ -104,7 +104,7 @@ if (BUILD_TESTING) ...@@ -104,7 +104,7 @@ if (BUILD_TESTING)
#SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${PROJECT_NAME}) #SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${PROJECT_NAME})
set(testname ${PROJECT_NAME}_N4_Brain2D) set(testname ${PROJECT_NAME}_N4_Brain2D)
add_test(NAME ${testname} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${PROJECT_NAME}> add_test(NAME ${testname} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${PROJECT_NAME}>
--inputImage --inputImage
${TEST_DATA_DIR}/t81slice.nii.gz ${TEST_DATA_DIR}/t81slice.nii.gz
--inputMask --inputMask
......
...@@ -33,7 +33,7 @@ set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary") ...@@ -33,7 +33,7 @@ set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary")
set(MRML_DATA "${Slicer_HOME}/share/MRML/Testing/TestData") set(MRML_DATA "${Slicer_HOME}/share/MRML/Testing/TestData")
set(testname ${CLP}Test) set(testname ${CLP}Test)
add_test(NAME ${testname} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${CLP}Test> add_test(NAME ${testname} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${CLP}Test>
--compare ${BASELINE}/he3corrected.nii ${TEMP}/he3corrected.nii.gz --compare ${BASELINE}/he3corrected.nii ${TEMP}/he3corrected.nii.gz
ModuleEntryPoint ModuleEntryPoint
--inputimage ${TEST_DATA}/he3volume.nii.gz --maskimage ${TEST_DATA}/he3mask.nii.gz --inputimage ${TEST_DATA}/he3volume.nii.gz --maskimage ${TEST_DATA}/he3mask.nii.gz
......
...@@ -26,7 +26,7 @@ TARGET_LINK_LIBRARIES(RegisterImagesMultiResApplicationsTests RegisterImagesMult ...@@ -26,7 +26,7 @@ TARGET_LINK_LIBRARIES(RegisterImagesMultiResApplicationsTests RegisterImagesMult
SET_TARGET_PROPERTIES(RegisterImagesMultiResApplicationsTests PROPERTIES LABELS ${CLP}) SET_TARGET_PROPERTIES(RegisterImagesMultiResApplicationsTests PROPERTIES LABELS ${CLP})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:RegisterImagesMultiResApplicationsTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:RegisterImagesMultiResApplicationsTests> ${TESTNAME})
SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${CLP}) SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${CLP})
ENDMACRO() ENDMACRO()
...@@ -44,7 +44,7 @@ target_link_libraries(RegisterImagesMultiResTest RegisterImagesMultiResModule) ...@@ -44,7 +44,7 @@ target_link_libraries(RegisterImagesMultiResTest RegisterImagesMultiResModule)
SET_TARGET_PROPERTIES(RegisterImagesMultiResTest PROPERTIES LABELS ${CLP}) SET_TARGET_PROPERTIES(RegisterImagesMultiResTest PROPERTIES LABELS ${CLP})
set(testname ${CLP}Test) set(testname ${CLP}Test)
add_test(${testname} ${LAUNCH_EXE} RegisterImagesMultiResTest add_test(${testname} ${Slicer_LAUNCH_COMMAND} RegisterImagesMultiResTest
--compare ${BASELINE}/RegisterImagesMultiResTest.nrrd --compare ${BASELINE}/RegisterImagesMultiResTest.nrrd
${TEMP}/RegisterImagesMultiResResult.nrrd ${TEMP}/RegisterImagesMultiResResult.nrrd
--compareIntensityTolerance 20 --compareIntensityTolerance 20
......
...@@ -34,7 +34,7 @@ if(BUILD_TESTING) ...@@ -34,7 +34,7 @@ if(BUILD_TESTING)
SET_TARGET_PROPERTIES(SFLSRobustStat3DTestConsole PROPERTIES LABELS ${CLP}) SET_TARGET_PROPERTIES(SFLSRobustStat3DTestConsole PROPERTIES LABELS ${CLP})
set(testname ${CLP}Test) set(testname ${CLP}Test)
add_test(NAME ${testname} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:SFLSRobustStat3DTestConsole> add_test(NAME ${testname} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:SFLSRobustStat3DTestConsole>
${CMAKE_CURRENT_SOURCE_DIR}/grayscale.nrrd ${CMAKE_CURRENT_SOURCE_DIR}/grayscale.nrrd
${CMAKE_CURRENT_SOURCE_DIR}/grayscale-label.nrrd ${CMAKE_CURRENT_SOURCE_DIR}/grayscale-label.nrrd
${CMAKE_CURRENT_BINARY_DIR}/rss-test-seg.nrrd 50 0.1 0.2) ${CMAKE_CURRENT_BINARY_DIR}/rss-test-seg.nrrd 50 0.1 0.2)
......
...@@ -19,7 +19,7 @@ find_path(SLICER_BRAINWEB_DATA_ROOT brainweb165a10f17.mha ...@@ -19,7 +19,7 @@ find_path(SLICER_BRAINWEB_DATA_ROOT brainweb165a10f17.mha
DOC "Directory with data taken from http://public.kitware.com/pub/itk/Data/BrainWeb/") DOC "Directory with data taken from http://public.kitware.com/pub/itk/Data/BrainWeb/")
mark_as_advanced(SLICER_BRAINWEB_DATA_ROOT) mark_as_advanced(SLICER_BRAINWEB_DATA_ROOT)
set(Launcher_Command ${LAUNCH_EXE}) set(Launcher_Command ${Slicer_LAUNCH_COMMAND})
if(USE_VALGRIND) if(USE_VALGRIND)
set(Launcher_Command "${Slicer_BINARY_DIR}/Scripts/runValgrindForOneModule.sh") set(Launcher_Command "${Slicer_BINARY_DIR}/Scripts/runValgrindForOneModule.sh")
endif() endif()
......
...@@ -54,4 +54,4 @@ include_directories( ...@@ -54,4 +54,4 @@ include_directories(
set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary") set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary")
add_test(EventBrokerTest add_test(EventBrokerTest
${LAUNCH_EXE} EventBrokerTest --logFileName ${TEMP}/EventLog.dot --graphFile ${TEMP}/EventBroker.dot) ${Slicer_LAUNCH_COMMAND} EventBrokerTest --logFileName ${TEMP}/EventLog.dot --graphFile ${TEMP}/EventBroker.dot)
...@@ -17,7 +17,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests}) ...@@ -17,7 +17,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME}) TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
ENDMACRO() ENDMACRO()
# #
......
...@@ -37,7 +37,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ...@@ -37,7 +37,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests
) )
MACRO( SIMPLE_TEST TESTNAME ) MACRO( SIMPLE_TEST TESTNAME )
ADD_TEST( ${TESTNAME} ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} ADD_TEST( ${TESTNAME} ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SlicerQT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SlicerQT
) )
ENDMACRO() ENDMACRO()
......
...@@ -17,12 +17,12 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name}) ...@@ -17,12 +17,12 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name})
SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME}) SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME})
ENDMACRO() ENDMACRO()
MACRO(PARAM_TEST TESTNAME PARAM) MACRO(PARAM_TEST TESTNAME PARAM)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} ${PARAM}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} ${PARAM})
SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME})
ENDMACRO() ENDMACRO()
......
...@@ -23,7 +23,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME}) ...@@ -23,7 +23,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME}) SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME})
ENDMACRO() ENDMACRO()
......
...@@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME}) ...@@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME}) SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME})
ENDMACRO() ENDMACRO()
...@@ -32,14 +32,14 @@ ENDMACRO() ...@@ -32,14 +32,14 @@ ENDMACRO()
SET(testname qSlicerCoreApplicationTest1) SET(testname qSlicerCoreApplicationTest1)
ADD_TEST( ADD_TEST(
NAME ${testname} NAME ${testname}
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> qSlicerCoreApplicationTest1 COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> qSlicerCoreApplicationTest1
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SlicerQT ) ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SlicerQT )
SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${LIBRARY_NAME})
SET(testname qSlicerCoreIOManagerTest1) SET(testname qSlicerCoreIOManagerTest1)
ADD_TEST( ADD_TEST(
NAME ${testname} NAME ${testname}
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> qSlicerCoreIOManagerTest1 COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> qSlicerCoreIOManagerTest1
${CMAKE_SOURCE_DIR}/Libs/MRML/Testing/name.mrml ${CMAKE_SOURCE_DIR}/Libs/MRML/Testing/name.mrml
) )
SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${testname} PROPERTY LABELS ${LIBRARY_NAME})
......
...@@ -24,7 +24,7 @@ SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME}) ...@@ -24,7 +24,7 @@ SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST( ADD_TEST(
NAME ${TESTNAME} NAME ${TESTNAME}
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SlicerQT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SlicerQT
) )
SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME})
......
...@@ -23,7 +23,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME}) ...@@ -23,7 +23,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME}) SET_TARGET_PROPERTIES(${KIT}CxxTests PROPERTIES LABELS ${LIBRARY_NAME})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME}) SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${LIBRARY_NAME})
ENDMACRO() ENDMACRO()
......
...@@ -281,7 +281,7 @@ MESSAGE(STATUS "Slicer_BUILD:${Slicer_BUILD}") ...@@ -281,7 +281,7 @@ MESSAGE(STATUS "Slicer_BUILD:${Slicer_BUILD}")
IF(BUILD_TESTING) IF(BUILD_TESTING)
SET(Slicer_LAUNCHER_EXECUTABLE ${Slicer_BINARY_DIR}/Slicer4) SET(Slicer_LAUNCHER_EXECUTABLE ${Slicer_BINARY_DIR}/Slicer4)
SET(LAUNCH_EXE ${Slicer_LAUNCHER_EXECUTABLE} --launch) SET(Slicer_LAUNCH_COMMAND ${Slicer_LAUNCHER_EXECUTABLE} --launch)
ENABLE_TESTING() ENABLE_TESTING()
......
...@@ -102,7 +102,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests}) ...@@ -102,7 +102,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name}) TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
ENDMACRO() ENDMACRO()
SIMPLE_TEST( vtkMRMLArrayPlotNodeTest1 ) SIMPLE_TEST( vtkMRMLArrayPlotNodeTest1 )
...@@ -197,7 +197,7 @@ SIMPLE_TEST( vtkObserverManagerTest1 ) ...@@ -197,7 +197,7 @@ SIMPLE_TEST( vtkObserverManagerTest1 )
MACRO(TEST_SCENE SCENEFILENAME) MACRO(TEST_SCENE SCENEFILENAME)
ADD_TEST( ADD_TEST(
NAME vtkMRMLSceneTest2_${SCENEFILENAME} NAME vtkMRMLSceneTest2_${SCENEFILENAME}
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> vtkMRMLSceneTest2 COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> vtkMRMLSceneTest2
${CMAKE_CURRENT_SOURCE_DIR}/${SCENEFILENAME} ${CMAKE_CURRENT_SOURCE_DIR}/${SCENEFILENAME}
) )
ENDMACRO() ENDMACRO()
......
...@@ -39,7 +39,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ...@@ -39,7 +39,7 @@ ADD_EXECUTABLE(${KIT}CxxTests
TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name}) TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name})
#MACRO(SIMPLE_TEST TESTNAME) #MACRO(SIMPLE_TEST TESTNAME)
# ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) # ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
#ENDMACRO() #ENDMACRO()
#SIMPLE_TEST( vtkMRMLCameraDisplayableManagerTest1 ) #SIMPLE_TEST( vtkMRMLCameraDisplayableManagerTest1 )
...@@ -53,7 +53,7 @@ FOREACH (test ${TestsToRun}) ...@@ -53,7 +53,7 @@ FOREACH (test ${TestsToRun})
GET_FILENAME_COMPONENT(TESTNAME ${test} NAME_WE) GET_FILENAME_COMPONENT(TESTNAME ${test} NAME_WE)
ADD_TEST( ADD_TEST(
NAME ${TESTNAME} NAME ${TESTNAME}
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}
-D ${CMAKE_CURRENT_SOURCE_DIR}/../ -D ${CMAKE_CURRENT_SOURCE_DIR}/../
-T ${TEMP} -T ${TEMP}
-V Baseline/${TESTNAME}.png -V Baseline/${TESTNAME}.png
......
...@@ -18,13 +18,13 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests}) ...@@ -18,13 +18,13 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name}) TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
ENDMACRO() ENDMACRO()
MACRO(SIMPLE_FILE_TEST TESTNAME FILE) MACRO(SIMPLE_FILE_TEST TESTNAME FILE)
ADD_TEST( ADD_TEST(
NAME ${TESTNAME}_${FILE} NAME ${TESTNAME}_${FILE}
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} ${MRML_SOURCE_DIR}/Testing/TestData/${FILE} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} ${MRML_SOURCE_DIR}/Testing/TestData/${FILE}
) )
ENDMACRO() ENDMACRO()
......
...@@ -38,16 +38,16 @@ target_link_libraries(Parser1Test ModuleDescriptionParser ) ...@@ -38,16 +38,16 @@ target_link_libraries(Parser1Test ModuleDescriptionParser )
set(TEST_DATA ${ModuleDescriptionParserTesting_SOURCE_DIR}/TestData) set(TEST_DATA ${ModuleDescriptionParserTesting_SOURCE_DIR}/TestData)
add_test( add_test(
NAME Parser1Test1 NAME Parser1Test1
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:Parser1Test> ${TEST_DATA}/ParserTest1.xml COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:Parser1Test> ${TEST_DATA}/ParserTest1.xml
) )
add_test( add_test(
NAME Parser1Test2 NAME Parser1Test2
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:Parser1Test> ${TEST_DATA}/ParserTest2.xml) COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:Parser1Test> ${TEST_DATA}/ParserTest2.xml)
#add_test( #add_test(
# NAME ModuleFactoryTest # NAME ModuleFactoryTest
# COMMAND ${LAUNCH_EXE} $<TARGET_FILE:ModuleFactoryTest> # COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:ModuleFactoryTest>
# ${Slicer_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/ # ${Slicer_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/
# ) # )
...@@ -72,13 +72,13 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ${Tests_MOC_CXX} ${Tests_UtilityFiles}) ...@@ -72,13 +72,13 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ${Tests_MOC_CXX} ${Tests_UtilityFiles})
TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME}) TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
MACRO(SIMPLE_TEST TESTNAME) MACRO(SIMPLE_TEST TESTNAME)
ADD_TEST(NAME ${TESTNAME} COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}) ADD_TEST(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME})
ENDMACRO() ENDMACRO()
MACRO(SCENE_TEST TESTNAME SCENEFILENAME) MACRO(SCENE_TEST TESTNAME SCENEFILENAME)
ADD_TEST( ADD_TEST(
NAME ${TESTNAME}_${SCENENAME} NAME ${TESTNAME}_${SCENENAME}
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} ${MRML_SOURCE_DIR}/Testing/${SCENEFILENAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME} ${MRML_SOURCE_DIR}/Testing/${SCENEFILENAME}
) )
ENDMACRO() ENDMACRO()
......