X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Fexport.cmake;h=7a954aca6d019214a4c89ba322a0700d1afdd158;hb=cccc027cf13ce0b49fc4d9c1de4aa57ddd8aa5a2;hp=d894282ece1365102f00ea16821316d969629402;hpb=ec32831cb0f99b40a348c4351226022fb0fe3c18;p=lyx.git

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index d894282ece..7a954aca6d 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -7,8 +7,8 @@
 # LYX_ROOT  = ${TOP_SRC_DIR}/lib/{doc,examples,templates}
 # LYX_USERDIR_VER = Name of environment variable for the user directory
 # lyx       =
-# format    = lyx16x|lyx21x|xhtml
-# extension = 16.lyx|21.lyx|xhtml
+# format    = lyx16x|lyx21x|lyx22x|xhtml
+# extension = 16.lyx|21.lyx|22.lyx|xhtml
 # file      = xxx
 #
 # Script should be called like:
@@ -20,26 +20,43 @@
 #       -Dformat=xxx \
 #       -Dfonttype=xxx \
 #       -Dextension=xxx \
+#       -DLYX_FORMAT_NUM=${_lyx_format_num} \
 #       -Dfile=xxx \
 #       -Dinverted=[01] \
-#       -DTOP_SRC_DIR=${TOP_SRC_DIR}
-#       -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
+#       -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")
 set(GetTempDir "${TOP_SRC_DIR}/development/autotests/getTempDir.pl")
 set(_ft ${fonttype})
 execute_process(COMMAND ${PERL_EXECUTABLE} "${GetTempDir}" "${WORKDIR}" OUTPUT_VARIABLE TempDir)
 message(STATUS "using fonttype = ${_ft}")
+if(NOT ENCODING)
+  set(ENCODING "default")
+endif()
+if(ENCODING STREQUAL "default")
+  set(_enc)
+else()
+  set(_enc "_${ENCODING}")
+endif()
 if(format MATCHES "dvi|pdf")
   message(STATUS "LYX_TESTS_USERDIR = ${LYX_TESTS_USERDIR}")
   message(STATUS "Converting with perl ${Perl_Script}")
-  set(LYX_SOURCE "${TempDir}/${file}_${format}_${_ft}.lyx")
+  set(LYX_SOURCE "${TempDir}/${file}_${format}_${_ft}${_enc}.lyx")
   message(STATUS "Using source \"${LYX_ROOT}/${file}.lyx\"")
   message(STATUS "Using dest \"${LYX_SOURCE}\"")
-  execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}" "${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} ${_ft} ${LanguageFile}
+  if(NOT "${ENCODING}" STREQUAL "default")
+    # message(STATUS "ENCODING = ${ENCODING}")
+  endif()
+  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)
   if(NOT _erg)
@@ -49,43 +66,131 @@ if(format MATCHES "dvi|pdf")
 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})
+  if(extension MATCHES "\\.lyx$")
+    # Font-type not relevant for lyx16/lyx21 exports
+    set(result_file_base ${file})
+  else()
+    set(result_file_name ${file}.${extension})
+  endif()
 endif()
 
-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} ${result_file_name}.emergency)
-execute_process(
-  COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
-  RESULT_VARIABLE _err)
-
-#check if result file created
-if (NOT _err)
-  if (NOT EXISTS "${result_file_name}")
-    message(STATUS "Expected result file \"${result_file_name}\" does not exist")
-    set(_err -1)
+function(get_md5sum msource mresult mreserr)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E md5sum ${${msource}}
+    OUTPUT_VARIABLE msource_md5sum_x
+    RESULT_VARIABLE mres_err)
+  if (NOT mres_err)
+    string(REGEX REPLACE " .*" "" msource_md5sum ${msource_md5sum_x})
+    set(${mresult} ${msource_md5sum} PARENT_SCOPE)
+    message(STATUS "MD5SUM of \"${${msource}}\" is ${msource_md5sum}")
   else()
-    message(STATUS "Expected result file \"${result_file_name}\" exists")
+    set(${mresult} "xx" PARENT_SCOPE)
+    message(STATUS "Error getting MD5SUM of \"${${msource}}\"")
   endif()
