commit 90cb7c1492ff95555c0583c521366121e7521d78
Author: Kornel Benko <[email protected]>
Date: Thu Dec 26 10:29:34 2013 +0100
Cmake tests for check load of lyx-files
Do not interpret reconfigure output of lyx as test-error.
diff --git a/development/autotests/check_load.cmake
b/development/autotests/check_load.cmake
index 5311a80..967bb66 100644
--- a/development/autotests/check_load.cmake
+++ b/development/autotests/check_load.cmake
@@ -29,24 +29,42 @@ execute_process(
message(STATUS "Error code of lyx = ${_err}")
string(COMPARE NOTEQUAL ${_err} 0 _erg)
+#
+# Ignore messages between "reconfiguring user directory" and "LyX: Done!"
+# (Reconfigure-messages are not symptom of an error)
if(lyxerr)
+ set(ConfigureOutput 0)
file(STRINGS "${PARAMS_DIR}/filterCheckWarnings" ignoreRegexp)
# Split lyxerr into lines
string(REGEX REPLACE "[\n]+" ";" foundErrors ${lyxerr})
foreach(_l ${foundErrors})
- message(STATUS "Checking line: \"${_l}\"")
- set(found 0)
- foreach(_r ${ignoreRegexp})
- string(REGEX MATCHALL "${_r}" _match ${_l})
+ if(ConfigureOutput)
+ string(REGEX MATCHALL "LyX: Done!" _match ${_l})
+ if(_match)
+ set(ConfigureOutput 0)
+ endif()
+ else()
+ string(REGEX MATCHALL "reconfiguring user directory" _match ${_l})
if(_match)
- set(found 1)
+ set(ConfigureOutput 1)
+ endif()
+ endif()
+ if(NOT ConfigureOutput)
+ set(found 0)
+ foreach(_r ${ignoreRegexp})
+ string(REGEX MATCHALL "${_r}" _match ${_l})
+ if(_match)
+ 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)
break()
endif()
- endforeach()
- if(NOT found)
- # It is error, because the error-line does not match
- # any ignoring expression
- set(_erg 1)
endif()
endforeach()
endif()
diff --git a/development/autotests/filterCheckWarnings
b/development/autotests/filterCheckWarnings
index 66ebd30..5511810 100644
--- a/development/autotests/filterCheckWarnings
+++ b/development/autotests/filterCheckWarnings
@@ -1 +1,2 @@
Cannot find translation for language
+LyX: Done