From a700770757999f7e5c8efdea82d8dd1c179090f3 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 24 May 2014 11:38:04 +0100 Subject: [PATCH] Fix path related test setup issue --- test/test-helper.sh | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/test/test-helper.sh b/test/test-helper.sh index 0b37170..4f12dfd 100644 --- a/test/test-helper.sh +++ b/test/test-helper.sh @@ -1,10 +1,28 @@ [ -n "$TEST_DEBUG" ] && set -x +resolve_link() { + $(type -p greadlink readlink | head -1) $1 +} + +abs_dirname() { + local cwd="$(pwd)" + local path="$1" + + while [ -n "$path" ]; do + cd "${path%/*}" + local name="${path##*/}" + path="$(resolve_link "$name" || true)" + done + + pwd + cd "$cwd" +} + # Set testroot variable. -testroot="$(dirname "$BASH_SOURCE")" +testroot="$(abs_dirname "$BASH_SOURCE")" # Set TMUXIFIER environment variable -TMUXIFIER="$(dirname "$testroot")" +TMUXIFIER="$(abs_dirname "$testroot/../..")" # Unset various Tmuxifier environment variables to prevent a local install of # Tmuxifier interfering with tests.