mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-20 06:49:56 +00:00
ctests: macro now deals with reverted and ignored
A single macro determines if a test should be ignored (by returning an empty test name), and if not, whether to revert it. This was Kornel's idea.
This commit is contained in:
parent
036a78e990
commit
a0f6b09a82
@ -119,7 +119,9 @@ macro(getoutputformats filepath varname)
|
|||||||
endforeach()
|
endforeach()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(getreverted testname reverted listreverted)
|
macro(maketestname testname reverted listreverted listignored)
|
||||||
|
list(FIND ${listignored} ${${testname}} _idx)
|
||||||
|
if (${_idx} LESS 0)
|
||||||
list(FIND ${listreverted} ${${testname}} _idx)
|
list(FIND ${listreverted} ${${testname}} _idx)
|
||||||
if (${_idx} LESS 0)
|
if (${_idx} LESS 0)
|
||||||
set(${reverted} 0)
|
set(${reverted} 0)
|
||||||
@ -127,6 +129,9 @@ macro(getreverted testname reverted listreverted)
|
|||||||
set(${reverted} 1)
|
set(${reverted} 1)
|
||||||
set(${testname} "INVERTED_SEE-README.ctest_${${testname}}")
|
set(${testname} "INVERTED_SEE-README.ctest_${${testname}}")
|
||||||
endif()
|
endif()
|
||||||
|
else()
|
||||||
|
set(${testname} "")
|
||||||
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(loadTestList filename resList)
|
macro(loadTestList filename resList)
|
||||||
@ -163,7 +168,8 @@ foreach(libsubfolder doc examples templates)
|
|||||||
# Strip extension
|
# Strip extension
|
||||||
string(REGEX REPLACE "\\.lyx$" "" f ${f})
|
string(REGEX REPLACE "\\.lyx$" "" f ${f})
|
||||||
set(TestName "export/${libsubfolder}/${f}_lyx16")
|
set(TestName "export/${libsubfolder}/${f}_lyx16")
|
||||||
getreverted(TestName reverted revertedTests)
|
maketestname(TestName reverted revertedTests ignoredTests)
|
||||||
|
if(TestName)
|
||||||
add_test(NAME ${TestName}
|
add_test(NAME ${TestName}
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
||||||
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
|
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
|
||||||
@ -175,15 +181,19 @@ foreach(libsubfolder doc examples templates)
|
|||||||
-Dfile=${f}
|
-Dfile=${f}
|
||||||
-Dreverted=${reverted}
|
-Dreverted=${reverted}
|
||||||
-P "${TOP_SRC_DIR}/development/autotests/export.cmake")
|
-P "${TOP_SRC_DIR}/development/autotests/export.cmake")
|
||||||
|
endif()
|
||||||
set(TestName "lyx2lyx/${libsubfolder}/${f}")
|
set(TestName "lyx2lyx/${libsubfolder}/${f}")
|
||||||
getreverted(TestName reverted revertedTests)
|
maketestname(TestName reverted revertedTests ignoredTests)
|
||||||
|
if(TestName)
|
||||||
add_test(NAME ${TestName}
|
add_test(NAME ${TestName}
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
||||||
COMMAND ${CMAKE_COMMAND} -DLYX2LYX=${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx
|
COMMAND ${CMAKE_COMMAND} -DLYX2LYX=${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx
|
||||||
-DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx
|
-DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx
|
||||||
-P "${TOP_SRC_DIR}/development/autotests/lyx2lyxtest.cmake")
|
-P "${TOP_SRC_DIR}/development/autotests/lyx2lyxtest.cmake")
|
||||||
|
endif()
|
||||||
set(TestName "check_load/${libsubfolder}/${f}")
|
set(TestName "check_load/${libsubfolder}/${f}")
|
||||||
getreverted(TestName reverted revertedTests)
|
maketestname(TestName reverted revertedTests ignoredTests)
|
||||||
|
if(TestName)
|
||||||
add_test(NAME ${TestName}
|
add_test(NAME ${TestName}
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
||||||
COMMAND ${CMAKE_COMMAND} -DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx
|
COMMAND ${CMAKE_COMMAND} -DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx
|
||||||
@ -191,12 +201,14 @@ foreach(libsubfolder doc examples templates)
|
|||||||
-DPARAMS_DIR=${TOP_SRC_DIR}/development/autotests
|
-DPARAMS_DIR=${TOP_SRC_DIR}/development/autotests
|
||||||
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
|
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
|
||||||
-P "${TOP_SRC_DIR}/development/autotests/check_load.cmake")
|
-P "${TOP_SRC_DIR}/development/autotests/check_load.cmake")
|
||||||
|
else()
|
||||||
|
message("ignored test")
|
||||||
|
endif()
|
||||||
getoutputformats("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist)
|
getoutputformats("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist)
|
||||||
foreach(format ${formatlist})
|
foreach(format ${formatlist})
|
||||||
set(TestName "export/${libsubfolder}/${f}_${format}")
|
set(TestName "export/${libsubfolder}/${f}_${format}")
|
||||||
list(FIND ignoredTests ${TestName} _idx)
|
maketestname(TestName reverted revertedTests ignoredTests)
|
||||||
if (${_idx} LESS 0)
|
if(TestName)
|
||||||
getreverted(TestName reverted revertedTests)
|
|
||||||
add_test(NAME ${TestName}
|
add_test(NAME ${TestName}
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
||||||
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
|
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
|
||||||
|
Loading…
Reference in New Issue
Block a user