Detect xmllint at build time

Detect whether and where the xmllint utility is available at build time,
so that it can be used in system tests.  If the tool is not found,
specific checks employing it will be skipped.

diff --git a/bin/tests/system/isctest/vars/.build_vars/XMLLINT.in b/bin/tests/system/isctest/vars/.build_vars/XMLLINT.in
new file mode 100644 (file)
index 0000000..9364f0f
--- /dev/null
+++ b/bin/tests/system/isctest/vars/.build_vars/XMLLINT.in
@@ -0,0 +1 @@
+@XMLLINT@

diff --git a/bin/tests/system/isctest/vars/.build_vars/meson.build b/bin/tests/system/isctest/vars/.build_vars/meson.build
index deef5adda157676ff48ee2b318218936d8459ee7..8958b3820aa06c62c78eaa7413055efc7f79acb0 100644 (file)
--- a/bin/tests/system/isctest/vars/.build_vars/meson.build
+++ b/bin/tests/system/isctest/vars/.build_vars/meson.build
@@ -34,6 +34,7 @@ foreach name, prog : {
     'PYTEST': pytest,
     'PYTHON': python,
     'SHELL': sh,
+    'XMLLINT': xmllint,
     'XSLTPROC': xsltproc,
 }
     if prog.found()

diff --git a/bin/tests/system/isctest/vars/build.py b/bin/tests/system/isctest/vars/build.py
index a71256bba3c6f65d1997988b632c862df90efa40..e22fb95a0f0dbe3f19ade328eb80d3d2bf13144c 100644 (file)
--- a/bin/tests/system/isctest/vars/build.py
+++ b/bin/tests/system/isctest/vars/build.py
@@ -48,6 +48,7 @@ def load_vars_from_build_files() -> Dict[str, str]:
         "PYTHON",
         "SHELL",
         "TOP_SRCDIR",
+        "XMLLINT",
         "XSLTPROC",
     ]:
         var_file = var_dir / var

diff --git a/meson.build b/meson.build
index b1552528cee976fcee47779b907abac1f6b2c818..c8c7832164fe843f394f8c87a7125d8146440fe2 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -100,6 +100,7 @@ git = find_program('git', required: false)
 jq = find_program('jq', required: false)
 nc = find_program('nc', required: false)
 python = find_program(['python3', 'python'], required: false)
+xmllint = find_program('xmllint', required: false)
 xsltproc = find_program('xsltproc', required: false)
 pytest = find_program(
     ['pytest-3', 'py.test-3', 'pytest', 'py.test', 'pytest-pypy'],