t: send verbose test-helper output to fd 4

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 852b22c80ab4c38183391813c333185e6050a664..33f6ce26f69d442238c60619a5f70673d451a7fb 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -939,7 +939,7 @@ then
        fi
 fi
 
-GITPERLLIB="$GIT_BUILD_DIR"/perl/blib/lib:"$GIT_BUILD_DIR"/perl/blib/arch/auto/Git
+GITPERLLIB="$GIT_BUILD_DIR"/perl/build/lib
 export GITPERLLIB
 test -d "$GIT_BUILD_DIR"/templates/blt || {
        error "You haven't built things yet, have you?"
@@ -1106,6 +1106,10 @@ test_lazy_prereq EXPENSIVE '
        test -n "$GIT_TEST_LONG"
 '
 
+test_lazy_prereq EXPENSIVE_ON_WINDOWS '
+       test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+'
+
 test_lazy_prereq USR_BIN_TIME '
        test -x /usr/bin/time
 '