Re: [PATCH] Make git-svn tests behave better on OS X
Kevin Ballard <kevin@sb.org> wrote:
Show 8 quoted lines
> This patch works fine for me.
>
> -->8--
>
> 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>
Show 49 quoted lines
> ---
> t/lib-git-svn.sh | 25 +++++++++++++++++++++++--
> 1 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
> index 9ee35e7..9decd2e 100644
> --- a/t/lib-git-svn.sh
> +++ b/t/lib-git-svn.sh
> @@ -49,8 +49,28 @@ poke() {
> test-chmtime +1 "$1"
> }
>
> -SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'}
> -SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'}
> +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
> +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 () {
> if test -z "$SVN_HTTPD_PORT"
> @@ -66,6 +86,7 @@ ServerName "git-svn test"
> ServerRoot "$GIT_DIR"
> DocumentRoot "$GIT_DIR"
> PidFile "$GIT_DIR/httpd.pid"
> +LockFile logs/accept.lock
> Listen 127.0.0.1:$SVN_HTTPD_PORT
> LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
> LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so
> --
> 1.5.5.rc0.23.gf91eb