Merge branch 'eb/upload-archive-from-git-shell'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 2979e8ea0e85c86a57d9f0dda8915d3b031478de..4bd986f43091715432bb4b740cfe4f0e0701cf85 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -523,14 +523,6 @@ test_done () {
        fi
        case "$test_failure" in
        0)
-               # We could:
-               # cd .. && rm -fr 'trash directory'
-               # but that means we forbid any tests that use their own
-               # subdirectory from calling test_done without coming back
-               # to where they started from.
-               # The Makefile provided will clean this test area so
-               # we will leave things as they are.
-
                say_color pass "passed all $msg"
 
                test -d "$remove_trash" &&
@@ -706,6 +698,8 @@ case $(uname -s) in
        ;;
 esac
 
+test -z "$NO_PERL" && test_set_prereq PERL
+
 # test whether the filesystem supports symbolic links
 ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
 rm -f y