Amend 683b3a05: Introducing table templates

Added test cases
This commit is contained in:
Kornel Benko 2019-03-26 15:27:39 +01:00
parent bc02061596
commit f6f9de1cd8
2 changed files with 7 additions and 5 deletions

View File

@ -155,7 +155,7 @@ macro(maketestname testname inverted listinverted listignored listunreliable lis
findexpr(foundunreliable ${testname} ${listunreliablex} sublabel2) findexpr(foundunreliable ${testname} ${listunreliablex} sublabel2)
if (foundunreliable) if (foundunreliable)
set(sublabel "unreliable" ${sublabel} ${sublabel2}) 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() endif()
string(REGEX MATCH "(^check_load|_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx[0-9][0-9]|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 listinverted # check if test _may_ be in listinverted
@ -287,7 +287,7 @@ endmacro()
assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url") assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url")
assignLabelDepth(1 "unreliable" "inverted") assignLabelDepth(1 "unreliable" "inverted")
assignLabelDepth(2 "suspended") assignLabelDepth(2 "suspended")
assignLabelDepth(-1 "examples" "manuals" "mathmacros" "templates" "autotests") assignLabelDepth(-1 "examples" "manuals" "mathmacros" "templates" "tabletemplates" "autotests")
loadTestList(invertedTests invertedTests 7 ON) loadTestList(invertedTests invertedTests 7 ON)
loadTestList(ignoredTests ignoredTests 0 ON) loadTestList(ignoredTests ignoredTests 0 ON)
@ -295,7 +295,7 @@ loadTestList(suspendedTests suspendedTests 6 ON)
loadTestList(unreliableTests unreliableTests 5 ON) loadTestList(unreliableTests unreliableTests 5 ON)
loadTestList(ignoreLatexErrorsTests ignoreLatexErrorsTests 8 OFF) 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") set(testlabel "export")
if (libsubfolderx MATCHES "lib/doc") if (libsubfolderx MATCHES "lib/doc")
list(APPEND testlabel "manuals") list(APPEND testlabel "manuals")
@ -303,6 +303,8 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
list(APPEND testlabel "examples") list(APPEND testlabel "examples")
elseif (libsubfolderx MATCHES "lib/templates") elseif (libsubfolderx MATCHES "lib/templates")
list(APPEND testlabel "templates") list(APPEND testlabel "templates")
elseif (libsubfolderx MATCHES "lib/tabletemplates")
list(APPEND testlabel "tabletemplates")
elseif (libsubfolderx MATCHES "autotests/mathmacros") elseif (libsubfolderx MATCHES "autotests/mathmacros")
list(APPEND testlabel "mathmacros") list(APPEND testlabel "mathmacros")
elseif (libsubfolderx MATCHES "autotests/.+") elseif (libsubfolderx MATCHES "autotests/.+")

View File

@ -4,7 +4,7 @@
# Copyright (c) 2012 Kornel Benko kornel@lyx.org # Copyright (c) 2012 Kornel Benko kornel@lyx.org
# #
# #
# LYX_ROOT = ${TOP_SRC_DIR}/lib/{doc,examples,templates} # LYX_ROOT = ${TOP_SRC_DIR}/lib/{doc,examples,templates,tabletemplates}
# LYX_USERDIR_VER = Name of environment variable for the user directory # LYX_USERDIR_VER = Name of environment variable for the user directory
# lyx = # lyx =
# format = lyx16x|lyx20x|lyx21x|lyx22x|xhtml # format = lyx16x|lyx20x|lyx21x|lyx22x|xhtml
@ -254,7 +254,7 @@ if(inverted)
else() else()
string(COMPARE NOTEQUAL ${_err} 0 _erg) string(COMPARE NOTEQUAL ${_err} 0 _erg)
endif() endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}") #execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}")
if(_TestResultMessage) if(_TestResultMessage)
message(STATUS "Msg Summary:") message(STATUS "Msg Summary:")
foreach(_l ${_TestResultMessage}) foreach(_l ${_TestResultMessage})