Commit c00f37e7 authored by jcfr's avatar jcfr

COMP: Rename Slicer_EXECUTABLE into Slicer_LAUNCHER_EXECUTABLE

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16676 3bd1e089-480b-0410-8dfb-8563597acbee
parent f9d7cc87
......@@ -1486,7 +1486,7 @@ SET_TARGET_PROPERTIES(${CLP}Test PROPERTIES LABELS ${CLP})
# leaks from tcl file
# set(testname ${CLP}Test2)
# add_test(NAME ${testname} COMMAND ${Slicer_EXECUTABLE}
# add_test(NAME ${testname} COMMAND ${Slicer_LAUNCHER_EXECUTABLE}
# --test-mode
# --script ${Slicer_SOURCE_DIR}/Applications/CLI/SparseFieldLevelSetContour/Testing/SparseFieldLevelSetContourTest.tcl
# ${TEST_DATA}/SparseFieldLevelSetContourTest.vtp
......
......@@ -4,22 +4,22 @@ project(GUITesting)
# --------------------------------------------------------------------------
# Command line parsing tests
#
add_test(SlicerCLTest1 ${Slicer_EXECUTABLE} --test-mode --help)
add_test(SlicerCLTest2 ${Slicer_EXECUTABLE} --xml --test-mode)
add_test(SlicerCLTest3 ${Slicer_EXECUTABLE} --test-mode -f ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
add_test(SlicerCLTest4 ${Slicer_EXECUTABLE} --test-mode --eval "puts testing ,. exit 0")
add_test(SlicerCLTest5 ${Slicer_EXECUTABLE} --test-mode --exec "puts testing ,. exit 0")
add_test(SlicerCLTest6 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
add_test(SlicerCLTest7 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/LoadSceneTest.tcl)
add_test(SlicerCLTest8 ${Slicer_EXECUTABLE} --test-mode --no-modules --eval exit)
add_test(SlicerCLTest9 ${Slicer_EXECUTABLE} --test-mode --no-modules --exec "exit")
add_test(SlicerScrollTest ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/ScrollTesting.tcl)
add_test(SlicerCLTest1 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --help)
add_test(SlicerCLTest2 ${Slicer_LAUNCHER_EXECUTABLE} --xml --test-mode)
add_test(SlicerCLTest3 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode -f ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
add_test(SlicerCLTest4 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --eval "puts testing ,. exit 0")
add_test(SlicerCLTest5 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --exec "puts testing ,. exit 0")
add_test(SlicerCLTest6 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
add_test(SlicerCLTest7 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/LoadSceneTest.tcl)
add_test(SlicerCLTest8 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-modules --eval exit)
add_test(SlicerCLTest9 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-modules --exec "exit")
add_test(SlicerScrollTest ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/ScrollTesting.tcl)
# --------------------------------------------------------------------------
# MRML Tests
#
add_test(SlicerMRMLUndo ${Slicer_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testUndo.tcl)
add_test(SlicerMRMLVolume ${Slicer_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testVolume.tcl)
add_test(SlicerMRMLUndo ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testUndo.tcl)
add_test(SlicerMRMLVolume ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testVolume.tcl)
# --------------------------------------------------------------------------
......
......@@ -224,20 +224,20 @@ ENDIF()
# --------------------------------------------------------------------------
# Command line parsing tests
#
# add_test(SlicerCLTest1 ${Slicer_EXECUTABLE} --test-mode --help)
# add_test(SlicerCLTest2 ${Slicer_EXECUTABLE} --xml --test-mode)
# add_test(SlicerCLTest3 ${Slicer_EXECUTABLE} --test-mode -f ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
# add_test(SlicerCLTest4 ${Slicer_EXECUTABLE} --test-mode --eval "puts testing ,. exit 0")
# add_test(SlicerCLTest5 ${Slicer_EXECUTABLE} --test-mode --exec "puts testing ,. exit 0")
# add_test(SlicerCLTest6 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
# add_test(SlicerCLTest7 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/LoadSceneTest.tcl)
# add_test(SlicerScrollTest ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/ScrollTesting.tcl)
# add_test(SlicerCLTest1 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --help)
# add_test(SlicerCLTest2 ${Slicer_LAUNCHER_EXECUTABLE} --xml --test-mode)
# add_test(SlicerCLTest3 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode -f ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
# add_test(SlicerCLTest4 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --eval "puts testing ,. exit 0")
# add_test(SlicerCLTest5 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --exec "puts testing ,. exit 0")
# add_test(SlicerCLTest6 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/TestScript.tcl)
# add_test(SlicerCLTest7 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/LoadSceneTest.tcl)
# add_test(SlicerScrollTest ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Applications/GUI/Testing/ScrollTesting.tcl)
# --------------------------------------------------------------------------
# MRML Tests
#
# add_test(SlicerMRMLUndo ${Slicer_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testUndo.tcl)
# add_test(SlicerMRMLVolume ${Slicer_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testVolume.tcl)
# add_test(SlicerMRMLUndo ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testUndo.tcl)
# add_test(SlicerMRMLVolume ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash -f ${Slicer_HOME}/share/MRML/Testing/testVolume.tcl)
# --------------------------------------------------------------------------
# Testing
......
# --------------------------------------------------------------------------
# Testing
ADD_TEST(Slicer3PythonTest ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Python/Testing/SimpleTest.py)
ADD_TEST(Slicer3PythonTest ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Python/Testing/SimpleTest.py)
......@@ -18,13 +18,13 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
SET(SHORT_TEST_TIMEOUT 300) ## Sometimes when the GUI crashes, it won't exit properly, and then the tests have to wait until they reach 1500 seconds before they time out
ADD_TEST(Slicer3GUITest1 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestSliceController.tcl)
ADD_TEST(Slicer3GUITest2 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestProgressDialog.tcl)
ADD_TEST(Slicer3FiducialsTest1 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducials.tcl)
ADD_TEST(Slicer3FiducialsTest2 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducialsAdd.tcl)
ADD_TEST(Slicer3FiducialsTestGlyphs ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducialsGlyphs.tcl)
ADD_TEST(Slicer3FiducialsTestChangeGlyphs ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducialsAddSymbolScale.tcl)
ADD_TEST(Slicer3RestoreSceneSnapshotCompareViewTest1 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestRestoreSceneSnapshotCompareView.tcl)
ADD_TEST(Slicer3GUITest1 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestSliceController.tcl)
ADD_TEST(Slicer3GUITest2 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestProgressDialog.tcl)
ADD_TEST(Slicer3FiducialsTest1 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducials.tcl)
ADD_TEST(Slicer3FiducialsTest2 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducialsAdd.tcl)
ADD_TEST(Slicer3FiducialsTestGlyphs ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducialsGlyphs.tcl)
ADD_TEST(Slicer3FiducialsTestChangeGlyphs ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestFiducialsAddSymbolScale.tcl)
ADD_TEST(Slicer3RestoreSceneSnapshotCompareViewTest1 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Base/GUI/Testing/TestRestoreSceneSnapshotCompareView.tcl)
SET_TESTS_PROPERTIES( Slicer3FiducialsTest1 PROPERTIES TIMEOUT ${SHORT_TEST_TIMEOUT} )
SET_TESTS_PROPERTIES( Slicer3FiducialsTest2 PROPERTIES TIMEOUT ${SHORT_TEST_TIMEOUT} )
......
......@@ -280,8 +280,8 @@ MESSAGE(STATUS "Slicer_BUILD:${Slicer_BUILD}")
#-----------------------------------------------------------------------------
IF(BUILD_TESTING)
SET(Slicer_EXECUTABLE ${Slicer_BINARY_DIR}/Slicer4)
SET(LAUNCH_EXE ${Slicer_EXECUTABLE} --launch)
SET(Slicer_LAUNCHER_EXECUTABLE ${Slicer_BINARY_DIR}/Slicer4)
SET(LAUNCH_EXE ${Slicer_LAUNCHER_EXECUTABLE} --launch)
ENABLE_TESTING()
......
......@@ -227,8 +227,8 @@ ENDFOREACH( SceneToTest )
IF(Slicer_USE_KWWIDGETS)
# add a tcl test to check that colour files get loaded and saved properly to mrml files and loaded again
ADD_TEST(NAME SlicerColorStorageNodeSceneTest COMMAND ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/Tcl/TestColorStorageNodeInScene.tcl)
ADD_TEST(NAME SlicerColorStorageNodeSceneTest COMMAND ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/Tcl/TestColorStorageNodeInScene.tcl)
# add a tcl test to check that scene clear is working okay
ADD_TEST(NAME Slicer3SceneClearTest COMMAND ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/Tcl/TestSceneClear.tcl)
ADD_TEST(NAME Slicer3SceneClearTest COMMAND ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/Tcl/TestSceneClear.tcl)
ENDIF()
# --------------------------------------------------------------------------
# Testing
ADD_TEST(Slicer3EditorModelMakerTest ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Modules/Editor/Testing/TestEditorModelMaker.tcl ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/TestData/helixMask.nrrd)
ADD_TEST(Slicer3EditorModelMakerTest ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Modules/Editor/Testing/TestEditorModelMaker.tcl ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/TestData/helixMask.nrrd)
ADD_TEST(Slicer3EditorPaintTest ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Modules/Editor/Testing/TestEditorPaint.tcl ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/TestData/fixed.nrrd)
ADD_TEST(Slicer3EditorPaintTest ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Modules/Editor/Testing/TestEditorPaint.tcl ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/TestData/fixed.nrrd)
ADD_TEST(Slicer3EditorStructureTest ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Modules/Editor/Testing/TestEditorStructures.tcl ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/TestData/fixed.nrrd)
ADD_TEST(Slicer3EditorStructureTest ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/Modules/Editor/Testing/TestEditorStructures.tcl ${Slicer_SOURCE_DIR}/Libs/MRML/Testing/TestData/fixed.nrrd)
......@@ -36,7 +36,7 @@ install(
# Testing
if(BUILD_TESTING)
add_test(ModelIntoLabelVolumeTest ${Slicer_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/Testing/ModelIntoLabelVolumeTest.tcl)
add_test(ModelIntoLabelVolumeTest ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/Testing/ModelIntoLabelVolumeTest.tcl)
endif()
# --------------------------------------------------------------------------
......
......@@ -3,7 +3,7 @@ set(SHORT_TEST_TIMEOUT 300) ## Sometimes when the GUI crashes, it won't exit pr
ADD_TEST(
NeuroNavTestDependency
${Slicer_EXECUTABLE} --test-mode --script ${NeuroNav_SOURCE_DIR}/Testing/TestDependency.tcl
${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${NeuroNav_SOURCE_DIR}/Testing/TestDependency.tcl
)
set_tests_properties( NeuroNavTestDependency PROPERTIES TIMEOUT ${SHORT_TEST_TIMEOUT} )
......
......@@ -2,7 +2,7 @@ set(SHORT_TEST_TIMEOUT 300) ## Sometimes when the GUI crashes, it won't exit pr
ADD_TEST(
OpenIGTLinkIFTestConnector
${Slicer_EXECUTABLE} --test-mode --script ${OpenIGTLinkIF_SOURCE_DIR}/Testing/TestConnector.tcl
${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${OpenIGTLinkIF_SOURCE_DIR}/Testing/TestConnector.tcl
)
set_tests_properties( OpenIGTLinkIFTestConnector PROPERTIES TIMEOUT ${SHORT_TEST_TIMEOUT} )
......
......@@ -2,7 +2,7 @@ PROJECT (SlicerDeamonTesting)
#ADD_TEST(
# DaemonTest1_checkSlicerd
# ${Slicer_EXECUTABLE}
# ${Slicer_LAUNCHER_EXECUTABLE}
# --daemon
# --script
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_MODULES_LIB_DIR}/SlicerDaemon/Testing/Tcl/testIfDaemonAlreadyRuns.tcl
......@@ -10,7 +10,7 @@ PROJECT (SlicerDeamonTesting)
#ADD_TEST(
# DaemonTest2_loadTensorScene
# ${Slicer_EXECUTABLE}
# ${Slicer_LAUNCHER_EXECUTABLE}
# --daemon
# --script
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_MODULES_LIB_DIR}/SlicerDaemon/Testing/Tcl/daemonTest_loadTensorScene.tcl
......@@ -18,7 +18,7 @@ PROJECT (SlicerDeamonTesting)
#ADD_TEST(
# DaemonTest3_pipeTensor
# ${Slicer_EXECUTABLE}
# ${Slicer_LAUNCHER_EXECUTABLE}
# --daemon
# --script
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_MODULES_LIB_DIR}/SlicerDaemon/Testing/Tcl/daemonTest_pipeTensor.tcl
......@@ -26,7 +26,7 @@ PROJECT (SlicerDeamonTesting)
#ADD_TEST(
# DaemonTest4_pipeAndCompareTensors
# ${Slicer_EXECUTABLE}
# ${Slicer_LAUNCHER_EXECUTABLE}
# --daemon
# --script
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_MODULES_LIB_DIR}/SlicerDaemon/Testing/Tcl/compare2Tensors.tcl
......
......@@ -3,7 +3,7 @@ set(SHORT_TEST_TIMEOUT 300) ## Sometimes when the GUI crashes, it won't exit pr
ADD_TEST(
TractographyTestGlyphs
${Slicer_EXECUTABLE} --test-mode --script ${Tractography_SOURCE_DIR}/Testing/TestGlyphs.tcl
${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Tractography_SOURCE_DIR}/Testing/TestGlyphs.tcl
)
set_tests_properties( TractographyTestGlyphs PROPERTIES TIMEOUT ${SHORT_TEST_TIMEOUT} )
......@@ -12,13 +12,13 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests SlicerBaseGUI)
add_test(NAME DiffusionEditorTest COMMAND ${Slicer_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditorTest.tcl)
add_test(NAME DiffusionEditorTest COMMAND ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditorTest.tcl)
add_test(NAME DiffusionEditorGradients COMMAND ${Slicer_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditor_GradientsTest.tcl)
add_test(NAME DiffusionEditorGradients COMMAND ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditor_GradientsTest.tcl)
add_test(NAME DiffusionEditorGlyphsTracts COMMAND ${Slicer_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditorGlyphsTractsTest.tcl)
add_test(NAME DiffusionEditorGlyphsTracts COMMAND ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditorGlyphsTractsTest.tcl)
add_test(NAME DiffusionEditorTensor COMMAND ${Slicer_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditorTensorTest.tcl)
add_test(NAME DiffusionEditorTensor COMMAND ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --no-splash --script ${CMAKE_CURRENT_SOURCE_DIR}/DiffusionEditorTensorTest.tcl)
# Sometimes when the GUI crashes, it won't exit properly, and then
# the tests have to wait until they reach 1500 seconds before they time out
set(SHORT_TEST_TIMEOUT 300)
......
......@@ -64,7 +64,7 @@ TARGET_LINK_LIBRARIES(${KIT}CxxTests ${lib_name})
#SIMPLE_TEST( qSlicerAnnotationModuleAnnotationPropertyDialogTest1 )
#ADD_TEST(SlicerAnnotationRulerTest1 ${Slicer_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/QTModules/Annotation/Testing/TestAddRuler.tcl)
#ADD_TEST(SlicerAnnotationRulerTest1 ${Slicer_LAUNCHER_EXECUTABLE} --test-mode --script ${Slicer_SOURCE_DIR}/QTModules/Annotation/Testing/TestAddRuler.tcl)
# SIMPLE_TEST( vtkMRMLAnnotationFiducialStorageNodeTest1 )
# Install the testing data
......
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