git p4 test: clean up the p4d cleanup functions

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 182da069f1743b8a06b65396599f94530080e67f..5e27604b24a7357575c1d51c7cafda9f5cb06471 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -93,6 +93,7 @@ test_expect_success 'No extra GIT_* on alias scripts' '
                sed -n \
                        -e "/^GIT_PREFIX=/d" \
                        -e "/^GIT_TEXTDOMAINDIR=/d" \
+                       -e "/^GIT_TR2_PARENT/d" \
                        -e "/^GIT_/s/=.*//p" |
                sort
        EOF
@@ -319,14 +320,14 @@ test_lazy_prereq GETCWD_IGNORES_PERMS '
        base=GETCWD_TEST_BASE_DIR &&
        mkdir -p $base/dir &&
        chmod 100 $base ||
-       error "bug in test script: cannot prepare $base"
+       BUG "cannot prepare $base"
 
        (cd $base/dir && /bin/pwd -P)
        status=$?
 
        chmod 700 $base &&
        rm -rf $base ||
-       error "bug in test script: cannot clean $base"
+       BUG "cannot clean $base"
        return $status
 '