Cmake export tests: Added sublabel handling also to revertedTests

As an example the inserted label 'chemgreek' shows also
how to reset the sublabels.

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 44d410dd5f8d326dfe227ef681a49ccb13597910..7ab627ed621d40eebbc0e4b8dfd07551feac69d8 100644 (file)
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -69,6 +69,9 @@ macro(findexpr found testname listname rsublabel)
   foreach(_itrx ${${listname}})
     if ("${_itrx}" MATCHES "^Sublabel:[ \t]*\([a-z]+\)[ \t]*$")
       set(sublabel "${CMAKE_MATCH_1}")
+      if (sublabel STREQUAL "RESET")
+        set(sublabel "")
+      endif()
     else()
       set(_itr "^${_itrx}$")
       if (${testname} MATCHES "${_itr}")
@@ -124,7 +127,12 @@ macro(maketestname testname reverted listreverted listignored listunreliable lis
         set(${reverted} 0)
       else()
         set(${reverted} 1)
-        set(${testname} "INVERTED_SEE-README.ctest_${${testname}}")
+        if (NOT sublabel STREQUAL "")
+          string(TOUPPER "${sublabel}_" tmpprefix)
+        else()
+          set(tmpprefix "ctest_")
+        endif()
+        set(${testname} "INVERTED_SEE-README.${tmpprefix}${${testname}}")
         if (NOT sublabel STREQUAL "")
           list(APPEND ${listlabels} ${sublabel})
         endif()

diff --git a/development/autotests/revertedTests b/development/autotests/revertedTests
index 1bb1028451d6ccec39a08f25aa416412c4106db0..bcc4e5e8f20b8c1084bbdf719a1885a09e0aa64d 100644 (file)
--- a/development/autotests/revertedTests
+++ b/development/autotests/revertedTests
@@ -48,7 +48,6 @@ export/templates/RJournal_(dvi3|pdf[45])_systemF
 # Changes in TeX Live 2014 (see git blame for info) fixed IEEEtran-CompSoc
 # pdf4_systemF but not others. TODO Investigate if others can be fixed?
 export/templates/IEEEtran-(Journal|TransMag)_pdf4_systemF
-export/templates/kluwer_pdf4_systemF
 #
 # There is no Chinese LuaTeX or XeTeX TeX font support yet.
 export/.*/zh_CN/.*(pdf[45]|dvi3)_texF
@@ -194,10 +193,12 @@ export/doc/(ru|uk)/splash_(dvi3|pdf[45])_texF
 #
 # GM: chemgreek incompatible with LuaTeX (cf. Math.lyx)
 # for now inverted
+Sublabel: chemgreek
 export/doc/sk/Intro_pdf5_systemF
 export/examples/(|de/|fr/)PDF-comment_pdf5_texF
 export/examples/aas_sample_(dvi3|pdf5)_(texF|systemF)
 export/examples/achemso_(dvi3|pdf5)_texF
+Sublabel: RESET
 #
 # GM: * seminar uses Postscript specials and does not work with PDF (pdflatex).
 #     * Landscape slides do not work with DVI.