Merge branch 'pw/git-p4-tests'

diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh
index eb8cc9523e682518464d26e9ec721508f99dfd04..dc92e60cd6f09fa5e2610d491cf1c07d43c45dfd 100755 (executable)
--- a/t/t9808-git-p4-chdir.sh
+++ b/t/t9808-git-p4-chdir.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-p4 relative chdir'
+test_description='git p4 relative chdir'
 
 . ./lib-git-p4.sh
 
@@ -21,24 +21,24 @@ test_expect_success 'init depot' '
 # environment variable is set
 test_expect_success 'P4CONFIG and absolute dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
-       test_when_finished "rm \"$TRASH_DIRECTORY/p4config\"" &&
+       test_when_finished "rm p4config" &&
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&
-               unset P4PORT P4CLIENT &&
-               "$GITP4" clone --verbose --dest="$git" //depot
+               sane_unset P4PORT P4CLIENT &&
+               git p4 clone --verbose --dest="$git" //depot
        )
 '
 
 # same thing, but with relative directory name, note missing $ on --dest
 test_expect_success 'P4CONFIG and relative dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
-       test_when_finished "rm \"$TRASH_DIRECTORY/p4config\"" &&
+       test_when_finished "rm p4config" &&
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&
-               unset P4PORT P4CLIENT &&
-               "$GITP4" clone --verbose --dest="git" //depot
+               sane_unset P4PORT P4CLIENT &&
+               git p4 clone --verbose --dest="git" //depot
        )
 '