[LyX/master] Amend 31ad4d6e: DocBook: move tests to inverted instead of ignored.

Kornel Benko kornel at lyx.org
Sat Oct 17 10:34:23 UTC 2020


commit b940a81520e9d26576fabfedf2bc63d71606ea19
Author: Kornel Benko <kornel at lyx.org>
Date:   Sat Oct 17 12:58:30 2020 +0200

    Amend 31ad4d6e: DocBook: move tests to inverted instead of ignored.
    
    Allow inverted tests without explicit language setting in testname
---
 development/autotests/ExportTests.cmake |    6 +-----
 development/autotests/invertedTests     |    8 +++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 26a1267..e8ab4f5 100644
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -169,11 +169,7 @@ macro(maketestname testname inverted listinverted listignored listunreliable lis
     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()
-      set(mfound OFF)
-    endif()
+    findexpr(mfound ${testname} ${listinvertedx} sublabel2)
     if (mfound)
       set(sublabel3 "")
       findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 579fd0c..c44e62e 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -385,11 +385,7 @@ export/doc/ru/Math_(dvi3|pdf[45])_systemF
 # ================================================
 # DocBook
 
-# not expected to successful compile
-check_load/export/docbook/.*
-lyx2lyx/export/docbook/.*
-export/export/docbook/.*(lyx..|dvi.*|pdf.*)
-
+Sublabel: docbook
 # Posters cannot be properly exported, the LyX documents are too far from
 # DocBook expectations (but should have XML-valid output).
 export/export/docbook/A0_Poster_Simple_docbook5
@@ -397,11 +393,13 @@ export/export/docbook/SciPoster_docbook5
 export/examples/Posters/Beamerposter_docbook5
 export/templates/Posters/.*_docbook5
 
+Sublabel: docbook implementation
 # Beamer is not yet implemented.
 export/examples/Presentations/.*_docbook5
 export/templates/.*/Presentations/Beamer_docbook5
 export/templates/Presentations/.*_docbook5
 
+Sublabel: docbook chapter
 # Specific things that are not expected to work.
 # - Uses a book class, but has no chapters (forbidden in DocBook).
 export/export/MissingEndLayoutBetweenTables_docbook5


More information about the lyx-cvs mailing list