Detect jq at build time

Detect whether and where the jq 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/JQ.in b/bin/tests/system/isctest/vars/.build_vars/JQ.in
new file mode 100644 (file)
index 0000000..156174f
--- /dev/null
+++ b/bin/tests/system/isctest/vars/.build_vars/JQ.in
@@ -0,0 +1 @@
+@JQ@

diff --git a/bin/tests/system/isctest/vars/.build_vars/meson.build b/bin/tests/system/isctest/vars/.build_vars/meson.build
index fbe88da8d273f1bf5b648ca4ed9140cb75996fcc..deef5adda157676ff48ee2b318218936d8459ee7 100644 (file)
--- a/bin/tests/system/isctest/vars/.build_vars/meson.build
+++ b/bin/tests/system/isctest/vars/.build_vars/meson.build
@@ -28,6 +28,7 @@ configure_file(
 foreach name, prog : {
     'CURL': curl,
     'FSTRM_CAPTURE': fstrm_capture,
+    'JQ': jq,
     'NC': nc,
     'PERL': perl,
     'PYTEST': pytest,

diff --git a/bin/tests/system/isctest/vars/build.py b/bin/tests/system/isctest/vars/build.py
index 4071272c11b650d5a8a5c73aaeff8590ae268569..a71256bba3c6f65d1997988b632c862df90efa40 100644 (file)
--- a/bin/tests/system/isctest/vars/build.py
+++ b/bin/tests/system/isctest/vars/build.py
@@ -41,6 +41,7 @@ def load_vars_from_build_files() -> Dict[str, str]:
     for var in [
         "CURL",
         "FSTRM_CAPTURE",
+        "JQ",
         "NC",
         "PERL",
         "PYTEST",

diff --git a/meson.build b/meson.build
index 57287ae0f6d2805cebbec5e263e37b3ccd252505..b1552528cee976fcee47779b907abac1f6b2c818 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,7 @@ dtrace = find_program(['dtrace', dtrace_shim], required: false)
 curl = find_program('curl', required: false)
 fstrm_capture = find_program('fstrm_capture', required: false)
 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)
 xsltproc = find_program('xsltproc', required: false)