Noorul Islam K M <noo...@collab.net> writes:
> Daniel came up with idea of extending Makefile.in to support 'make
> check' variants.
>
> 1. 'make check' with svnserve -T
> 2. 'make check' with svnadmin create --pre-1.x-compatible (where x in
> (1.4, 1.5, 1.6, 1.7))
> 3. 'make check' with SVNPathAuthz short_circuit. As of now this is
> supported by stsp's Makefile.svn. So this will be bringing that into
> Makefile.in
>
Attached is the patch for #3.
Log
[[[
Allow davautocheck to run optionally by setting path based authz as
"short_circuit".
* Makefile.in
(davautocheck): Document environment parameter.
* subversion/tests/cmdline/davautocheck.sh:
Accept and use $USE_AUTHZ_SHORT_CIRCUIT environment parameter.
]]]
Thanks and Regards
Noorul
Index: Makefile.in
===================================================================
--- Makefile.in (revision 1140431)
+++ Makefile.in (working copy)
@@ -501,7 +501,8 @@
# Automatically configure and run Apache httpd on a random port, and then
# run make check.
davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
- @# Takes MODULE_PATH and USE_HTTPV1 in the environment.
+ @# Takes MODULE_PATH, USE_HTTPV1 and USE_AUTHZ_SHORT_CIRCUIT in the
+ @# environment.
@APXS=$(APXS) bash
$(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
# First, run:
Index: subversion/tests/cmdline/davautocheck.sh
===================================================================
--- subversion/tests/cmdline/davautocheck.sh (revision 1140431)
+++ subversion/tests/cmdline/davautocheck.sh (working copy)
@@ -67,6 +67,9 @@
#
# To prevent the server from advertising httpv2, pass USE_HTTPV1 in
# the environment.
+#
+# To use "short_circuit" value for "SvnPathAuthz" directive set
+# USE_AUTHZ_SHORT_CIRCUIT=yes in the environment.
#
# Passing --no-tests as argv[1] will have the script start a server
# but not run any tests.
@@ -160,6 +163,12 @@
ADVERTISE_V2_PROTOCOL=off
fi
+# Pick up $USE_AUTHZ_SHORT_CIRCUIT
+SVN_PATH_AUTHZ=""
+if [ ${USE_AUTHZ_SHORT_CIRCUIT:+set} ]; then
+ SVN_PATH_AUTHZ="SVNPathAuthz short_circuit"
+fi
+
# Find the source and build directories. The build dir can be found if it is
# the current working dir or the source dir.
pushd ${SCRIPTDIR}/../../../ > /dev/null
@@ -326,6 +335,7 @@
AuthUserFile $HTTPD_USERS
Require valid-user
SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
+ ${SVN_PATH_AUTHZ}
</Location>
<Location /svn-test-work/local_tmp/repos>
DAV svn
@@ -336,6 +346,7 @@
AuthUserFile $HTTPD_USERS
Require valid-user
SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
+ ${SVN_PATH_AUTHZ}
</Location>
RedirectMatch permanent ^/svn-test-work/repositories/REDIRECT-PERM-(.*)\$
/svn-test-work/repositories/\$1
RedirectMatch ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)\$
/svn-test-work/repositories/\$1
