Cmake build: Add format V2.2 to export tests

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 562c639e15847b7804471fe728a18e00ecf3d6b5..d1d6bfabc8ac8065e77918b891e28720b808eece 100644 (file)
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -315,7 +315,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
   foreach(f ${nolang_lyx_files} ${lang_lyx_files})
     # Strip extension
     string(REGEX REPLACE "\\.lyx$" "" f ${f})
-    foreach(_lyx_format_num 16 21)
+    foreach(_lyx_format_num 16 21 22)
       set(TestName "export/${libsubfolder}/${f}_lyx${_lyx_format_num}")
       set(mytestlabel ${testlabel} "lyx2lyx" "load")
       maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index c89c3f63ff4790bed8d2e8cdb8903a1e81baac09..09e7ec75aa985d8c416d73a63a47839387d8f1aa 100755 (executable)
--- 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:
@@ -141,6 +141,7 @@ 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}"
@@ -150,6 +151,7 @@ else()
           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