From: Kornel Benko <kornel@lyx.org>
Date: Sat, 10 Oct 2020 10:43:17 +0000 (+0200)
Subject: Cmake docbook tests: Add jing.jar to test created docbook files
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~105
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=667c0647a564a18360f40299a2a1ddc0da0d2043;p=features.git

Cmake docbook tests: Add jing.jar to test created docbook files

Usefull only if tested with data from repository.
This means: The file 'jing.jar' is not part of the distribution.
---

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 86604a6675..26a1267f9e 100644
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -28,6 +28,13 @@
 
 find_package(Perl)
 find_program(XMLLINT_EXECUTABLE xmllint)
+find_program(JAVA_EXECUTABLE java)
+set(jingjava)
+if (JAVA_EXECUTABLE)
+  if (EXISTS "${TOP_SRC_DIR}/development/tools/jing.jar")
+    set(jingjava ${JAVA_EXECUTABLE})
+  endif()
+endif()
 
 if(PERL_FOUND)
   set(DVI_FORMATS "dvi" "dvi3")
@@ -475,6 +482,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates lib/ta
               "-DIgnoreErrorMessage=${missingLabels}"
               -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
               -DXMLLINT_EXECUTABLE=${XMLLINT_EXECUTABLE}
+              -DJAVA_EXECUTABLE=${jingjava}
               -DENCODING=${_enc2}
               -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
             setmarkedtestlabel(${TestName} ${mytestlabel}) # check for suspended pdf/dvi exports
diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 4c77f06bb4..75541799d2 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -27,6 +27,7 @@
 #       -DIgnoreErrorMessage=(ON/OFF) \
 #       -DPERL_EXECUTABLE=${PERL_EXECUTABLE} \
 #       -DXMLLINT_EXECUTABLE=${XMLLINT_EXECUTABLE} \
+#       -DJAVA_EXECUTABLE=${JAVA_EXECUTABLE} \
 #       -DENCODING=xxx \
 #       -P "${TOP_SRC_DIR}/development/autotests/export.cmake"
 #
@@ -279,6 +280,16 @@ else()
             endif()
           endif()
         endif()
+	if (NOT _err AND JAVA_EXECUTABLE)
+	  # check with jing
+	  message(STATUS "Calling: ${JAVA_EXECUTABLE} -jar \"${TOP_SRC_DIR}/development/tools/jing.jar\" https://docbook.org/xml/5.0.1/rng/docbook.rng \"${WORKDIR}/${result_file_name}\"")
+	  execute_process(
+	    COMMAND ${JAVA_EXECUTABLE} -jar "${TOP_SRC_DIR}/development/tools/jing.jar" "https://docbook.org/xml/5.2b09/rng/docbook.rng" "${WORKDIR}/${result_file_name}"
+	    OUTPUT_VARIABLE jingout
+	    RESULT_VARIABLE _err)
+	  message(STATUS "_err = ${_err}, jingout = ${jingout}")
+	  Summary(_err "CHecking for empty output of ${JAVA_EXECUTABLE} -jar \"${TOP_SRC_DIR}/development/tools/jing.jar\"")
+	endif()
       endif()
     endif()
   endif()
diff --git a/development/tools/jing.jar b/development/tools/jing.jar
new file mode 100644
index 0000000000..dd47facd45
Binary files /dev/null and b/development/tools/jing.jar differ