* [PATCH 0/2] fix git-svn HTTP tests under Apache 2.4
@ 2016-07-23 4:26 Eric Wong
2016-07-23 4:26 ` [PATCH 1/2] t/t91*: do not say how to avoid the tests Eric Wong
2016-07-23 4:26 ` [PATCH 2/2] git svn: migrate tests to use lib-httpd Eric Wong
0 siblings, 2 replies; 4+ messages in thread
From: Eric Wong @ 2016-07-23 4:26 UTC (permalink / raw)
To: git; +Cc: Eric Wong, Clemens Buchacher, Michael J Gruber
This resurrects the series started by Michael in April 2015 at:
https://public-inbox.org/git/cover.1428505184.git.git@drmicha.warpmail.net/T/
But only keeps only his first patch. PATCH 2/2 reuses the
work Clemens introduced in t/lib-httpd.sh back in 2008 to
enable mod_dav_svn.
The following changes since commit 08bb3500a2a718c3c78b0547c68601cafa7a8fd9:
Sixth batch of topics for 2.10 (2016-07-19 13:26:16 -0700)
are available in the git repository at:
git://bogomips.org/git-svn.git svn-httpd
for you to fetch changes up to cbc1a1fbd2911b851467862b7163c303a14b17ab:
git svn: migrate tests to use lib-httpd (2016-07-23 03:31:21 +0000)
----------------------------------------------------------------
Eric Wong (1):
git svn: migrate tests to use lib-httpd
Michael J Gruber (1):
t/t91*: do not say how to avoid the tests
t/lib-git-svn.sh | 91 +++++----------------------
t/lib-httpd.sh | 8 ++-
t/lib-httpd/apache.conf | 4 +-
t/t9100-git-svn-basic.sh | 2 -
t/t9115-git-svn-dcommit-funky-renames.sh | 7 ++-
t/t9118-git-svn-funky-branch-names.sh | 2 +-
t/t9120-git-svn-clone-with-percent-escapes.sh | 2 +-
t/t9142-git-svn-shallow-clone.sh | 2 +-
t/t9158-git-svn-mergeinfo.sh | 2 -
t/t9160-git-svn-preserve-empty-dirs.sh | 1 -
10 files changed, 30 insertions(+), 91 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] t/t91*: do not say how to avoid the tests
2016-07-23 4:26 [PATCH 0/2] fix git-svn HTTP tests under Apache 2.4 Eric Wong
@ 2016-07-23 4:26 ` Eric Wong
2016-07-23 4:26 ` [PATCH 2/2] git svn: migrate tests to use lib-httpd Eric Wong
1 sibling, 0 replies; 4+ messages in thread
From: Eric Wong @ 2016-07-23 4:26 UTC (permalink / raw)
To: git; +Cc: Eric Wong, Clemens Buchacher, Michael J Gruber
From: Michael J Gruber <git@drmicha.warpmail.net>
Some of the tests "say" how to stop the svn tests from running, some do
not.
The test suite is directed at people reading t/README where we keep all
information about running the test suite (partly, with options etc.).
Remove said "say" occurences.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Eric Wong <e@80x24.org>
---
t/t9100-git-svn-basic.sh | 2 --
t/t9158-git-svn-mergeinfo.sh | 2 --
t/t9160-git-svn-preserve-empty-dirs.sh | 1 -
3 files changed, 5 deletions(-)
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 28082b1..c23b11f 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -8,8 +8,6 @@ GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
. ./lib-git-svn.sh
-say 'define NO_SVN_TESTS to skip git svn tests'
-
case "$GIT_SVN_LC_ALL" in
*.UTF-8)
test_set_prereq UTF8
diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh
index 13f78f2..a875b45 100755
--- a/t/t9158-git-svn-mergeinfo.sh
+++ b/t/t9158-git-svn-mergeinfo.sh
@@ -7,8 +7,6 @@ test_description='git svn mergeinfo propagation'
. ./lib-git-svn.sh
-say 'define NO_SVN_TESTS to skip git svn tests'
-
test_expect_success 'initialize source svn repo' '
svn_cmd mkdir -m x "$svnrepo"/trunk &&
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index b4a4434..0ede3cf 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -11,7 +11,6 @@ local Git repository with placeholder files.'
. ./lib-git-svn.sh
-say 'define NO_SVN_TESTS to skip git svn tests'
GIT_REPO=git-svn-repo
test_expect_success 'initialize source svn repo containing empty dirs' '
--
EW
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] git svn: migrate tests to use lib-httpd
2016-07-23 4:26 [PATCH 0/2] fix git-svn HTTP tests under Apache 2.4 Eric Wong
2016-07-23 4:26 ` [PATCH 1/2] t/t91*: do not say how to avoid the tests Eric Wong
@ 2016-07-23 4:26 ` Eric Wong
2016-07-25 17:42 ` Junio C Hamano
1 sibling, 1 reply; 4+ messages in thread
From: Eric Wong @ 2016-07-23 4:26 UTC (permalink / raw)
To: git; +Cc: Eric Wong, Clemens Buchacher, Michael J Gruber
This allows us to use common test infrastructure and parallelize
the tests. For now, GIT_SVN_TEST_HTTPD=true needs to be set to
enable the SVN HTTP tests because we reuse the same test cases
for both file:// and http:// SVN repositories. SVN_HTTPD_PORT
is no longer honored.
Tested under Apache 2.2 and 2.4 on Debian 7.x (wheezy) and
8.x (jessie), respectively.
Cc: Clemens Buchacher <drizzd@aon.at>
Cc: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Eric Wong <e@80x24.org>
---
t/lib-git-svn.sh | 91 +++++----------------------
t/lib-httpd.sh | 8 ++-
t/lib-httpd/apache.conf | 4 +-
t/t9115-git-svn-dcommit-funky-renames.sh | 7 ++-
t/t9118-git-svn-funky-branch-names.sh | 2 +-
t/t9120-git-svn-clone-with-percent-escapes.sh | 2 +-
t/t9142-git-svn-shallow-clone.sh | 2 +-
7 files changed, 30 insertions(+), 86 deletions(-)
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index fb88232..688313e 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -65,81 +65,22 @@ svn_cmd () {
svn "$orig_svncmd" --config-dir "$svnconf" "$@"
}
-prepare_httpd () {
- 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
- echo >&2 '*** error: Apache not found'
- return 1
- fi
- 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
- echo >&2 '*** error: Apache module dir not found'
- return 1
- fi
- if test ! -f "$SVN_HTTPD_MODULE_PATH/mod_dav_svn.so"
- then
- echo >&2 '*** error: Apache module "mod_dav_svn" not found'
- return 1
- fi
-
- repo_base_path="${1-svn}"
- mkdir "$GIT_DIR"/logs
-
- cat > "$GIT_DIR/httpd.conf" <<EOF
-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
-<Location /$repo_base_path>
- DAV svn
- SVNPath "$rawsvnrepo"
-</Location>
-EOF
-}
-
-start_httpd () {
- if test -z "$SVN_HTTPD_PORT"
- then
- echo >&2 'SVN_HTTPD_PORT is not defined!'
- return
- fi
-
- prepare_httpd "$1" || return 1
-
- "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start
- svnrepo="http://127.0.0.1:$SVN_HTTPD_PORT/$repo_base_path"
-}
-
-stop_httpd () {
- test -z "$SVN_HTTPD_PORT" && return
- test ! -f "$GIT_DIR/httpd.conf" && return
- "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k stop
+maybe_start_httpd () {
+ loc=${1-svn}
+
+ test_tristate GIT_SVN_TEST_HTTPD
+ case $GIT_SVN_TEST_HTTPD in
+ true)
+ . "$TEST_DIRECTORY"/lib-httpd.sh
+ LIB_HTTPD_SVN="$loc"
+ start_httpd
+ ;;
+ *)
+ stop_httpd () {
+ : noop
+ }
+ ;;
+ esac
}
convert_to_rev_db () {
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index ac2cbee..435a374 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -24,7 +24,7 @@
# LIB_HTTPD_MODULE_PATH web server modules path
# LIB_HTTPD_PORT listening port
# LIB_HTTPD_DAV enable DAV
-# LIB_HTTPD_SVN enable SVN
+# LIB_HTTPD_SVN enable SVN at given location (e.g. "svn")
# LIB_HTTPD_SSL enable SSL
#
# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
@@ -162,8 +162,10 @@ prepare_httpd() {
if test -n "$LIB_HTTPD_SVN"
then
HTTPD_PARA="$HTTPD_PARA -DSVN"
- rawsvnrepo="$HTTPD_ROOT_PATH/svnrepo"
- svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/svn"
+ LIB_HTTPD_SVNPATH="$rawsvnrepo"
+ svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/"
+ svnrepo="$svnrepo$LIB_HTTPD_SVN"
+ export LIB_HTTPD_SVN LIB_HTTPD_SVNPATH
fi
fi
}
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 018a83a..c3e6313 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -208,8 +208,8 @@ RewriteRule ^/half-auth-complete/ - [E=AUTHREQUIRED:yes]
<IfDefine SVN>
LoadModule dav_svn_module modules/mod_dav_svn.so
- <Location /svn>
+ <Location /${LIB_HTTPD_SVN}>
DAV svn
- SVNPath svnrepo
+ SVNPath "${LIB_HTTPD_SVNPATH}"
</Location>
</IfDefine>
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index a87d3d3..64bb495 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -8,9 +8,10 @@ test_description='git svn dcommit can commit renames of files with ugly names'
. ./lib-git-svn.sh
test_expect_success 'load repository with strange names' '
- svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9115/funky-names.dump &&
- start_httpd gtk+
- '
+ svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
+'
+
+maybe_start_httpd gtk+
test_expect_success 'init and fetch repository' '
git svn init "$svnrepo" &&
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index ecb1fed..41a0266 100755
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup svnrepo' '
"$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
"$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
- start_httpd
+ maybe_start_httpd
'
# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index 59465b1..b28a174 100755
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -15,7 +15,7 @@ test_expect_success 'setup svnrepo' '
svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
"$svnrepo/pr ject/tags/v1" &&
rm -rf project &&
- start_httpd
+ maybe_start_httpd
'
test_expect_success 'test clone with percent escapes' '
diff --git a/t/t9142-git-svn-shallow-clone.sh b/t/t9142-git-svn-shallow-clone.sh
index e21ee5f..9ee23be 100755
--- a/t/t9142-git-svn-shallow-clone.sh
+++ b/t/t9142-git-svn-shallow-clone.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup test repository' '
svn_cmd add foo &&
svn_cmd commit -m "add foo"
) &&
- start_httpd
+ maybe_start_httpd
'
test_expect_success 'clone trunk with "-r HEAD"' '
--
EW
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] git svn: migrate tests to use lib-httpd
2016-07-23 4:26 ` [PATCH 2/2] git svn: migrate tests to use lib-httpd Eric Wong
@ 2016-07-25 17:42 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2016-07-25 17:42 UTC (permalink / raw)
To: Eric Wong; +Cc: git, Clemens Buchacher, Michael J Gruber
Eric Wong <e@80x24.org> writes:
> This allows us to use common test infrastructure and parallelize
> the tests. For now, GIT_SVN_TEST_HTTPD=true needs to be set to
> enable the SVN HTTP tests because we reuse the same test cases
> for both file:// and http:// SVN repositories. SVN_HTTPD_PORT
> is no longer honored.
>
> Tested under Apache 2.2 and 2.4 on Debian 7.x (wheezy) and
> 8.x (jessie), respectively.
>
> Cc: Clemens Buchacher <drizzd@aon.at>
> Cc: Michael J Gruber <git@drmicha.warpmail.net>
> Signed-off-by: Eric Wong <e@80x24.org>
> ---
> t/lib-git-svn.sh | 91 +++++----------------------
> t/lib-httpd.sh | 8 ++-
> t/lib-httpd/apache.conf | 4 +-
> t/t9115-git-svn-dcommit-funky-renames.sh | 7 ++-
> t/t9118-git-svn-funky-branch-names.sh | 2 +-
> t/t9120-git-svn-clone-with-percent-escapes.sh | 2 +-
> t/t9142-git-svn-shallow-clone.sh | 2 +-
> 7 files changed, 30 insertions(+), 86 deletions(-)
Nice code reduction ;-)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-07-25 17:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-23 4:26 [PATCH 0/2] fix git-svn HTTP tests under Apache 2.4 Eric Wong
2016-07-23 4:26 ` [PATCH 1/2] t/t91*: do not say how to avoid the tests Eric Wong
2016-07-23 4:26 ` [PATCH 2/2] git svn: migrate tests to use lib-httpd Eric Wong
2016-07-25 17:42 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).