Commit 08f853a7 authored by saubatn's avatar saubatn
Browse files

UPDATED Vincent tests are back!

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@2193 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 0063266e
......@@ -1391,7 +1391,7 @@ macro(camitk_extension)
# CTEST - COMPONENT TESTS DESCRIPTION #
# #
#########################################################################
if( ${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND ALLOW_TEST) # TODO Remove ALLOW_TEST to enable tests back
if( ${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS)
camitk_init_test( ${${EXTENSION_NAME_CMAKE}_TEST_APPLICATION} )
set( CAMITK_EXTENSIONS_TESTS_LEVEL ${CAMITK_EXTENSIONS_TESTS_LEVEL} "|- style=\"background-color: #CCCCCC\" \\n || '''${TYPE_EXTENSION} ${EXTENSION_NAME}''' \\n" CACHE INTERNAL "")
......@@ -1422,8 +1422,8 @@ macro(camitk_extension)
set(TEST_DESCRIPTION "Test opening the component and saving it as a file.")
endif()
set( LEVELORIGIN ${TESTLEVEL} )#store the test level value in a const variable
set( LEVELORIGIN ${TESTLEVEL} ) #store the test level value in a const variable
foreach( COMPONENT_TESTDATA_FILE ${TESTFILES} )
# Give the file name (full path cut)
get_directory_name( ${COMPONENT_TESTDATA_FILE} DATA_FILE )
......@@ -1435,7 +1435,7 @@ macro(camitk_extension)
elseif(APPLE)
camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.dylib -l ${TESTLEVEL}" PASS_FILE_OUTPUT ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} TEST_SUFFIX ${COMP_DIR_NAME}_LEVEL${TESTLEVEL}_ PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} )
elseif(UNIX)
camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.so -l ${TESTLEVEL}" PASS_FILE_OUTPUT ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} TEST_SUFFIX ${COMP_DIR_NAME}_LEVEL${TESTLEVEL}_ PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} )
camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.so -l ${TESTLEVEL}" PASS_FILE_OUTPUT ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} TEST_SUFFIX ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}_LEVEL${TESTLEVEL}_ PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} )
endif()
camitk_parse_test_add(NAME ${CAMITK_TEST_NAME} LEVEL ${TESTLEVEL} DESCRIPTION ${TEST_DESCRIPTION})
MATH(EXPR TESTLEVEL "${TESTLEVEL}-1")#Decrease the test level to proceed less arduous tests
......@@ -1460,7 +1460,7 @@ macro(camitk_extension)
# CTEST - ACTION TESTS DESCRIPTION #
# #
#########################################################################
elseif( ${EXTENSION_NAME_CMAKE}_ACTION_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND ALLOW_TEST) # TODO Remove ALLOW_TEST to enable tests back
elseif( ${EXTENSION_NAME_CMAKE}_ACTION_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS)
camitk_init_test( ${${EXTENSION_NAME_CMAKE}_TEST_APPLICATION} )
set( CAMITK_EXTENSIONS_TESTS_LEVEL ${CAMITK_EXTENSIONS_TESTS_LEVEL} "|- style=\"background-color: #CCCCCC\" \\n || '''${TYPE_EXTENSION} ${EXTENSION_NAME}''' \\n" CACHE INTERNAL "")
......
Supports Markdown
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