Re: [PATCH resend 1/2] Make git-svn tests behave better on OS X
- From
- Eric Wong <normalperson@yhbt.net>
- Date
- Mar 21, 2008, 06:58 UTC
- Message-ID
- <20080321065824.GB28144@muzzle>
- In-Reply-To
- <1206043729-61810-1-git-send-email-kevin@sb.org>
Kevin Ballard <kevin@sb.org> wrote:
> Give lib-git-svn.sh some better defaults for OS X. > Explicitly define the LockFile so httpd will actually start under OS X > > Signed-off-by: Kevin Ballard <kevin@sb.org>
Thanks,
Acked-by: Eric Wong <normalperson@yhbt.net>
I seem to recall seeing a RHEL or CentOS machine using /usr/sbin/httpd, somewhere, too. Any non-Debian users care to comment/add more paths?
Show 34 quoted lines
> ---
> t/lib-git-svn.sh | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
> index 9ee35e7..1266609 100644
> --- a/t/lib-git-svn.sh
> +++ b/t/lib-git-svn.sh
> @@ -49,8 +49,14 @@ 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'}
> +if test `uname -s` = Darwin
> +then
> + SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/libexec/apache2'}
> + SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/httpd'}
> +else
> + SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'}
> + SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'}
> +fi
>
> start_httpd () {
> if test -z "$SVN_HTTPD_PORT"
> @@ -66,6 +72,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
> --