ctests: invert 'wontfix' failing lyx2lyx tests

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

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 0f448bff8ddcbb09c6d9eb45b735e3a4d78a14da..55ca7a7102ab69a05663d1e9e7f8f68a32b52c7a 100755 (executable)
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -4,11 +4,11 @@
 # Copyright (c) 2012 Kornel Benko kornel@lyx.org
 #
 #
-# LYX_ROOT  = ${TOP_SRC_DIR}/lib/{doc,examples,templates}
+# LYX_ROOT  = ${TOP_SRC_DIR}/lib/{doc,examples,templates,tabletemplates}
 # LYX_USERDIR_VER = Name of environment variable for the user directory
 # lyx       =
-# format    = lyx16x|lyx20x|lyx21x|lyx22x|xhtml
-# extension = 16.lyx|20.lyx|21.lyx|22.lyx|xhtml
+# format    = lyx16x|lyx20x|lyx21x|lyx22x|xhtml|docbook5
+# extension = 16.lyx|20.lyx|21.lyx|22.lyx|xhtml|xml
 # file      = xxx
 #
 # Script should be called like:
@@ -48,6 +48,15 @@ if(ENCODING STREQUAL "default")
 else()
   set(_enc "_${ENCODING}")
 endif()
+
+# move the the last directory part of LYX_ROOT to filename
+# to make the destination unique for otherwise identical
+# filenames
+get_filename_component(updir_ "${LYX_ROOT}" DIRECTORY)
+get_filename_component(updir2_ "${LYX_ROOT}" NAME)
+set(file "${updir2_}/${file}")
+set(LYX_ROOT "${updir_}")
+
 if(format MATCHES "dvi|pdf")
   message(STATUS "LYX_TESTS_USERDIR = ${LYX_TESTS_USERDIR}")
   message(STATUS "Converting with perl ${Perl_Script}")
@@ -167,6 +176,9 @@ if (extension MATCHES "\\.lyx$")
         # files with relative path
         message(STATUS "Not exporting due to missing \\origin statement")
         break()
+      elseif(format MATCHES "lyx22x" AND file MATCHES "Minted")
+        message(STATUS "Not exporting due to missing minted support")
+        break()
       endif()
       message(STATUS "Source(${LYX_SOURCE}) and dest(${result_file_name}) are equal")
       message(STATUS "Now try to export the lyx2lyx created file")
@@ -194,7 +206,7 @@ else()
   if ($ENV{LYX_DEBUG_LATEX})
     set(LyXExtraParams -dbg latex)
   else()
-    set(LyXExtraParams)
+    set(LyXExtraParams -dbg info)
   endif()
   if(IgnoreErrorMessage)
     foreach (_em ${IgnoreErrorMessage})
@@ -216,12 +228,32 @@ else()
       Summary(_err "Expected result file \"${result_file_name}\" does not exists")
     else()
       message(STATUS "Expected result file \"${result_file_name}\" exists")
-      if (format MATCHES "xhtml")
+      if (extension MATCHES "^x(ht)?ml$")
+       if (format MATCHES "xhtml")
+         set(xmllint_params --sax --html --valid)
+         set(executable_ ${XMLLINT_EXECUTABLE})
+       else()
+         set(xmllint_params)
+         set(executable_ ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/development/autotests/filterXml4Sax.pl")
+         # Check with perl xml-parser
+         # needs XML::Parser module
+         message(STATUS "Calling ${PERL_EXECUTABLE} \"${TOP_SRC_DIR}/development/autotests/xmlParser.pl\" \"${result_file_name}\"")
+         execute_process(
+           COMMAND ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/development/autotests/xmlParser.pl" "${result_file_name}"
+           OUTPUT_VARIABLE parserout
+           ERROR_VARIABLE parsererr
+           RESULT_VARIABLE _err
+         )
+         if (_err)
+           message(STATUS "${parsererr}")
+         endif()
+         Summary(_err "Checking \"${result_file_name}\" with xmlParser.pl")
+       endif()
         if (XMLLINT_EXECUTABLE)
-          message(STATUS "Calling: ${XMLLINT_EXECUTABLE} --sax --html --valid")
+          message(STATUS "Calling: " ${executable_} ${xmllint_params} " ${result_file_name}")
           # check the created xhtml file
           execute_process(
-            COMMAND ${XMLLINT_EXECUTABLE} --sax --html --valid  "${result_file_name}"
+            COMMAND ${executable_} ${xmllint_params}  "${result_file_name}"
             OUTPUT_VARIABLE xmlout
             ERROR_VARIABLE xmlerr
             RESULT_VARIABLE _err)