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.

(cherry picked from commit 273b4bbfd787e2942ec8395bc5232d9fc56fd9e1)

diff --git a/bin/tests/system/isctest/vars/.ac_vars/JQ.in b/bin/tests/system/isctest/vars/.ac_vars/JQ.in
new file mode 100644 (file)
index 0000000..156174f
--- /dev/null
+++ b/bin/tests/system/isctest/vars/.ac_vars/JQ.in
@@ -0,0 +1 @@
+@JQ@

diff --git a/configure.ac b/configure.ac
index 88d90d6f67873809860de255d23661e7588a0bf0..a60ba181f16d061d8109fc0670bf424c960a62a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -327,8 +327,9 @@ AC_SUBST([PYTEST])
 AM_CONDITIONAL([HAVE_PYTEST], [test -n "$PYTEST"])
 
 #
-# xsltproc is optional, it is used only by system test scripts.
+# Optional utilities, only used by system tests.
 #
+AC_PATH_PROG([JQ], [jq])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 #
@@ -1643,6 +1644,7 @@ AC_CONFIG_FILES([bin/tests/Makefile
                 bin/tests/system/isctest/vars/.ac_vars/TOP_BUILDDIR
                 bin/tests/system/isctest/vars/.ac_vars/TOP_SRCDIR
                 bin/tests/system/isctest/vars/.ac_vars/FSTRM_CAPTURE
+                bin/tests/system/isctest/vars/.ac_vars/JQ
                 bin/tests/system/isctest/vars/.ac_vars/SHELL
                 bin/tests/system/isctest/vars/.ac_vars/PYTHON
                 bin/tests/system/isctest/vars/.ac_vars/PERL