The branch, master, has been updated. - Log -----------------------------------------------------------------
commit f520df382d4f31d02a929e275e81aa8fc829e7d5 Author: Kornel Benko <[email protected]> Date: Fri Mar 1 17:13:29 2013 +0100 Remove MergedManuals.lyx from export tests diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index d868333..e1f3c25 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -78,27 +78,31 @@ foreach(libsubfolder doc examples templates) endif() endforeach() foreach(f ${nolang_lyx_files} ${lang_lyx_files}) - # Strip extension - string(REGEX REPLACE "\\.lyx$" "" f ${f}) - add_test(NAME export/${libsubfolder}/${f}_lyx16 - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" - COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} - -Dlyx=$<TARGET_FILE:${_lyx}> - -Dformat=lyx16x - -Dextension=16.lyx - -Dfile=${f} - -P "${TOP_SRC_DIR}/development/autotests/export.cmake") - getdefaultoutputformat("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist) - foreach(format "xhtml" ${formatlist}) - add_test(NAME export/${libsubfolder}/${f}_${format} + if(f MATCHES "MergedManuals") + # we do not test (for now) the uncompilable file MergedManuals.lyx + else() + # Strip extension + string(REGEX REPLACE "\\.lyx$" "" f ${f}) + add_test(NAME export/${libsubfolder}/${f}_lyx16 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} -Dlyx=$<TARGET_FILE:${_lyx}> - -Dformat=${format} - -Dextension=${format} + -Dformat=lyx16x + -Dextension=16.lyx -Dfile=${f} -P "${TOP_SRC_DIR}/development/autotests/export.cmake") - endforeach() + getdefaultoutputformat("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist) + foreach(format "xhtml" ${formatlist}) + add_test(NAME export/${libsubfolder}/${f}_${format} + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" + COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} + -Dlyx=$<TARGET_FILE:${_lyx}> + -Dformat=${format} + -Dextension=${format} + -Dfile=${f} + -P "${TOP_SRC_DIR}/development/autotests/export.cmake") + endforeach() + endif() endforeach() endforeach() ----------------------------------------------------------------------- Summary of changes: development/autotests/CMakeLists.txt | 36 ++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 16 deletions(-) hooks/post-receive -- The LyX Source Repository
