Make xsd validation run with makefile build

Author: hannes-steffenhagen-diffblue

regression/Makefile

@@ -2,35 +2,36 @@
 # running tests in parallel, it is important that these directories are
 # listed with decreasing runtimes (i.e. longest running at the top)
 DIRS = cbmc \
-       cbmc-library \
-       goto-analyzer \
        ansi-c \
-       goto-instrument \
-       cpp \
        cbmc-concurrency \
        cbmc-cover \
+       cbmc-cpp \
        cbmc-incr-oneloop \
-       goto-instrument-typedef \
-       smt2_solver \
-       smt2_strings \
-       strings \
-       invariants \
-       goto-diff \
-       test-script \
+       cbmc-library \
+       contracts \
+       cpp \
+       goto-analyzer \
        goto-analyzer-taint \
-       goto-gcc \
-       goto-harness \
-       goto-cl \
        goto-cc-cbmc \
-       cbmc-cpp \
-       goto-cc-goto-analyzer \
-       statement-list \
-       systemc \
-       contracts \
        goto-cc-file-local \
+       goto-cc-goto-analyzer \
+       goto-cl \
+       goto-diff \
+       goto-gcc \
+       goto-harness \
+       goto-instrument \
+       goto-instrument-typedef \
+       invariants \
        linking-goto-binaries \
-       symtab2gb \
+       smt2_solver \
+       smt2_strings \
        solver-hardness \
+       statement-list \
+       strings \
+       symtab2gb \
+       systemc \
+       test-script \
+       validate-trace-xml-schema \
        # Empty last line
 
 ifeq ($(OS),Windows_NT)

regression/validate-trace-xml-schema/Makefile

@@ -0,0 +1,4 @@
+.PHONY: test
+test:
+	sh check.sh
+

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

@@ -59,7 +59,7 @@
 
 if len(sys.argv) != 2:
     sys.stderr.write('Usage: check.py <path-to-cbmc>')
-CbmcPath = sys.argv[1]
+CbmcPath = os.path.abspath(sys.argv[1])
 XsdValidateJar = os.path.join(this_script_dir, 'validate-xsd/build/libs/validate-xsd-1.0-SNAPSHOT-uber.jar')
 
 

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

@@ -0,0 +1,6 @@
+if command -v javac
+then
+  python3 check.py ../../src/cbmc/cbmc
+else
+  echo "javac not found, skipping XSD tests"
+fi