Fix version checking

Author: hannes-steffenhagen-diffblue

regression/validate-trace-xml-schema/CMakeLists.txt

@@ -1,7 +1,9 @@
 # The Schema tests require a JDK because we use the
 # Java standard libraries builtin schema validation functionality
 find_package(Java COMPONENTS Development)
-if(${Java_FOUND} AND ${Java_VERSION_MAJOR} VERSION_GREATER 8)
+find_package(Python3 COMPONENTS Interpreter)
+if(${Python3_FOUND} AND ${Python3_VERSION} VERSION_GREATER 3.5
+  AND ${Java_FOUND} AND ${Java_VERSION_MAJOR} VERSION_GREATER 8)
     add_test(NAME validate-trace-xml-schema
             COMMAND python3 check.py $<TARGET_FILE:cbmc>
             WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
@@ -10,4 +12,4 @@ if(${Java_FOUND} AND ${Java_VERSION_MAJOR} VERSION_GREATER 8)
             LABELS "CBMC;CORE")
 else()
     message(WARNING "JDK not found, skipping trace schema tests")
-endif()
+endif()

regression/validate-trace-xml-schema/check.sh

@@ -1,6 +1,29 @@
-if command -v javac && command -v python3
-then
-  python3 check.py ../../src/cbmc/cbmc
-else
-  echo "javac or python3 not found, skipping XSD tests"
+if ! command -v python3 > /dev/null; then
+    echo "python3 not found, skipping XSD tests"
+    exit
 fi
+
+python_minor_version=$(python3 --version | cut -d ' ' -f 2 | cut -d '.' -f 2)
+
+if [ $python_minor_version -lt 5 ]; then
+    echo "python version less than 3.5, skipping XSD tests"
+    exit
+fi
+
+if ! command -v javac > /dev/null; then
+    echo "javac not found, skipping XSD tests"
+    exit
+fi
+
+# Java versions are complicated
+
+java_version=$(javac -version | cut -d ' ' -f 2)
+javac_major_version=$(echo $java_version | cut -d '.' -f 1)
+javac_minor_version=$(echo $java_version | cut -d '.' -f 2)
+
+if [ $javac_major_version -eq 1 ] || [ $javac_minor_version -ge 8 ]; then
+    echo "JDK version less than 8, skipping XSD tests"
+    exit
+fi
+
+python3 check.py ../../src/cbmc/cbmc