[libvirt] [PATCH] tests: avoid realpath in test-lib.sh

Cole Robinson crobinso at redhat.com
Mon Feb 1 19:25:26 UTC 2016


On 02/01/2016 01:46 PM, Eric Blake wrote:
> Ever since commit ace4aecd, running 'make check' on RHEL 6 produces:
> 
> ./test-lib.sh: line 21: realpath: command not found
> 
> for every shell script test, because 'realpath' was not part of
> coreutils back then.
> 
> * tests/test-lib.sh (_scriptdir): Compute with only portable shell.
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
> 
> A warning message is cosmetic, and not quite a build-breaker, so
> I'll wait for a review before pushing this.
> 
>  tests/test-lib.sh |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/test-lib.sh b/tests/test-lib.sh
> index 920b01e..8e0ce83 100644
> --- a/tests/test-lib.sh
> +++ b/tests/test-lib.sh
> @@ -1,6 +1,6 @@
>  # test-lib.sh: source this file; set up for tests
> 
> -# Copyright (C) 2008-2013 Red Hat, Inc.
> +# Copyright (C) 2008-2013, 2016 Red Hat, Inc.
>  #
>  # This library is free software; you can redistribute it and/or
>  # modify it under the terms of the GNU Lesser General Public
> @@ -18,7 +18,7 @@
>  #
>  # Based on an idea from GNU coreutils
> 
> -_scriptdir="$(realpath $(dirname $0))"
> +_scriptdir="$(unset CDPATH; cd $(dirname $0) && pwd)"
>  test -z "$abs_srcdir" && abs_srcdir=$_scriptdir
>  test -z "$abs_builddir" && abs_builddir=$_scriptdir
>  test -z "$abs_top_srcdir" && abs_top_srcdir=$_scriptdir/..
> 

ACK

Thanks,
Cole




More information about the libvir-list mailing list