From: Carl Hetherington <cth@carlh.net>
Date: Tue, 16 Jun 2020 06:17:43 +0000 (+0200)
Subject: fixup! Try adding --xml option to run/tests.
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=b42a61e993a731a7dda13561fc13de337a98d149;p=dcpomatic.git

fixup! Try adding --xml option to run/tests.
---

diff --git a/cscript b/cscript
index f4e184e0d..1e47b9dc7 100644
--- a/cscript
+++ b/cscript
@@ -389,7 +389,7 @@ def dependencies(target, options):
 
     return deps
 
-option_defaults = { "gui": True, "variant": None }
+option_defaults = { "gui": True, "variant": None, "xml": False }
 
 def configure_options(target, options):
     opt = ''
@@ -719,10 +719,12 @@ def make_manual(target):
     target.command('pdflatex colour.tex')
     return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]
 
-def test(target, test):
+def test(target, options, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        cmd = 'run/tests --xml '
+        cmd = 'run/tests'
+        if options['xml']:
+            target += '--xml '
         if target.debug:
             cmd += '--backtrace '
         if test is not None:
diff --git a/run/tests b/run/tests
index b243efccb..f143514d4 100755
--- a/run/tests
+++ b/run/tests
@@ -27,6 +27,7 @@ elif [ "$1" == "--helgrind" ]; then
     shift;
     valgrind --tool="helgrind" build/test/unit-tests $*
 elif [ "$1" == "--xml" ]; then
+    shift;
     build/test/unit-tests --catch_system_errors=no --log_format=XML --log_sink=results.xml --log_level=all --report_level=no --result_code=no
 else
     ulimit -c unlimited