anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake export tests: Handle some more warnings

Browse Source
This commit is contained in:
Kornel Benko 2015-12-25 20:03:35 +01:00
parent ec32831cb0
commit 968f05d015
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
development/autotests/CheckLoadErrors.cmake
View File

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

1
development/autotests/filterCheckWarnings
View File

@ -1,3 +1,2 @@
Cannot find translation for language Cannot find translation for language
Warning: Lyx2lyx knows nothing about (textclass|module) Warning: Lyx2lyx knows nothing about (textclass|module)
LyX: Done

1
development/autotests/ignoredTests
View File

@ -28,3 +28,4 @@ export/mathmacros/Spacechild[123].*
# These files are subdocuments, they are not expected to behave # 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/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/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]