Uninvert some cyrillic and greek tests

[lyx.git] / development / autotests / export.cmake

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 08fd86e30bbdf7a41edc822795f7369a6def216b..43866605970c20f761c402fdda5017e82a45d23f 100755 (executable)
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -24,12 +24,14 @@
 #       -Dfile=xxx \
 #       -Dinverted=[01] \
 #       -DTOP_SRC_DIR=${TOP_SRC_DIR} \
+#       -DIgnoreErrorMessage=(ON/OFF) \
 #       -DPERL_EXECUTABLE=${PERL_EXECUTABLE} \
 #       -DXMLLINT_EXECUTABLE=${XMLLINT_EXECUTABLE} \
 #       -DENCODING=xxx \
 #       -P "${TOP_SRC_DIR}/development/autotests/export.cmake"
 #
 
+message(STATUS "IgnoreErrorMessage = \"${IgnoreErrorMessage}\"")
 set(Perl_Script "${TOP_SRC_DIR}/development/autotests/useSystemFonts.pl")
 set(Structure_Script "${TOP_SRC_DIR}/development/autotests/beginEndStructureCheck.pl")
 set(LanguageFile "${TOP_SRC_DIR}/lib/languages")
@@ -54,6 +56,7 @@ if(format MATCHES "dvi|pdf")
   if(NOT "${ENCODING}" STREQUAL "default")
     # message(STATUS "ENCODING = ${ENCODING}")
   endif()
+  message(STATUS "Executing ${PERL_EXECUTABLE} \"${Perl_Script}\" \"${LYX_ROOT}/${file}.lyx\" \"${LYX_SOURCE}\" ${format} ${_ft} ${ENCODING} ${LanguageFile}")
   execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}" "${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} ${_ft} ${ENCODING} ${LanguageFile}
     RESULT_VARIABLE _err)
   string(COMPARE EQUAL  ${_err} 0 _erg)
@@ -89,21 +92,14 @@ function(get_md5sum msource mresult mreserr)
 endfunction()
 
 set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}")
-set(ENV{LANG} "en") # to get all error-messages in english
-set(ENV{LC_ALL} "C")
+set(ENV{LANG} "en_US.UTF-8") # to get all error-messages in english
+#set(ENV{LC_ALL} "C")
 if (extension MATCHES "\\.lyx$")
   include(${TOP_SRC_DIR}/development/autotests/CheckLoadErrors.cmake)
   get_md5sum(LYX_SOURCE source_md5sum _err)
-  foreach(_lv RANGE 1 5)
+  foreach(_lv RANGE 1 20)
     set(result_file_base "${result_file_base}.${LYX_FORMAT_NUM}")
     set(result_file_name "${result_file_base}.lyx")
-    message(STATUS "check structures of ${LYX_SOURCE}")
-    execute_process(
-      COMMAND ${PERL_EXECUTABLE} ${Structure_Script} "${WORKDIR}/${result_file_name}"
-      RESULT_VARIABLE _err)
-    if(_err)
-      break()
-    endif()
     file(REMOVE "${result_file_name}" "${result_file_name}.emergency" )
     message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${result_file_name} \"${LYX_SOURCE}\"")
     message(STATUS "This implicitly checks load of ${LYX_SOURCE}")
@@ -119,6 +115,12 @@ if (extension MATCHES "\\.lyx$")
       break()
     else()
       message(STATUS "Expected result file \"${result_file_name}\" exists")
+      execute_process(
+        COMMAND ${PERL_EXECUTABLE} ${Structure_Script} "${WORKDIR}/${result_file_name}"
+        RESULT_VARIABLE _err)
+      if(_err)
+        break()
+      endif()
       checkLoadErrors(lyxerr "${TOP_SRC_DIR}/development/autotests" _err)
       if(_err)
         break()
@@ -131,22 +133,47 @@ if (extension MATCHES "\\.lyx$")
     endif()
     # Check if result file identical to source file
     if(result_md5sum STREQUAL ${source_md5sum})
+      if (format MATCHES "lyx(1[0-9]|2[01])x")
+        # Do not compile, missing \origin statement prevents inclusion of
+        # files with relative path
+        message(STATUS "Not exporting due to missing \\origin statement")
+        break()
+      endif()
       message(STATUS "Source(${LYX_SOURCE}) and dest(${result_file_name}) are equal")
+      message(STATUS "Now try to export the lyx2lyx created file")
+      message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E default \"${result_file_name}.default\" \"${result_file_name}\"")
+      execute_process(
+        COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E default "${result_file_name}.default" "${result_file_name}"
+        RESULT_VARIABLE _err
+        ERROR_VARIABLE lyxerr)
       break()
+    else()
+      message(STATUS "Source(${LYX_SOURCE}) and dest(${result_file_name}) are still different")
+      if (_lv GREATER 10)
+       set(_err 1)
+       message(STATUS "Possible endless loop encountered")
+       break()
+      endif()
     endif()
     set(source_md5sum ${result_md5sum})
     set(LYX_SOURCE ${result_file_name})
   endforeach()
 else()
   if ($ENV{LYX_DEBUG_LATEX})
-    set(LatexDebugParam -dbg latex)
+    set(LyXExtraParams -dbg latex)
   else()
-    set(LatexDebugParam)
+    set(LyXExtraParams)
+  endif()
+  if(IgnoreErrorMessage)
+    foreach (_em ${IgnoreErrorMessage})
+      list(APPEND LyXExtraParams --ignore-error-message ${_em})
+    endforeach()
   endif()
-  message(STATUS "Executing ${lyx} ${LatexDebugParam} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${result_file_name} \"${LYX_SOURCE}\"")
+  string(REGEX REPLACE ";" " " _LyXExtraParams "${LyXExtraParams}")
+  message(STATUS "Executing ${lyx} ${_LyXExtraParams} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${result_file_name} \"${LYX_SOURCE}\"")
   file(REMOVE ${result_file_name})
   execute_process(
-    COMMAND ${lyx} ${LatexDebugParam} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
+    COMMAND ${lyx} ${LyXExtraParams} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
     RESULT_VARIABLE _err)
 
   #check if result file created