diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-19 08:26:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-19 08:26:17 -0800 |
| commit | f8d0215c8111e586d2d811a451aff1848bae4d96 (patch) | |
| tree | 59ac764be32f6b46e672a751db46519b7dc1b004 /t/lib-git-svn.sh | |
| parent | 305579f78d3a1bd5fa7a9ce2038b7f7afca8b1e6 (diff) | |
| parent | 1b3187ba6efdb216a9b45dac087aa4bfba0b90ae (diff) | |
| download | git-f8d0215c8111e586d2d811a451aff1848bae4d96.tar.gz | |
Merge branch 'rj/maint-test-fixes' into maint
* rj/maint-test-fixes:
t9501-*.sh: Fix a test failure on Cygwin
lib-git-svn.sh: Add check for mis-configured web server variables
lib-git-svn.sh: Avoid setting web server variables unnecessarily
t9142: Move call to start_httpd into the setup test
t3600-rm.sh: Don't pass a non-existent prereq to test #15
Diffstat (limited to 't/lib-git-svn.sh')
| -rw-r--r-- | t/lib-git-svn.sh | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 92d6d31942..6a9d975723 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -68,28 +68,41 @@ svn_cmd () { svn "$orig_svncmd" --config-dir "$svnconf" "$@" } -for d in \ - "$SVN_HTTPD_PATH" \ - /usr/sbin/apache2 \ - /usr/sbin/httpd \ -; do - if test -f "$d" +if test -n "$SVN_HTTPD_PORT" +then + 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 + if test -z "$SVN_HTTPD_PATH" then - SVN_HTTPD_PATH="$d" - break + skip_all='skipping git svn tests, Apache not found' + test_done fi -done -for d in \ - "$SVN_HTTPD_MODULE_PATH" \ - /usr/lib/apache2/modules \ - /usr/libexec/apache2 \ -; do - if test -d "$d" + 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 + if test -z "$SVN_HTTPD_MODULE_PATH" then - SVN_HTTPD_MODULE_PATH="$d" - break + skip_all='skipping git svn tests, Apache module dir not found' + test_done fi -done +fi start_httpd () { repo_base_path="$1" |