The branch, master, has been updated. - Log -----------------------------------------------------------------
commit e4a72659b0d48aa1706367cfdc42e4c9d7f66633 Author: Scott Kostyshak <[email protected]> Date: Mon Mar 4 06:27:44 2013 -0500 Re-add MergedManual test Now that the default format is set to xhtml, there will correctly be no LaTeX test. diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index 9557fad..265e40b 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -80,31 +80,27 @@ foreach(libsubfolder doc examples templates) endif() endforeach() foreach(f ${nolang_lyx_files} ${lang_lyx_files}) - 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 + # 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} 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 + -Dformat=${format} + -Dextension=${format} -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} - 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() endforeach() commit cc30e79c32c7b705d881b272c17d52655a1597d2 Author: Scott Kostyshak <[email protected]> Date: Mon Mar 4 07:10:46 2013 -0500 Tests: take into account a default format of xhtml The xhtml format is always tested, regardless of the default format. Without this, if the default format is xhtml, CMake gives an error when trying to add the xhtml test because it was already added. diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index e1f3c25..9557fad 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -55,6 +55,8 @@ macro(getdefaultoutputformat filepath varname) set(found ${CMAKE_MATCH_1}) if(found STREQUAL "default") set(found "pdf" "pdf2" "pdf5") + elseif(found STREQUAL "xhtml") + set(found "") # we test xhtml regardless of default format endif() set(${varname} ${found}) break() ----------------------------------------------------------------------- Summary of changes: development/autotests/CMakeLists.txt | 38 ++++++++++++++++----------------- 1 files changed, 18 insertions(+), 20 deletions(-) hooks/post-receive -- The LyX Source Repository
