From 968f05d0154bba359bc465fa51ea833b50233155 Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Fri, 25 Dec 2015 20:03:35 +0100
Subject: [PATCH] Cmake export tests: Handle some more warnings

---
 development/autotests/CheckLoadErrors.cmake | 38 +++++++++++++--------
 development/autotests/filterCheckWarnings   |  1 -
 development/autotests/ignoredTests          |  1 +
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/development/autotests/CheckLoadErrors.cmake b/development/autotests/CheckLoadErrors.cmake
index b7d37fc256..d97156b1ad 100644
--- 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 4de7fd3d56..38c596bc17 100644
--- 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 d7f40723f3..1311bdc6b3 100644
--- 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]
-- 
2.39.2