Merge branch 'maint'

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 919d45a7d4dab2dae9efc46b1be281eff95c0c1c..6a9d9757239f0476422b1a97228927b1ba1ac934 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -81,6 +81,11 @@ then
                        break
                fi
        done
+       if test -z "$SVN_HTTPD_PATH"
+       then
+               skip_all='skipping git svn tests, Apache not found'
+               test_done
+       fi
        for d in \
                "$SVN_HTTPD_MODULE_PATH" \
                /usr/lib/apache2/modules \
@@ -92,6 +97,11 @@ then
                        break
                fi
        done
+       if test -z "$SVN_HTTPD_MODULE_PATH"
+       then
+               skip_all='skipping git svn tests, Apache module dir not found'
+               test_done
+       fi
 fi
 
 start_httpd () {