From 4881a20e353d8da38039cd51370024c40c36ba64 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 28 Jun 2019 16:01:56 -0400 Subject: [PATCH] fix: don't use realpath from GNU coreutils Turns out 'realpath' is specific to GNU coretuils, we'll have to live with uglier relative unresolved paths. Signed-off-by: Michael Jeanson Change-Id: I7febbd12dd7f8d49c938f3fffc6db44c6dd89d6a Reviewed-on: https://review.lttng.org/c/babeltrace/+/1573 Tested-by: jenkins Reviewed-by: Philippe Proulx --- tests/utils/utils.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 4557e8c8..c44e2e3b 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -26,12 +26,12 @@ scriptdir="$(dirname "${BASH_SOURCE[0]}")" # Allow overriding the source and build directories if [ "x${BT_TESTS_SRCDIR:-}" = "x" ]; then - BT_TESTS_SRCDIR=$(realpath -s "$scriptdir/..") + BT_TESTS_SRCDIR="$scriptdir/.." fi export BT_TESTS_SRCDIR if [ "x${BT_TESTS_BUILDDIR:-}" = "x" ]; then - BT_TESTS_BUILDDIR=$(realpath -s "$scriptdir/..") + BT_TESTS_BUILDDIR="$scriptdir/.." fi export BT_TESTS_BUILDDIR @@ -44,12 +44,12 @@ fi # Allow overriding the babeltrace2 executables if [ "x${BT_TESTS_BT2_BIN:-}" = "x" ]; then - BT_TESTS_BT2_BIN=$(realpath -s "$BT_TESTS_BUILDDIR/../src/cli/babeltrace2") + BT_TESTS_BT2_BIN="$BT_TESTS_BUILDDIR/../src/cli/babeltrace2" fi export BT_TESTS_BT2_BIN if [ "x${BT_TESTS_BT2LOG_BIN:-}" = "x" ]; then - BT_TESTS_BT2LOG_BIN=$(realpath -s "$BT_TESTS_BUILDDIR/../src/cli/babeltrace2-log") + BT_TESTS_BT2LOG_BIN="$BT_TESTS_BUILDDIR/../src/cli/babeltrace2-log" fi export BT_TESTS_BT2LOG_BIN -- 2.34.1