Merge branch 'pw/rebase-i-regression-fix' into maint

diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index 59ef15efbdb80782248cb93b04efdfd7c82bf22a..006d2a8152dc499f3588b130470285703b60dc92 100644 (file)
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -114,4 +114,9 @@ perl -MCGI -MCGI::Util -MCGI::Carp -e 0 >/dev/null 2>&1 || {
        test_done
 }
 
+perl -mTime::HiRes -e 0 >/dev/null 2>&1 || {
+       skip_all='skipping gitweb tests, Time::HiRes module not available'
+       test_done
+}
+
 gitweb_init