From: Kornel Benko <kornel@lyx.org>
Date: Fri, 25 Dec 2015 18:02:06 +0000 (+0100)
Subject: Cmake export tests: Handle some lyx2lyx warnings
X-Git-Tag: 2.2.0beta1~313
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ec32831cb0f99b40a348c4351226022fb0fe3c18;p=features.git

Cmake export tests: Handle some lyx2lyx warnings
---

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 0f2cbf2801..d894282ece 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -45,15 +45,17 @@ if(format MATCHES "dvi|pdf")
   if(NOT _erg)
     message(FATAL_ERROR "Export failed while converting")
   endif()
+  set(result_file_name ${file}_${_ft}.${extension})
 else()
   message(STATUS "Not converting")
   set(LYX_SOURCE "${LYX_ROOT}/${file}.lyx")
+  # Font-type not relevant for lyx16/lyx21 exports
+  set(result_file_name ${file}.${extension})
 endif()
 
-set(result_file_name ${file}_${_ft}.${extension})
 message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${result_file_name} \"${LYX_SOURCE}\"")
 set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}")
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${result_file_name})
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${result_file_name} ${result_file_name}.emergency)
 execute_process(
   COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
   RESULT_VARIABLE _err)
diff --git a/development/autotests/filterCheckWarnings b/development/autotests/filterCheckWarnings
index 55118101f0..4de7fd3d56 100644
--- a/development/autotests/filterCheckWarnings
+++ b/development/autotests/filterCheckWarnings
@@ -1,2 +1,3 @@
 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 aca8d189ba..d7f40723f3 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -24,3 +24,7 @@ export/.*/ja/.*_(pdf[245]|dvi3).*
 # These files are not expected to compile, they use math-macros
 # defined in master 'autotests/mathmacros/masterOfSpace.lyx'
 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]