From 626cd6827cb2ac8caee295350195fe282121807f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 12 Oct 2022 18:48:31 +0200 Subject: [PATCH] utils/test-pkg: proper output on host without jq installed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: Sébastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d) Signed-off-by: Peter Korsgaard --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq"