FindAdv: next 3 tests working

[lyx.git] / development / autotests / ExportTests.cmake

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 0a94e16dbb37a2f0852795ce62f656ea0ffb91ff..febac166422fb1a2f0c7f504f423641e74a7878c 100644 (file)
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -53,7 +53,7 @@ macro(getoutputformats filepath varname format_set)
   # What should we test, if default_output_format is not defined?
   # For now we test everything ...
   set(out_formats "xhtml" ${DVI_FORMATS} ${PDF_FORMATS})
-  foreach(_l ${lines})
+  foreach(_l IN LISTS lines)
     if(_l MATCHES "^\\\\default_output_format +\([^ ]+\)")
       set(_format ${CMAKE_MATCH_1})
       if(_format STREQUAL "default")
@@ -98,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()
@@ -149,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
@@ -281,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)
@@ -289,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")
@@ -297,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/.+")
@@ -326,8 +334,9 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
   foreach(f ${nolang_lyx_files} ${lang_lyx_files})
     # Strip extension
     string(REGEX REPLACE "\\.lyx$" "" f ${f})
-    foreach(_lyx_format_num 16 21 22)
-      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 invertedTests ignoredTests unreliableTests mytestlabel)
       if(TestName)
@@ -353,7 +362,8 @@ 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}")
+      set(TestName1 "lyx2lyx/${libsubfolder}/${f}")
+      string(REGEX REPLACE "[\\(\\)]" "_" TestName "${TestName1}")
       maketestname(TestName inverted invertedTests ignoredTests unreliableTests mytestlabel)
       if(TestName)
         add_test(NAME ${TestName}
@@ -369,7 +379,8 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
     endif()
     set(loadtestlabel "load")
     set(mytestlabel ${loadtestlabel})
-    set(TestName "check_load/${libsubfolder}/${f}")
+    set(TestName1 "check_load/${libsubfolder}/${f}")
+    string(REGEX REPLACE "[\\(\\)]" "_" TestName "${TestName1}")
     maketestname(TestName inverted invertedTests ignoredTests unreliableTests mytestlabel)
     if(TestName)
       add_test(NAME ${TestName}
@@ -423,9 +434,9 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
             set(_enc "_${_enc2}")
           endif()
           if(fonttype MATCHES "defaultF")
-            set(TestName "export/${libsubfolder}/${f}${_enc}_${format}")
+            set(TestName1 "export/${libsubfolder}/${f}${_enc}_${format}")
           else()
-            set(TestName "export/${libsubfolder}/${f}${_enc}_${format}_${fonttype}")
+            set(TestName1 "export/${libsubfolder}/${f}${_enc}_${format}_${fonttype}")
           endif()
           if (format MATCHES "^${default_output_format}$")
             set(extraLabels "defaultoutput")
@@ -439,6 +450,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
           else()
             set(mytestlabel ${testlabel} ${extraLabels})
           endif()
+          string(REGEX REPLACE "[\\(\\)]" "_" TestName "${TestName1}")
           maketestname(TestName inverted invertedTests ignoredTests unreliableTests mytestlabel)
           if(TestName)
             add_test(NAME ${TestName}