From 273b4bbfd787e2942ec8395bc5232d9fc56fd9e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Sat, 25 Oct 2025 07:37:48 +0200 Subject: [PATCH] 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. --- bin/tests/system/isctest/vars/.build_vars/JQ.in | 1 + bin/tests/system/isctest/vars/.build_vars/meson.build | 1 + bin/tests/system/isctest/vars/build.py | 1 + meson.build | 1 + 4 files changed, 4 insertions(+) create mode 100644 bin/tests/system/isctest/vars/.build_vars/JQ.in 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 index 00000000000..156174fd06b --- /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 fbe88da8d27..deef5adda15 100644 --- 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 4071272c11b..a71256bba3c 100644 --- 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 57287ae0f6d..b1552528cee 100644 --- 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) -- 2.47.3