From 041f7c9304788ec5c10ee5794612efa614a6eb61 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 1 Feb 2016 11:43:32 -0700 Subject: [PATCH] tests: avoid realpath in test-lib.sh 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 --- tests/test-lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 920b01e3f8..8e0ce83e11 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/.. -- GitLab