ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: Use "command -v" instead of which(1) in shell scripts 

When which(1) is not installed, we would complain "perl not found"
because it's the first set_prog_path check. The error message is
wrong.

Fix it by using "command -v", a native way to query the existence of a
command.

Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1416380832-9697-1-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2014-11-19 15:07:12 +08:00 committed by Kevin Wolf
parent 4c58e80acd
commit e465ce7d09
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/qemu-iotests/common
View File

@ -289,10 +289,10 @@ testlist options
if [ ! -z "$DISPLAY" ] if [ ! -z "$DISPLAY" ]
then then
which xdiff >/dev/null 2>&1 && diff=xdiff command -v xdiff >/dev/null 2>&1 && diff=xdiff
which gdiff >/dev/null 2>&1 && diff=gdiff command -v gdiff >/dev/null 2>&1 && diff=gdiff
which tkdiff >/dev/null 2>&1 && diff=tkdiff command -v tkdiff >/dev/null 2>&1 && diff=tkdiff
which xxdiff >/dev/null 2>&1 && diff=xxdiff command -v xxdiff >/dev/null 2>&1 && diff=xxdiff
fi fi
;; ;;

2
tests/qemu-iotests/common.config
View File

@ -47,7 +47,7 @@ export PWD=`pwd`
# $1 = prog to look for, $2* = default pathnames if not found in $PATH # $1 = prog to look for, $2* = default pathnames if not found in $PATH
set_prog_path() set_prog_path()
{ {
p=`which $1 2> /dev/null` p=`command -v $1 2> /dev/null`
if [ -n "$p" -a -x "$p" ]; then if [ -n "$p" -a -x "$p" ]; then
echo $p echo $p
return 0 return 0