Cmake export tests: Handle some more warnings

diff --git a/development/autotests/CheckLoadErrors.cmake b/development/autotests/CheckLoadErrors.cmake
index b7d37fc256f77e2565bc41988562a4e8f8885d8e..d97156b1ad9f7cf62443886a729cde0e313369e6 100644 (file)
--- a/development/autotests/CheckLoadErrors.cmake
+++ b/development/autotests/CheckLoadErrors.cmake
@@ -4,6 +4,7 @@ macro(CheckLoadErrors lyxerrx PARAMS_DIR res_erg)
   set(_erg 0)
   if(lyxerr)
     set(ConfigureOutput 0)
+    set(DocumentClassNotAvailable 0)
     file(STRINGS "${PARAMS_DIR}/filterCheckWarnings" ignoreRegexp)
     # Split lyxerr into lines
     string(REGEX REPLACE "[\n]+" ";" foundErrors ${lyxerr})
@@ -12,24 +13,31 @@ macro(CheckLoadErrors lyxerrx PARAMS_DIR res_erg)
         if(_l MATCHES "LyX: Done!")
           set(ConfigureOutput 0)
         endif()
+      elseif(DocumentClassNotAvailable)
+       if(_l MATCHES "User's Guide for more information.")
+         set(DocumentClassNotAvailable 0)
+       endif()
       else()
         if(_l MATCHES "reconfiguring user directory")
           set(ConfigureOutput 1)
-        endif()
-      endif()
-      if(NOT ConfigureOutput)
-        set(found 0)
-        foreach(_r ${ignoreRegexp})
-          if(_l MATCHES "${_r}")
-            set(found 1)
-            break()
-          endif()
-        endforeach()
-        if(NOT found)
-          message(STATUS "Error line = ${_l}")
-          # It is error, because the error-line does not match
-          # any ignoring expression
-          set(_erg 1)
+       elseif(_l MATCHES "Warning: Document class not available")
+         set(DocumentClassNotAvailable 1)
+       else()
+         # here neither ConfigureOutput nor DocumentClassNotAvailable is set
+         # so we can scan for other warnings/errors
+         set(found 0)
+         foreach(_r ${ignoreRegexp})
+           if(_l MATCHES "${_r}")
+             set(found 1)
+             break()
+           endif()
+         endforeach()
+         if(NOT found)
+           message(STATUS "Error line = ${_l}")
+           # It is error, because the error-line does not match
+           # any ignoring expression
+           set(_erg 1)
+         endif()
         endif()
       endif()
     endforeach()

diff --git a/development/autotests/filterCheckWarnings b/development/autotests/filterCheckWarnings
index 4de7fd3d56f9798da7e08a77e45c133f25967e8d..38c596bc1721f5fa2703a0dfc5978e4fe1604266 100644 (file)
--- a/development/autotests/filterCheckWarnings
+++ b/development/autotests/filterCheckWarnings
@@ -1,3 +1,2 @@
 Cannot find translation for language
 Warning: Lyx2lyx knows nothing about (textclass|module) 
-LyX: Done

diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index d7f40723f353d1ca7ff8cf87b4bbf5320a618313..1311bdc6b356de5e9cfc4ea3380462c131f15a2c 100644 (file)
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -28,3 +28,4 @@ export/mathmacros/Spacechild[123].*
 # These files are subdocuments, they are not expected to behave
 export/examples/springer/svmono_(acknow|acronym|appendix|chapter|dedication|foreword|glossary|part|preface|referenc|solutions)_lyx[0-9][0-9]
 export/examples/springer/svmult_(acknow|acronym|appendix|cblist|dedication|foreword|glossary|part|preface|referenc)_lyx[0-9][0-9]
+export/examples/thesis/(Acknowledgments|Appendix|Summary|chapter-[12])_lyx[0-9][0-9]