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
This commit is contained in:
commit
f8d0215c81
@ -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"
|
||||
|
@ -96,7 +96,7 @@ test_expect_success FUNNYNAMES \
|
||||
"git rm -f 'space embedded' 'tab embedded' 'newline
|
||||
embedded'"
|
||||
|
||||
test_expect_success RO_DIR 'Test that "git rm -f" fails if its rm fails' '
|
||||
test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
|
||||
chmod a-w . &&
|
||||
test_must_fail git rm -f baz &&
|
||||
chmod 775 .
|
||||
|
@ -17,11 +17,10 @@ test_expect_success 'setup test repository' '
|
||||
> foo &&
|
||||
svn_cmd add foo &&
|
||||
svn_cmd commit -m "add foo"
|
||||
)
|
||||
) &&
|
||||
start_httpd
|
||||
'
|
||||
|
||||
start_httpd
|
||||
|
||||
test_expect_success 'clone trunk with "-r HEAD"' '
|
||||
git svn clone -r HEAD "$svnrepo/trunk" g &&
|
||||
( cd g && git rev-parse --symbolic --verify HEAD )
|
||||
|
@ -16,7 +16,7 @@ code and message.'
|
||||
# snapshot settings
|
||||
|
||||
test_expect_success 'setup' "
|
||||
test_commit 'SnapshotTests' 'i can has snapshot?'
|
||||
test_commit 'SnapshotTests' 'i can has snapshot'
|
||||
"
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user