X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2FExportTests.cmake;h=85d0ecce2968249c42a16856a58f633830bb7883;hb=cb3922093016875404aedc6d1fcf2e088944b5c9;hp=562c639e15847b7804471fe728a18e00ecf3d6b5;hpb=416242476289d423eb392345555f3dad941df544;p=lyx.git diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake index 562c639e15..85d0ecce29 100644 --- a/development/autotests/ExportTests.cmake +++ b/development/autotests/ExportTests.cmake @@ -48,7 +48,7 @@ macro(initLangVars varname) endforeach() endmacro() -macro(getoutputformats filepath varname) +macro(getoutputformats filepath varname format_set) file(STRINGS "${filepath}" lines) # What should we test, if default_output_format is not defined? # For now we test everything ... @@ -58,18 +58,21 @@ macro(getoutputformats filepath varname) set(_format ${CMAKE_MATCH_1}) if(_format STREQUAL "default") set(out_formats "xhtml" ${DVI_FORMATS} ${PDF_FORMATS}) - elseif(_format STREQUAL "pdf2" AND "${filepath}" MATCHES "/doc/") - set(out_formats "xhtml" ${DVI_FORMATS} ${PDF_FORMATS}) - elseif(_format MATCHES "pdf$") - set(out_formats "xhtml" ${PDF_FORMATS}) - elseif(_format MATCHES "dvi$") - set(out_formats "xhtml" ${DVI_FORMATS}) - elseif(_format MATCHES "xhtml") - set(out_formats "xhtml") else() - # Respect all other output formats - # like "eps3" - set(out_formats "xhtml" ${_format}) + set(${format_set} ${_format}) + if(_format STREQUAL "pdf2" AND "${filepath}" MATCHES "/doc/") + set(out_formats "xhtml" ${DVI_FORMATS} ${PDF_FORMATS}) + elseif(_format MATCHES "pdf$") + set(out_formats "xhtml" ${PDF_FORMATS}) + elseif(_format MATCHES "dvi$") + set(out_formats "xhtml" ${DVI_FORMATS}) + elseif(_format MATCHES "xhtml") + set(out_formats "xhtml") + else() + # Respect all other output formats + # like "eps3" + set(out_formats "xhtml" ${_format}) + endif() endif() break() endif() @@ -95,9 +98,15 @@ macro(findexpr found testname listname rsublabel) # remove doubles in sublabel list(REMOVE_DUPLICATES tmpsublabel) else() - set(_itr "^${_itrx}$") + if (_itrx MATCHES "^!\(.*\)$") + set(_itr "^${CMAKE_MATCH_1}$") + set(_foundval 0) + else() + set(_itr "^${_itrx}$") + set(_foundval 1) + endif() if (${testname} MATCHES "${_itr}") - set(_found 1) + set(_found ${_foundval}) break() endif() endif() @@ -123,18 +132,18 @@ function(join rvalues glue routput) set(${routput} ${out} PARENT_SCOPE) endfunction() -macro(maketestname testname inverted listsuspicious listignored listunreliable listlabels) +macro(maketestname testname inverted listinverted 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(listsuspiciousx ${listsuspicious}_${_v}) + set(listinvertedx ${listinverted}_${_v}) set(listignoredx ${listignored}_${_v}) set(listunreliablex ${listunreliable}_${_v}) set(listsuspendedx suspendedTests_${_v}) else() - set(listsuspiciousx ${listsuspicious}) + set(listinvertedx ${listinverted}) set(listignoredx ${listignored}) set(listunreliablex ${listunreliable}) set(listsuspendedx suspendedTests) @@ -146,29 +155,28 @@ macro(maketestname testname inverted listsuspicious listignored listunreliable l findexpr(foundunreliable ${testname} ${listunreliablex} sublabel2) if (foundunreliable) set(sublabel "unreliable" ${sublabel} ${sublabel2}) - list(REMOVE_ITEM sublabel "export" "inverted" "templates" "mathmacros" "manuals" "autotests") + list(REMOVE_ITEM sublabel "export" "inverted" "templates" "tabletemplates" "mathmacros" "manuals" "autotests") + endif() + 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 listinverted + set(sublabel2 "") + if (_v) + findexpr(mfound ${testname} ${listinvertedx} sublabel2) else() - 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) - findexpr(mfound ${testname} ${listsuspiciousx} sublabel2) - else() - set(mfound OFF) - endif() - if (mfound) - set(sublabel3 "") - findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3) - set(${inverted} 1) - if (foundsuspended) - set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3}) - list(REMOVE_ITEM sublabel "export" "inverted" ) - else() - set(sublabel "inverted" ${sublabel} ${sublabel2} ${sublabel3}) - endif() + set(mfound OFF) + endif() + if (mfound) + set(sublabel3 "") + findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3) + set(${inverted} 1) + if (foundsuspended) + set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3}) + list(REMOVE_ITEM sublabel "export" "inverted" ) else() - set(${inverted} 0) + set(sublabel "inverted" ${sublabel} ${sublabel2} ${sublabel3}) endif() + else() + set(${inverted} 0) endif() list(REMOVE_DUPLICATES sublabel) if (NOT sublabel STREQUAL "") @@ -187,7 +195,7 @@ macro(maketestname testname inverted listsuspicious listignored listunreliable l endif() endmacro() -macro(loadTestList filename resList depth) +macro(loadTestList filename resList depth splitlangs) # Create list of strings from a file without comments # ENCODING parameter is a new feature in cmake 3.1 initLangVars(${resList}) @@ -219,8 +227,12 @@ macro(loadTestList filename resList depth) list(REMOVE_DUPLICATES mylabels) set(sublabel ${_newl}) else() - string(REGEX REPLACE "(\\/|\\||\\(|\\))" " " _vxx ${_newl}) - string(REGEX MATCHALL " ([a-z][a-z](_[A-Z][A-Z])?) " _vx ${_vxx}) + if (${splitlangs} MATCHES "ON") + string(REGEX REPLACE "(\\/|\\||\\(|\\))" " " _vxx ${_newl}) + string(REGEX MATCHALL " ([a-z][a-z](_[A-Z][A-Z])?) " _vx ${_vxx}) + else() + set(_vx OFF) + endif() if(_vx) foreach(_v ${_vx}) string(REGEX REPLACE " " "" _v ${_v}) @@ -275,14 +287,15 @@ endmacro() assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url") assignLabelDepth(1 "unreliable" "inverted") assignLabelDepth(2 "suspended") -assignLabelDepth(-1 "examples" "manuals" "mathmacros" "templates" "autotests") +assignLabelDepth(-1 "examples" "manuals" "mathmacros" "templates" "tabletemplates" "autotests") -loadTestList(suspiciousTests suspiciousTests 7) -loadTestList(ignoredTests ignoredTests 0) -loadTestList(suspendedTests suspendedTests 6) -loadTestList(unreliableTests unreliableTests 5) +loadTestList(invertedTests invertedTests 7 ON) +loadTestList(ignoredTests ignoredTests 0 ON) +loadTestList(suspendedTests suspendedTests 6 ON) +loadTestList(unreliableTests unreliableTests 5 ON) +loadTestList(ignoreLatexErrorsTests ignoreLatexErrorsTests 8 OFF) -foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autotests/mathmacros) +foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates lib/tabletemplates autotests/mathmacros) set(testlabel "export") if (libsubfolderx MATCHES "lib/doc") list(APPEND testlabel "manuals") @@ -290,6 +303,8 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote list(APPEND testlabel "examples") elseif (libsubfolderx MATCHES "lib/templates") list(APPEND testlabel "templates") + elseif (libsubfolderx MATCHES "lib/tabletemplates") + list(APPEND testlabel "tabletemplates") elseif (libsubfolderx MATCHES "autotests/mathmacros") list(APPEND testlabel "mathmacros") elseif (libsubfolderx MATCHES "autotests/.+") @@ -305,20 +320,25 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote set(lang_lyx_files) set(nolang_lyx_files) foreach(f ${lyx_files}) - string(REGEX MATCHALL "^[a-z][a-z](_[A-Z][A-Z])?\\/" _v ${f}) - if(_v) - list(APPEND lang_lyx_files ${f}) + if (${f} MATCHES "#") + # Do nothing, probably wrong temporary file else() - list(APPEND nolang_lyx_files ${f}) + string(REGEX MATCHALL "^[a-z][a-z](_[A-Z][A-Z])?\\/" _v ${f}) + if(_v) + list(APPEND lang_lyx_files ${f}) + else() + list(APPEND nolang_lyx_files ${f}) + endif() endif() endforeach() foreach(f ${nolang_lyx_files} ${lang_lyx_files}) # Strip extension string(REGEX REPLACE "\\.lyx$" "" f ${f}) - foreach(_lyx_format_num 16 21) - set(TestName "export/${libsubfolder}/${f}_lyx${_lyx_format_num}") + foreach(_lyx_format_num 16 20 21 22 23) + set(TestName1 "export/${libsubfolder}/${f}_lyx${_lyx_format_num}") + string(REGEX REPLACE "[\\(\\)]" "_" TestName "${TestName1}") set(mytestlabel ${testlabel} "lyx2lyx" "load") - maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel) + maketestname(TestName inverted invertedTests ignoredTests unreliableTests mytestlabel) if(TestName) add_test(NAME ${TestName} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" @@ -342,8 +362,9 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote set(lyx2lyxtestlabel "lyx2lyx") # For use of lyx2lyx we need the python executable set(mytestlabel ${lyx2lyxtestlabel}) - set(TestName "lyx2lyx/${libsubfolder}/${f}") - maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel) + set(TestName1 "lyx2lyx/${libsubfolder}/${f}") + string(REGEX REPLACE "[\\(\\)]" "_" TestName "${TestName1}") + maketestname(TestName inverted invertedTests ignoredTests unreliableTests mytestlabel) if(TestName) add_test(NAME ${TestName} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" @@ -358,8 +379,9 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote endif() set(loadtestlabel "load") set(mytestlabel ${loadtestlabel}) - set(TestName "check_load/${libsubfolder}/${f}") - maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel) + set(TestName1 "check_load/${libsubfolder}/${f}") + string(REGEX REPLACE "[\\(\\)]" "_" TestName "${TestName1}") + maketestname(TestName inverted invertedTests ignoredTests unreliableTests mytestlabel) if(TestName) add_test(NAME ${TestName} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" @@ -373,7 +395,8 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote setmarkedtestlabel(${TestName} ${mytestlabel}) #set_tests_properties(${TestName} PROPERTIES RUN_SERIAL ON) endif() - getoutputformats("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist) + set(default_output_format) + getoutputformats("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist default_output_format) foreach(format ${formatlist}) if(format MATCHES "dvi3|pdf4|pdf5") set(fonttypes "texF" "systemF") @@ -381,31 +404,75 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote set(fonttypes "defaultF") endif() foreach(fonttype ${fonttypes}) - if(fonttype MATCHES "defaultF") - set(TestName "export/${libsubfolder}/${f}_${format}") + if (format MATCHES "pdf2" AND f MATCHES "latex/unicodesymbols") + #message(STATUS "Test ${TestName} matches Unicode encodings") + # test_encodings does not include "default", since it should be covered + # by one of the supplied encodings + set(test_encodings "ascii" "utf8" "utf8x" "armscii8" "applemac" + "cp437" "cp437de" "cp850" "cp852" + "cp855" "cp862" "cp865" + "cp866" "cp1250" "cp1251" "cp1252" + "cp1255" "cp1256" "cp1257" + "koi8-r" "koi8-u" + "iso8859-1" "iso8859-2" "iso8859-3" + "iso8859-4" "iso8859-5" "iso8859-6" + "iso8859-7" "iso8859-8" "iso8859-9" + "iso8859-13" "iso8859-15" "iso8859-16" + "pt154" "big5" "shift-jis" + "euc-cn" "gbk" "jis" "euc-kr" + "utf8-cjk" "euc-tw" "euc-jp" + "euc-jp-platex" "jis-platex" + "shift-jis-platex" "utf8-platex" + "tis620-0") else() - set(TestName "export/${libsubfolder}/${f}_${format}_${fonttype}") - endif() - 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=$ - -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME} - -Dformat=${format} - -Dfonttype=${fonttype} - -Dextension=${format} - -Dfile=${f} - -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 + set(test_encodings "default") endif() + foreach (_enc2 ${test_encodings}) + if ("${_enc2}" STREQUAL "default") + set(_enc "") + else() + set(_enc "_${_enc2}") + endif() + if(fonttype MATCHES "defaultF") + set(TestName1 "export/${libsubfolder}/${f}${_enc}_${format}") + else() + set(TestName1 "export/${libsubfolder}/${f}${_enc}_${format}_${fonttype}") + endif() + if (format MATCHES "^${default_output_format}$") + set(extraLabels "defaultoutput") + else() + set(extraLabels ) + endif() + set(missingLabels ) + findexpr(mfound TestName ignoreLatexErrorsTests missingLabels) + if (mfound) + set(mytestlabel ${testlabel} "ignoring" ${missingLabels} ${extraLabels}) + else() + set(mytestlabel ${testlabel} ${extraLabels}) + endif() + string(REGEX REPLACE "[\\(\\)]" "_" TestName "${TestName1}") + maketestname(TestName inverted invertedTests 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=$ + -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME} + -Dformat=${format} + -Dfonttype=${fonttype} + -Dextension=${format} + -Dfile=${f} + -Dinverted=${inverted} + -DTOP_SRC_DIR=${TOP_SRC_DIR} + "-DIgnoreErrorMessage=${missingLabels}" + -DPERL_EXECUTABLE=${PERL_EXECUTABLE} + -DXMLLINT_EXECUTABLE=${XMLLINT_EXECUTABLE} + -DENCODING=${_enc2} + -P "${TOP_SRC_DIR}/development/autotests/export.cmake") + setmarkedtestlabel(${TestName} ${mytestlabel}) # check for suspended pdf/dvi exports + endif() + endforeach() endforeach() endforeach() endforeach()