diffcore-rename: don't consider unmerged path as source

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 92d6d319428223de9205d4d162e3806aedee855b..6a9d9757239f0476422b1a97228927b1ba1ac934 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -68,28 +68,41 @@ svn_cmd () {
        svn "$orig_svncmd" --config-dir "$svnconf" "$@"
 }
 
-for d in \
-       "$SVN_HTTPD_PATH" \
-       /usr/sbin/apache2 \
-       /usr/sbin/httpd \
-; do
-       if test -f "$d"
+if test -n "$SVN_HTTPD_PORT"
+then
+       for d in \
+               "$SVN_HTTPD_PATH" \
+               /usr/sbin/apache2 \
+               /usr/sbin/httpd \
+       ; do
+               if test -f "$d"
+               then
+                       SVN_HTTPD_PATH="$d"
+                       break
+               fi
+       done
+       if test -z "$SVN_HTTPD_PATH"
        then
-               SVN_HTTPD_PATH="$d"
-               break
+               skip_all='skipping git svn tests, Apache not found'
+               test_done
        fi
-done
-for d in \
-       "$SVN_HTTPD_MODULE_PATH" \
-       /usr/lib/apache2/modules \
-       /usr/libexec/apache2 \
-; do
-       if test -d "$d"
+       for d in \
+               "$SVN_HTTPD_MODULE_PATH" \
+               /usr/lib/apache2/modules \
+               /usr/libexec/apache2 \
+       ; do
+               if test -d "$d"
+               then
+                       SVN_HTTPD_MODULE_PATH="$d"
+                       break
+               fi
+       done
+       if test -z "$SVN_HTTPD_MODULE_PATH"
        then
-               SVN_HTTPD_MODULE_PATH="$d"
-               break
+               skip_all='skipping git svn tests, Apache module dir not found'
+               test_done
        fi
-done
+fi
 
 start_httpd () {
        repo_base_path="$1"