Browse Source

Fix ctkSimplePythonShell python testing CMakeLists.txt

* SIMPLE_TEST can't be used, the add_test command arguments have
to be explicitly provided.
Jean-Christophe Fillion-Robin 13 years ago
parent
commit
6054ba89ef

+ 8 - 3
Applications/ctkSimplePythonShell/Testing/Python/CMakeLists.txt

@@ -26,7 +26,12 @@ if(CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)
     )
 endif()
 
-foreach(s ${SCRIPTS})
-  get_filename_component(TESTNAME ${s} NAME_WE)
-  SIMPLE_TEST(ctkSimplePythonShell_${TESTNAME} ${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT})
+foreach(script ${SCRIPTS})
+  get_filename_component(scriptname ${script} NAME_WE)
+  add_test(
+    NAME ctkSimplePythonShell_${scriptname} 
+    COMMAND $<TARGET_FILE:ctkSimplePythonShell> ${CMAKE_CURRENT_SOURCE_DIR}/${script}
+    )
+  set_property(TEST ctkSimplePythonShell_${scriptname} PROPERTY LABELS ${KIT})
 endforeach()
+

+ 7 - 0
Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -50,6 +50,7 @@ set(TEST_SOURCES
   ctkModalityWidgetTest1.cpp
   ctkPathLineEditTest1.cpp
   ctkPopupWidgetTest1.cpp
+  ctkRangeSliderTest.cpp
   ctkRangeSliderTest1.cpp
   ctkRangeWidgetTest1.cpp
   ctkRangeWidgetTest2.cpp
@@ -85,7 +86,11 @@ if(EXISTS "${CTKData_DIR}")
     )
 endif()
 
+include_directories(${CMAKE_SOURCE_DIR}/Libs/Testing
+                    ${CMAKE_CURRENT_BINARY_DIR})
+
 create_test_sourcelist(Tests ${KIT}CppTests.cxx
+
   ${TEST_SOURCES}
   )
 
@@ -111,6 +116,7 @@ set(Tests_MOC_SRCS
 
 set(Tests_MOC_CPP)
 QT4_WRAP_CPP(Tests_MOC_CPP ${Tests_MOC_SRCS})
+QT4_GENERATE_MOCS(ctkRangeSliderTest.cpp)
 
 add_executable(${KIT}CppTests ${Tests} ${Tests_SRCS} ${Tests_MOC_CPP})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
@@ -171,6 +177,7 @@ SIMPLE_TEST( ctkMenuComboBoxTest3 )
 SIMPLE_TEST( ctkModalityWidgetTest1 )
 SIMPLE_TEST( ctkPathLineEditTest1 )
 SIMPLE_TEST( ctkPopupWidgetTest1 )
+SIMPLE_TEST( ctkRangeSliderTest )
 SIMPLE_TEST( ctkRangeSliderTest1 )
 SIMPLE_TEST( ctkRangeWidgetTest1 )
 SIMPLE_TEST( ctkRangeWidgetTest2 )