summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ramsay Jones <ramsay@ramsay1.demon.co.uk>2010-12-14 18:25:11 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-14 11:11:35 -0800
commitcff484a98baf57f11daed62744bcf0774bd78c2f (patch)
tree56bb986627b183ad08b72db944d3a291d7e8a697
parentlib-git-svn.sh: Avoid setting web server variables unnecessarily (diff)
downloadtgif-cff484a98baf57f11daed62744bcf0774bd78c2f.tar.xz
lib-git-svn.sh: Add check for mis-configured web server variables
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/lib-git-svn.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 919d45a7d4..6a9d975723 100644
--- 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 () {