#
find_package(Perl)
+find_program(XMLLINT_EXECUTABLE xmllint)
if(PERL_FOUND)
set(DVI_FORMATS "dvi" "dvi3")
set(potential_languages "ca" "cs" "da" "de" "el" "es" "eu" "fa" "fr" "gl" "he" "hu" "id" "it" "ja" "ko" "nb" "nl" "pl" "pt" "ro" "ru" "sk" "sl" "sr" "sv" "uk" "zh_CN")
+# Used to select labels from .*Tests files
+set(label_chars "[a-zA-Z:_]+")
+
macro(initLangVars varname)
foreach(_l ${potential_languages})
set(${varname}_${_l})
if ("${_itrx}" MATCHES "^Sublabel:")
set(tmpsublabel "")
string(REGEX REPLACE "^Sublabel:[ \t]*" "" _itrlabels ${_itrx})
- string(REGEX MATCHALL "[a-zA-Z]+" _labels ${_itrlabels})
+ string(REGEX MATCHALL ${label_chars} _labels ${_itrlabels})
foreach(subl ${_labels})
if (subl STREQUAL "RESET")
set(tmpsublabel "")
function(join rvalues glue routput)
set(locallist ${${rvalues}})
- list(REMOVE_ITEM locallist "export" "lyx2lyx" "load")
+ set(removelist "export" "lyx2lyx" "load")
+ foreach(_l ${locallist})
+ if (depth_${_l} LESS 0)
+ list(APPEND removelist ${_l})
+ endif()
+ endforeach()
+ list(REMOVE_ITEM locallist ${removelist})
string(REGEX REPLACE "([^\\]|^);" "\\1${glue}" out "${locallist}")
set(${routput} ${out} PARENT_SCOPE)
endfunction()
macro(maketestname testname inverted listsuspicious listignored listunreliable listlabels)
+ # initialize output variable
+ set(${inverted} 0)
string(REGEX MATCH "\\/[a-z][a-z](_[A-Z][A-Z])?\\/" _v ${${testname}})
if(_v)
string(REGEX REPLACE "\\/" "" _v ${_v})
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()
list(APPEND ${resList} "${_newl}")
if (_newl MATCHES "^Sublabel:")
string(REGEX REPLACE "^Sublabel:[ \t]*" "" _newlabels ${_newl})
- string(REGEX MATCHALL "([0-9]*[a-zA-Z]+)" _labels ${_newlabels})
+ string(REGEX MATCHALL "([0-9]*${label_chars})" _labels ${_newlabels})
foreach(labname ${_labels})
if (NOT labname STREQUAL "RESET")
list(APPEND mylabels ${labname})
endif()
endforeach()
foreach(_l1 ${mylabels})
- if (_l1 MATCHES "^([0-9]+)([a-zA-Z]+)$")
+ if (_l1 MATCHES "^([0-9]+)(${label_chars})$")
set(_l ${CMAKE_MATCH_2})
set(depth1 ${CMAKE_MATCH_1})
else()
assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url")
assignLabelDepth(1 "unreliable" "inverted")
assignLabelDepth(2 "suspended")
-assignLabelDepth(3 "examples" "manuals" "mathmacros" "templates" "autotests")
+assignLabelDepth(-1 "examples" "manuals" "mathmacros" "templates" "autotests")
loadTestList(suspiciousTests suspiciousTests 7)
loadTestList(ignoredTests ignoredTests 0)
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")
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})
-Dinverted=${inverted}
-DTOP_SRC_DIR=${TOP_SRC_DIR}
-DPERL_EXECUTABLE=${PERL_EXECUTABLE}
+ -DXMLLINT_EXECUTABLE=${XMLLINT_EXECUTABLE}
-P "${TOP_SRC_DIR}/development/autotests/export.cmake")
setmarkedtestlabel(${TestName} ${mytestlabel}) # check for suspended pdf/dvi exports
endif()
projects / lyx.git / blobdiff