X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Fexport.cmake;h=09e7ec75aa985d8c416d73a63a47839387d8f1aa;hb=d1a41a9bdc8da0ee402ecffc89079bcc92e6cf36;hp=0f2cbf28015bf1b1351948b1adc8d6b1177ddca9;hpb=e3cd6db4a789c5df4ba32672fdbd8dac965afb92;p=lyx.git

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 0f2cbf2801..09e7ec75aa 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,14 +20,17 @@
 #       -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}
+#       -DXMLLINT_EXECUTABLE=${XMLLINT_EXECUTABLE}
 #       -P "${TOP_SRC_DIR}/development/autotests/export.cmake"
 #
 
 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})
@@ -45,45 +48,124 @@ 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")
+  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()
 
-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 ${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 ${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} -batch -userdir "${LYX_TESTS_USERDIR}" ${result_file_name}
+      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()
+  message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${result_file_name} \"${LYX_SOURCE}\"")
+  file(REMOVE ${result_file_name})
+  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)
+    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()
-  else()
-    message(STATUS "\"${result_file_name}\" is not a lyx file, do not check load")
   endif()
 endif()