From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewUTG-0007SI-SV for qemu-devel@nongnu.org; Thu, 15 Mar 2018 11:07:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewUTB-0003sT-3x for qemu-devel@nongnu.org; Thu, 15 Mar 2018 11:07:10 -0400 Date: Thu, 15 Mar 2018 11:06:46 -0400 From: Jeff Cody Message-ID: <20180315150646.GC2962@localhost.localdomain> References: <20180315115144.801202-1-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180315115144.801202-1-eblake@redhat.com> Subject: Re: [Qemu-devel] [Qemu-block] [PATCH v2 for-2.12] iotests: Avoid realpath, for CentOS 6 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Kevin Wolf , pbonzini@redhat.com, famz@redhat.com, qemu-block@nongnu.org, Max Reitz On Thu, Mar 15, 2018 at 06:51:44AM -0500, Eric Blake wrote: > CentOS 6 lacks a realpath binary on the base install, which makes > all iotests runs fail since the 2.11 release: > > 001 - output mismatch (see 001.out.bad) > ./check: line 815: realpath: command not found > diff: missing operand after `/home/dummy/qemu/tests/qemu-iotests/001.out' > diff: Try `diff --help' for more information. > > Many of the uses of 'realpath' in the check script were being > used on the output of 'type -p' - but that is already an > absolute file name. While a canonical name can often be > shorter (realpath gets rid of /../), it can also be longer (due > to symlink expansion); and we really don't care if the name is > canonical, merely that it was an executable file with an > absolute path. These were broken in commit cceaf1db. > > The remaining use of realpath was to convert a possibly relative > filename into an absolute one before calling diff to make it > easier to copy-and-paste the filename for moving the .bad file > into place as the new reference file even when running iotests > out-of-tree (see commit 93e53fb6), but $PWD can achieve the same > purpose. > > Signed-off-by: Eric Blake > > --- > v2: Don't revert 93e53fb6, add commit id mentions in commit > message, retitle > --- > tests/qemu-iotests/check | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check > index 469142cd586..ec8033350d1 100755 > --- a/tests/qemu-iotests/check > +++ b/tests/qemu-iotests/check > @@ -92,7 +92,7 @@ set_prog_path() > { > p=`command -v $1 2> /dev/null` > if [ -n "$p" -a -x "$p" ]; then > - realpath -- "$(type -p "$p")" > + type -p "$p" > else > return 1 > fi > @@ -554,7 +554,7 @@ then > [ "$QEMU_PROG" = "" ] && _init_error "qemu not found" > fi > fi > -export QEMU_PROG=$(realpath -- "$(type -p "$QEMU_PROG")") > +export QEMU_PROG="$(type -p "$QEMU_PROG")" > > if [ -z "$QEMU_IMG_PROG" ]; then > if [ -x "$build_iotests/qemu-img" ]; then > @@ -565,7 +565,7 @@ if [ -z "$QEMU_IMG_PROG" ]; then > _init_error "qemu-img not found" > fi > fi > -export QEMU_IMG_PROG=$(realpath -- "$(type -p "$QEMU_IMG_PROG")") > +export QEMU_IMG_PROG="$(type -p "$QEMU_IMG_PROG")" > > if [ -z "$QEMU_IO_PROG" ]; then > if [ -x "$build_iotests/qemu-io" ]; then > @@ -576,7 +576,7 @@ if [ -z "$QEMU_IO_PROG" ]; then > _init_error "qemu-io not found" > fi > fi > -export QEMU_IO_PROG=$(realpath -- "$(type -p "$QEMU_IO_PROG")") > +export QEMU_IO_PROG="$(type -p "$QEMU_IO_PROG")" > > if [ -z $QEMU_NBD_PROG ]; then > if [ -x "$build_iotests/qemu-nbd" ]; then > @@ -587,7 +587,7 @@ if [ -z $QEMU_NBD_PROG ]; then > _init_error "qemu-nbd not found" > fi > fi > -export QEMU_NBD_PROG=$(realpath -- "$(type -p "$QEMU_NBD_PROG")") > +export QEMU_NBD_PROG="$(type -p "$QEMU_NBD_PROG")" > > if [ -z "$QEMU_VXHS_PROG" ]; then > export QEMU_VXHS_PROG="`set_prog_path qnio_server`" > @@ -811,7 +811,7 @@ do > else > echo " - output mismatch (see $seq.out.bad)" > mv $tmp.out $seq.out.bad > - $diff -w "$reference" $(realpath $seq.out.bad) > + $diff -w "$reference" "$PWD"/$seq.out.bad > err=true > fi > fi > -- > 2.14.3 > > Reviewed-by: Jeff Cody