set(sublabel "unreliable" ${sublabel} ${sublabel2})
list(REMOVE_ITEM sublabel "export" "inverted" "templates" "mathmacros" "manuals" "autotests")
else()
- string(REGEX MATCH "_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx16|xhtml)$" _v ${${testname}})
+ string(REGEX MATCH "(^check_load|_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx[0-9][0-9]|xhtml)$)" _v ${${testname}})
# check if test _may_ be in listsuspicious
set(sublabel2 "")
if (_v)
list(REMOVE_DUPLICATES sublabel)
if (NOT sublabel STREQUAL "")
join(sublabel "." tmpprefixx)
- string(TOUPPER "${tmpprefixx}_" tmpprefix)
+ if (tmpprefixx)
+ string(TOUPPER "${tmpprefixx}_" tmpprefix)
+ else()
+ set(tmpprefix "")
+ endif()
set(${testname} "${tmpprefix}${${testname}}")
set(${listlabels} ${sublabel})
endif()
loadTestList(suspendedTests suspendedTests 6)
loadTestList(unreliableTests unreliableTests 5)
-# preparing to add e.g. development/mathmacros to the foreach() loop
-foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates development/mathmacros)
+foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autotests/mathmacros)
set(testlabel "export")
if (libsubfolderx MATCHES "lib/doc")
list(APPEND testlabel "manuals")
list(APPEND testlabel "examples")
elseif (libsubfolderx MATCHES "lib/templates")
list(APPEND testlabel "templates")
- elseif (libsubfolderx MATCHES "development/mathmacros")
+ elseif (libsubfolderx MATCHES "autotests/mathmacros")
list(APPEND testlabel "mathmacros")
elseif (libsubfolderx MATCHES "autotests/.+")
list(APPEND testlabel "autotests")
message(STATUS "Handling export dir ${LIBSUB_SRC_DIR}")
file(GLOB_RECURSE lyx_files RELATIVE "${LIBSUB_SRC_DIR}" "${LIBSUB_SRC_DIR}/*.lyx")
list(SORT lyx_files)
- if (libsubfolderx MATCHES "development/mathmacros")
- # This is a zipped file, removing from tests
- list(REMOVE_ITEM lyx_files testcases_master_child.lyx)
- endif()
# Now create 2 lists. One for files in a language dir, one without
set(lang_lyx_files)
set(nolang_lyx_files)
foreach(f ${nolang_lyx_files} ${lang_lyx_files})
# Strip extension
string(REGEX REPLACE "\\.lyx$" "" f ${f})
- set(TestName "export/${libsubfolder}/${f}_lyx16")
- set(mytestlabel ${testlabel})
- maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
- if(TestName)
- add_test(NAME ${TestName}
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
- COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
- -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}
- -Dlyx=$<TARGET_FILE:${_lyx}>
- -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
- -DLYX_USERDIR_VER=${LYX_USERDIR_VER}
- -Dformat=lyx16x
- -Dextension=16.lyx
- -Dfile=${f}
- -Dinverted=${inverted}
- -DTOP_SRC_DIR=${TOP_SRC_DIR}
- -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
- -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
- setmarkedtestlabel(${TestName} ${mytestlabel})
- endif()
+ foreach(_lyx_format_num 16 21)
+ set(TestName "export/${libsubfolder}/${f}_lyx${_lyx_format_num}")
+ set(mytestlabel ${testlabel} "lyx2lyx" "load")
+ maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
+ if(TestName)
+ add_test(NAME ${TestName}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
+ COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
+ -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}
+ -Dlyx=$<TARGET_FILE:${_lyx}>
+ -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
+ -DLYX_USERDIR_VER=${LYX_USERDIR_VER}
+ -Dformat=lyx${_lyx_format_num}x
+ -Dextension=${_lyx_format_num}.lyx
+ -DLYX_FORMAT_NUM=${_lyx_format_num}
+ -Dfile=${f}
+ -Dinverted=${inverted}
+ -DTOP_SRC_DIR=${TOP_SRC_DIR}
+ -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
+ -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
+ setmarkedtestlabel(${TestName} ${mytestlabel})
+ endif()
+ endforeach()
if(LYX_PYTHON_EXECUTABLE)
set(lyx2lyxtestlabel "lyx2lyx")
# For use of lyx2lyx we need the python executable
-Dlyx=$<TARGET_FILE:${_lyx}>
-DPARAMS_DIR=${TOP_SRC_DIR}/development/autotests
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
+ -Dinverted=${inverted}
-P "${TOP_SRC_DIR}/development/autotests/check_load.cmake")
setmarkedtestlabel(${TestName} ${mytestlabel})
- set_tests_properties(${TestName} PROPERTIES RUN_SERIAL ON)
+ #set_tests_properties(${TestName} PROPERTIES RUN_SERIAL ON)
endif()
getoutputformats("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist)
foreach(format ${formatlist})