{"thread":{"id":"43812","subject":"[PATCH] Make git-svn tests behave better on OS X","startedAt":"2008-03-08T22:28:08Z","lastAt":"2008-03-08T22:28:08Z","messageCount":1,"participants":["Kevin Ballard"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"299037","messageId":"1205015288-9399-1-git-send-email-kevin@sb.org","threadId":"43812","inReplyTo":null,"subject":"[PATCH] Make git-svn tests behave better on OS X","fromName":"Kevin Ballard","fromEmail":"kevin@sb.org","sentAt":"2008-03-08T22:28:08Z","receivedAt":"2008-03-08T22:28:08Z","isPatch":true,"sender":{"key":"kevin@sb.org","avatar":"https://avatars.githubusercontent.com/u/714?v=4"},"body":"Give lib-git-svn.sh some better defaults for OS X.\nExplicitly define the LockFile so httpd will actually start under OS X\n\nSigned-off-by: Kevin Ballard <kevin@sb.org>\n---\n t/lib-git-svn.sh |   11 +++++++++--\n 1 files changed, 9 insertions(+), 2 deletions(-)\n\ndiff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh\nindex 9ee35e7..1266609 100644\n--- a/t/lib-git-svn.sh\n+++ b/t/lib-git-svn.sh\n@@ -49,8 +49,14 @@ poke() {\n \ttest-chmtime +1 \"$1\"\n }\n \n-SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'}\n-SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'}\n+if test `uname -s` = Darwin\n+then\n+\tSVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/libexec/apache2'}\n+\tSVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/httpd'}\n+else\n+\tSVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'}\n+\tSVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'}\n+fi\n \n start_httpd () {\n \tif test -z \"$SVN_HTTPD_PORT\"\n@@ -66,6 +72,7 @@ ServerName \"git-svn test\"\n ServerRoot \"$GIT_DIR\"\n DocumentRoot \"$GIT_DIR\"\n PidFile \"$GIT_DIR/httpd.pid\"\n+LockFile logs/accept.lock\n Listen 127.0.0.1:$SVN_HTTPD_PORT\n LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so\n LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so\n-- \n1.5.4.3.487.g1eab2.dirty\n\n"}]}