commit a9a45344b81397f2a48c48fe7065e2ae77f38617
Author: Kornel Benko <[email protected]>
Date:   Mon Aug 29 18:14:37 2016 +0200

    Cmake build: Add format V2.2 to export tests
---
 development/autotests/ExportTests.cmake |    2 +-
 development/autotests/export.cmake      |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/development/autotests/ExportTests.cmake 
b/development/autotests/ExportTests.cmake
index 562c639..d1d6bfa 100644
--- 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 c89c3f6..09e7ec7 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:
@@ -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

Reply via email to