From f6f9de1cd81c6d5c4778e7dd078a5ffd785b294c Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Tue, 26 Mar 2019 15:27:39 +0100 Subject: [PATCH] Amend 683b3a05: Introducing table templates Added test cases --- development/autotests/ExportTests.cmake | 8 +++++--- development/autotests/export.cmake | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake index b913e3c922..85d0ecce29 100644 --- a/development/autotests/ExportTests.cmake +++ b/development/autotests/ExportTests.cmake @@ -155,7 +155,7 @@ macro(maketestname testname inverted listinverted listignored listunreliable lis 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 @@ -287,7 +287,7 @@ 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(invertedTests invertedTests 7 ON) loadTestList(ignoredTests ignoredTests 0 ON) @@ -295,7 +295,7 @@ 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") @@ -303,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/.+") diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake index 0f448bff8d..84857cd26f 100755 --- a/development/autotests/export.cmake +++ b/development/autotests/export.cmake @@ -4,7 +4,7 @@ # 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 = # format = lyx16x|lyx20x|lyx21x|lyx22x|xhtml @@ -254,7 +254,7 @@ if(inverted) else() string(COMPARE NOTEQUAL ${_err} 0 _erg) endif() -execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}") +#execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}") if(_TestResultMessage) message(STATUS "Msg Summary:") foreach(_l ${_TestResultMessage}) -- 2.39.2