-endif()
+  set(${mreserr} ${mres_err} PARENT_SCOPE)
+endfunction()
 
-include(${TOP_SRC_DIR}/development/autotests/CheckLoadErrors.cmake)
-# If no error, and extension matches '\.lyx$', try to load the created lyx file
-if (NOT _err)
-  if (result_file_name MATCHES "\\.lyx$")
-    message(STATUS "check load of ${result_file_name}")
-    set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}")
-    set(ENV{LANG} "en") # to get all error-messages in english
+set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}")
+set(ENV{LANG} "en") # 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)
+    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 ${lyx} -batch -userdir "${LYX_TESTS_USERDIR}" ${result_file_name}
+      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}")
+    execute_process(
+      COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
       RESULT_VARIABLE _err
       ERROR_VARIABLE lyxerr)
-    if (NOT _err)
-      CheckLoadErrors(lyxerr "${TOP_SRC_DIR}/development/autotests" _err)
+    if(_err)
+      break()
+    elseif(NOT EXISTS "${result_file_name}")
+      message(STATUS "Expected result file \"${result_file_name}\" does not exist")
+      set(_err -1)
+      break()
+    else()
+      message(STATUS "Expected result file \"${result_file_name}\" exists")
+      checkLoadErrors(lyxerr "${TOP_SRC_DIR}/development/autotests" _err)
+      if(_err)
+        break()
+      endif()
+    endif()
+    get_md5sum(result_file_name result_md5sum _err)
+    if(_err)
+      # Somehow the created file is not readable?
+      break()
     endif()
+    # Check if result file identical to source file
+    if(result_md5sum STREQUAL ${source_md5sum})
+      message(STATUS "Source(${LYX_SOURCE}) and dest(${result_file_name}) are equal")
+      break()
+    endif()
+    set(source_md5sum ${result_md5sum})
+    set(LYX_SOURCE ${result_file_name})
+  endforeach()
+else()
+  if ($ENV{LYX_DEBUG_LATEX})
+    set(LyXExtraParams -dbg latex)
   else()
-    message(STATUS "\"${result_file_name}\" is not a lyx file, do not check load")
+    set(LyXExtraParams)
+  endif()
+  if(IgnoreErrorMessage)
+    foreach (_em ${IgnoreErrorMessage})
+      list(APPEND LyXExtraParams --ignore-error-message ${_em})
+    endforeach()
+  endif()
+  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} ${LyXExtraParams} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
+    RESULT_VARIABLE _err)
+
+  #check if result file created
+  if (NOT _err)
+    if (NOT EXISTS "${result_file_name}")
+      message(STATUS "Expected result file \"${result_file_name}\" does not exist")
+      set(_err -1)
+    else()
+      message(STATUS "Expected result file \"${result_file_name}\" exists")
+      if (format MATCHES "xhtml")
+        if (XMLLINT_EXECUTABLE)
+	  message(STATUS "Calling: ${XMLLINT_EXECUTABLE} --sax --html --valid")
+          # check the created xhtml file
+          execute_process(
+            COMMAND ${XMLLINT_EXECUTABLE} --sax --html --valid  "${result_file_name}"
+            OUTPUT_VARIABLE xmlout
+            ERROR_VARIABLE xmlerr
+            RESULT_VARIABLE _err)
+          file(WRITE "${result_file_name}.sax_out" ${xmlout})
+          if (NOT _err)
+            # check if sax-parser output contains error messages
+	    message(STATUS "Check the output: ${PERL_EXECUTABLE} ${TOP_SRC_DIR}/development/autotests/examineXmllintOutput.pl")
+            execute_process(
+              COMMAND ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/development/autotests/examineXmllintOutput.pl" "${result_file_name}.sax_out"
+              OUTPUT_VARIABLE xmlout
+              RESULT_VARIABLE _err)
+          endif()
+          if (NOT _err)
+            if (NOT "${xmlout}" STREQUAL "")
+              message(STATUS "${xmlout}")
+              set(_err -1)
+            endif()
+          endif()
+        endif()
+      endif()
+    endif()
   endif()
 endif()