From: Santosh Sivaraj <santosh@fossix.org>
To: QI Fuli <qi.fuli@fujitsu.com>, linux-nvdimm@lists.01.org
Cc: QI Fuli <qi.fuli@fujitsu.com>
Subject: Re: [ndctl PATCH] ndctl/test: add checking the presence of jq command ahead
Date: Thu, 25 Feb 2021 15:15:08 +0530 [thread overview]
Message-ID: <87ft1keb17.fsf@santosiv.in.ibm.com> (raw)
In-Reply-To: <20210203132108.6246-1-qi.fuli@fujitsu.com>
Hi QI,
QI Fuli <qi.fuli@fujitsu.com> writes:
> Due to the lack of jq command, the result of the test will be 'fail'.
> This patch adds checking the presence of jq commmand ahead.
> If there is no jq command in the system, the test will be marked as 'skip'.
>
> Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>
> Link: https://github.com/pmem/ndctl/issues/141
Could this dependency be made part of configure.ac? Something like
diff --git a/configure.ac b/configure.ac
index 5ec8d2f..0f2c6c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,13 @@ fi
AC_SUBST([XMLTO])
fi
+AC_CHECK_PROG(JQ, [jq], [$(which jq)], [missing])
+if test "x$JQ" = xmissing; then
+ AC_MSG_ERROR([jq needed to validate tests])
+fi
+AC_SUBST([JQ])
+
+
AC_C_TYPEOF
AC_DEFINE([HAVE_STATEMENT_EXPR], 1, [Define to 1 if you have statement expressions.])
Thanks,
Santosh
> ---
> test/daxdev-errors.sh | 1 +
> test/inject-error.sh | 2 ++
> test/inject-smart.sh | 1 +
> test/label-compat.sh | 1 +
> test/max_available_extent_ns.sh | 1 +
> test/monitor.sh | 2 ++
> test/multi-dax.sh | 1 +
> test/sector-mode.sh | 2 ++
> 8 files changed, 11 insertions(+)
>
> diff --git a/test/daxdev-errors.sh b/test/daxdev-errors.sh
> index 6281f32..9547d78 100755
> --- a/test/daxdev-errors.sh
> +++ b/test/daxdev-errors.sh
> @@ -9,6 +9,7 @@ rc=77
> . $(dirname $0)/common
>
> check_min_kver "4.12" || do_skip "lacks dax dev error handling"
> +check_prereq "jq"
>
> trap 'err $LINENO' ERR
>
> diff --git a/test/inject-error.sh b/test/inject-error.sh
> index c636033..7d0b826 100755
> --- a/test/inject-error.sh
> +++ b/test/inject-error.sh
> @@ -11,6 +11,8 @@ err_count=8
>
> . $(dirname $0)/common
>
> +check_prereq "jq"
> +
> trap 'err $LINENO' ERR
>
> # sample json:
> diff --git a/test/inject-smart.sh b/test/inject-smart.sh
> index 94705df..4ca83b8 100755
> --- a/test/inject-smart.sh
> +++ b/test/inject-smart.sh
> @@ -166,6 +166,7 @@ do_tests()
> }
>
> check_min_kver "4.19" || do_skip "kernel $KVER may not support smart (un)injection"
> +check_prereq "jq"
> modprobe nfit_test
> rc=1
>
> diff --git a/test/label-compat.sh b/test/label-compat.sh
> index 340b93d..8ab2858 100755
> --- a/test/label-compat.sh
> +++ b/test/label-compat.sh
> @@ -10,6 +10,7 @@ BASE=$(dirname $0)
> . $BASE/common
>
> check_min_kver "4.11" || do_skip "may not provide reliable isetcookie values"
> +check_prereq "jq"
>
> trap 'err $LINENO' ERR
>
> diff --git a/test/max_available_extent_ns.sh b/test/max_available_extent_ns.sh
> index 14d741d..343f3c9 100755
> --- a/test/max_available_extent_ns.sh
> +++ b/test/max_available_extent_ns.sh
> @@ -9,6 +9,7 @@ rc=77
> trap 'err $LINENO' ERR
>
> check_min_kver "4.19" || do_skip "kernel $KVER may not support max_available_size"
> +check_prereq "jq"
>
> init()
> {
> diff --git a/test/monitor.sh b/test/monitor.sh
> index cdab5e1..28c5541 100755
> --- a/test/monitor.sh
> +++ b/test/monitor.sh
> @@ -13,6 +13,8 @@ smart_supported_bus=""
>
> . $(dirname $0)/common
>
> +check_prereq "jq"
> +
> trap 'err $LINENO' ERR
>
> check_min_kver "4.15" || do_skip "kernel $KVER may not support monitor service"
> diff --git a/test/multi-dax.sh b/test/multi-dax.sh
> index e932569..8496619 100755
> --- a/test/multi-dax.sh
> +++ b/test/multi-dax.sh
> @@ -9,6 +9,7 @@ rc=77
> . $(dirname $0)/common
>
> check_min_kver "4.13" || do_skip "may lack multi-dax support"
> +check_prereq "jq"
>
> trap 'err $LINENO' ERR
>
> diff --git a/test/sector-mode.sh b/test/sector-mode.sh
> index dd7013e..54fa806 100755
> --- a/test/sector-mode.sh
> +++ b/test/sector-mode.sh
> @@ -6,6 +6,8 @@ rc=77
>
> . $(dirname $0)/common
>
> +check_prereq "jq"
> +
> set -e
> trap 'err $LINENO' ERR
>
> --
> 2.29.2
> _______________________________________________
> Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
> To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2021-02-25 9:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 13:21 [ndctl PATCH] ndctl/test: add checking the presence of jq command ahead QI Fuli
2021-02-22 6:59 ` qi.fuli
2021-02-25 9:45 ` Santosh Sivaraj [this message]
2021-02-26 10:11 ` qi.fuli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ft1keb17.fsf@santosiv.in.ibm.com \
--to=santosh@fossix.org \
--cc=linux-nvdimm@lists.01.org \
--cc=qi.fuli@fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).