Make git-svn tests behave better on OS X
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>
Kevin Ballard committed
Mar 21, 2008 at 03:27 UTC
3644da7214055d2e84223b45dfca42d437fb7ea7
1 file changed
+23
-2
t/lib-git-svn.sh
+23
-2
@@ -49,8 +49,28 @@ poke() {
49
test-chmtime +1 "$1"
50
}
51
52
-SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'}
53
-SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'}
52
+for d in \
53
+ "$SVN_HTTPD_PATH" \
54
+ /usr/sbin/apache2 \
55
+ /usr/sbin/httpd \
56
+; do
57
+ if test -f "$d"
58
+ then
59
+ SVN_HTTPD_PATH="$d"
60
+ break
61
+ fi
62
+done
63
+for d in \
64
+ "$SVN_HTTPD_MODULE_PATH" \
65
+ /usr/lib/apache2/modules \
66
+ /usr/libexec/apache2 \
67
+; do
68
+ if test -d "$d"
69
+ then
70
+ SVN_HTTPD_MODULE_PATH="$d"
71
+ break
72
+ fi
73
+done
74
75
start_httpd () {
76
if test -z "$SVN_HTTPD_PORT"
@@ -66,6 +86,7 @@ ServerName "git-svn test"
86
ServerRoot "$GIT_DIR"
87
DocumentRoot "$GIT_DIR"
88
PidFile "$GIT_DIR/httpd.pid"
89
+LockFile logs/accept.lock
90
Listen 127.0.0.1:$SVN_HTTPD_PORT
91
LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
92
LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so