@matheusbsbs / matheus-bagliano / commits / 69707d616f
Fork 0

Allow HTTP tests to run on Darwin

This patch allows the HTTP tests to run on OS X 10.5. It is not sufficient to be able to pass in LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH alone, as the apache.conf also needs a couple tweaks. These changes are put into an <IfDefine> to keep them Darwin specific, but this means lib-httpd.sh needs to be modified to pass -DDarwin to apache when running on Darwin. As long as we're making this change to lib-httpd.sh, we may as well set LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH to appropriate default values for the platform. Note that we now pass HTTPD_PARA to apache at shutdown as well. Otherwise apache will emit a harmless, but noisy warning that LogFormat is an unknown directive. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jay Soffian committed Feb 25, 2009 at 03:28 UTC 69707d616fd3acda6ecc47198edeaaa87f2cfcea
2 files changed +23 -5
t/lib-httpd.sh
+17 -5
@@ -11,7 +11,21 @@ then
11 exit
12 fi
13
14 -LIB_HTTPD_PATH=${LIB_HTTPD_PATH-'/usr/sbin/apache2'}
14 +HTTPD_PARA=""
15 +
16 +case $(uname) in
17 + Darwin)
18 + DEFAULT_HTTPD_PATH='/usr/sbin/httpd'
19 + DEFAULT_HTTPD_MODULE_PATH='/usr/libexec/apache2'
20 + HTTPD_PARA="$HTTPD_PARA -DDarwin"
21 + ;;
22 + *)
23 + DEFAULT_HTTPD_PATH='/usr/sbin/apache2'
24 + DEFAULT_HTTPD_MODULE_PATH='/usr/lib/apache2/modules'
25 + ;;
26 +esac
27 +
28 +LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
29 LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'8111'}
30
31 TEST_PATH="$TEST_DIRECTORY"/lib-httpd
@@ -39,14 +53,12 @@ then
53 exit
54 fi
55
42 - LIB_HTTPD_MODULE_PATH='/usr/lib/apache2/modules'
56 + LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
57 fi
58 else
59 error "Could not identify web server at '$LIB_HTTPD_PATH'"
60 fi
61
48 -HTTPD_PARA=""
49 -
62 prepare_httpd() {
63 mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
64
@@ -95,5 +107,5 @@ stop_httpd() {
107 trap 'die' EXIT
108
109 "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
98 - -f "$TEST_PATH/apache.conf" -k stop
110 + -f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop
111 }
t/lib-httpd/apache.conf
+6
@@ -5,6 +5,12 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
5 CustomLog access.log common
6 ErrorLog error.log
7
8 +<IfDefine Darwin>
9 + LoadModule log_config_module modules/mod_log_config.so
10 + LockFile accept.lock
11 + PidFile httpd.pid
12 +</IfDefine>
13 +
14 <IfDefine SSL>
15 LoadModule ssl_module modules/mod_ssl.so
16