[PATCH] bash prompt: fix tests when run with a symlink --root
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- Oct 11, 2012, 22:38 UTC
- Message-ID
- <1349995083-11765-1-git-send-email-szeder@ira.uka.de>
- In-Reply-To
- <CACBZZX6Cu_4X=AywsDMebdoFYdEN1Gmp439aEAcehHBuMhziTw@mail.gmail.com>
Some __gitdir() tests fail when they're run with a --root directory which is a symlink, because they use $TRASH_DIRECTORY to construct the expected absolute paths. Use the path got from 'pwd -P' instead throughout the test script.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> --- t/t9903-bash-prompt.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index f17c1f8b..7a7b198f 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -11,6 +11,8 @@ test_description='test git-specific bash prompt functions' actual="$TRASH_DIRECTORY/actual" +TRASH_ROOT="$(pwd -P)" + test_expect_success 'setup for prompt tests' ' mkdir -p subdir/subsubdir && git init otherrepo && @@ -32,9 +34,9 @@ test_expect_success 'setup for prompt tests' ' ' test_expect_success 'gitdir - from command line (through $__git_dir)' ' - echo "$TRASH_DIRECTORY/otherrepo/.git" > expected && + echo "$TRASH_ROOT/otherrepo/.git" > expected && ( - __git_dir="$TRASH_DIRECTORY/otherrepo/.git" && + __git_dir="$TRASH_ROOT/otherrepo/.git" && __gitdir > "$actual" ) && test_cmp expected "$actual" @@ -59,7 +61,7 @@ test_expect_success 'gitdir - .git directory in cwd' ' ' test_expect_success 'gitdir - .git directory in parent' ' - echo "$TRASH_DIRECTORY/.git" > expected && + echo "$TRASH_ROOT/.git" > expected && ( cd subdir/subsubdir && __gitdir > "$actual" @@ -77,7 +79,7 @@ test_expect_success 'gitdir - cwd is a .git directory' ' ' test_expect_success 'gitdir - parent is a .git directory' ' - echo "$TRASH_DIRECTORY/.git" > expected && + echo "$TRASH_ROOT/.git" > expected && ( cd .git/refs/heads && __gitdir > "$actual" @@ -86,9 +88,9 @@ test_expect_success 'gitdir - parent is a .git directory' ' ' test_expect_success 'gitdir - $GIT_DIR set while .git directory in cwd' ' - echo "$TRASH_DIRECTORY/otherrepo/.git" > expected && + echo "$TRASH_ROOT/otherrepo/.git" > expected && ( - GIT_DIR="$TRASH_DIRECTORY/otherrepo/.git" && + GIT_DIR="$TRASH_ROOT/otherrepo/.git" && export GIT_DIR && __gitdir > "$actual" ) && @@ -96,9 +98,9 @@ test_expect_success 'gitdir - $GIT_DIR set while .git directory in cwd' ' ' test_expect_success 'gitdir - $GIT_DIR set while .git directory in parent' ' - echo "$TRASH_DIRECTORY/otherrepo/.git" > expected && + echo "$TRASH_ROOT/otherrepo/.git" > expected && ( - GIT_DIR="$TRASH_DIRECTORY/otherrepo/.git" && + GIT_DIR="$TRASH_ROOT/otherrepo/.git" && export GIT_DIR && cd subdir && __gitdir > "$actual" @@ -108,15 +110,15 @@ test_expect_success 'gitdir - $GIT_DIR set while .git directory in parent' ' test_expect_success 'gitdir - non-existing $GIT_DIR' ' ( - GIT_DIR="$TRASH_DIRECTORY/non-existing" && + GIT_DIR="$TRASH_ROOT/non-existing" && export GIT_DIR && test_must_fail __gitdir ) ' test_expect_success 'gitdir - gitfile in cwd' ' - echo "$TRASH_DIRECTORY/otherrepo/.git" > expected && - echo "gitdir: $TRASH_DIRECTORY/otherrepo/.git" > subdir/.git && + echo "$TRASH_ROOT/otherrepo/.git" > expected && + echo "gitdir: $TRASH_ROOT/otherrepo/.git" > subdir/.git && test_when_finished "rm -f subdir/.git" && ( cd subdir && @@ -126,8 +128,8 @@ test_expect_success 'gitdir - gitfile in cwd' ' ' test_expect_success 'gitdir - gitfile in parent' ' - echo "$TRASH_DIRECTORY/otherrepo/.git" > expected && - echo "gitdir: $TRASH_DIRECTORY/otherrepo/.git" > subdir/.git && + echo "$TRASH_ROOT/otherrepo/.git" > expected && + echo "gitdir: $TRASH_ROOT/otherrepo/.git" > subdir/.git && test_when_finished "rm -f subdir/.git" && ( cd subdir/subsubdir && @@ -137,7 +139,7 @@ test_expect_success 'gitdir - gitfile in parent' ' ' test_expect_success SYMLINKS 'gitdir - resulting path avoids symlinks' ' - echo "$TRASH_DIRECTORY/otherrepo/.git" > expected && + echo "$TRASH_ROOT/otherrepo/.git" > expected && mkdir otherrepo/dir && test_when_finished "rm -rf otherrepo/dir" && ln -s otherrepo/dir link && @@ -152,7 +154,7 @@ test_expect_success SYMLINKS 'gitdir - resulting path avoids symlinks' ' test_expect_success 'gitdir - not a git repository' ' ( cd subdir/subsubdir && - GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY" && + GIT_CEILING_DIRECTORIES="$TRASH_ROOT" && export GIT_CEILING_DIRECTORIES && test_must_fail __gitdir ) @@ -250,7 +252,7 @@ echo "edit $(git log -1 --format="%h")" > "$1" EOF test_when_finished "rm -f fake_editor.sh" && chmod a+x fake_editor.sh && - test_set_editor "$TRASH_DIRECTORY/fake_editor.sh" && + test_set_editor "$TRASH_ROOT/fake_editor.sh" && git checkout b1 && test_when_finished "git checkout master" && git rebase -i HEAD^ &&
-- 1.8.0.rc0.83.gc8e1777