undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make git-svn tests behave better on OS X

Browse Source 
Give lib-git-svn.sh a few alternate paths to look for apache2.
Explicitly define the LockFile so httpd will actually start under OS X

Signed-off-by: Kevin Ballard <kevin@sb.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kevin Ballard 2008-03-21 03:27:35 -04:00 committed by Junio C Hamano
parent bf7c90216d
commit 3644da7214
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
t/lib-git-svn.sh
View File

@ -49,8 +49,28 @@ poke() {
test-chmtime +1 "$1" test-chmtime +1 "$1"
} }
SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'} for d in \
SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'} "$SVN_HTTPD_PATH" \
/usr/sbin/apache2 \
/usr/sbin/httpd \
; do
if test -f "$d"
then
SVN_HTTPD_PATH="$d"
break
fi
done
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
start_httpd () { start_httpd () {
if test -z "$SVN_HTTPD_PORT" if test -z "$SVN_HTTPD_PORT"
@ -66,6 +86,7 @@ ServerName "git-svn test"
ServerRoot "$GIT_DIR" ServerRoot "$GIT_DIR"
DocumentRoot "$GIT_DIR" DocumentRoot "$GIT_DIR"
PidFile "$GIT_DIR/httpd.pid" PidFile "$GIT_DIR/httpd.pid"
LockFile logs/accept.lock
Listen 127.0.0.1:$SVN_HTTPD_PORT Listen 127.0.0.1:$SVN_HTTPD_PORT
LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so