svn commit: r1846658 - /subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/davautocheck.sh

[br...@apache.org]

Author: brane
Date: Thu Nov 15 14:26:38 2018
New Revision: 1846658

URL: http://svn.apache.org/viewvc?rev=1846658&view=rev
Log:
On the mod-dav-svn-expressions branch: Fix the DAV tests.

It turns out that even vanilla mod_dav_svn doesn't handle the LocationMatch
block correctly. So use 'SetEnv' to set the environment variable that's
later on used in the suffix expression for SVNParentPath.

* subversion/tests/cmdline/davautocheck.sh
  (LOAD_MOD_ENV): New; load the mod_env module.
  (MATCH_REPOSITORIES): Set this explicitly in the server config.
  Use a plain <Location> block for the expressions test configuration.

Modified:
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/davautocheck.sh

Modified: subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/davautocheck.sh?rev=1846658&r1=1846657&r2=1846658&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/davautocheck.sh Thu Nov 15 14:26:38 2018
@@ -297,6 +297,9 @@ LOAD_MOD_MIME=$(get_loadmodule_config mo
 LOAD_MOD_ALIAS=$(get_loadmodule_config mod_alias) \
   || fail "ALIAS module not found"
 
+LOAD_MOD_ENV=$(get_loadmodule_config mod_env) \
+  || fail "ENV module not found"
+
 # needed for Auth*, Require, etc. directives
 LOAD_MOD_AUTH=$(get_loadmodule_config mod_auth) \
   || {
@@ -451,6 +454,7 @@ $LOAD_MOD_SSL
 $LOAD_MOD_LOG_CONFIG
 $LOAD_MOD_MIME
 $LOAD_MOD_ALIAS
+$LOAD_MOD_ENV
 $LOAD_MOD_UNIXD
 $LOAD_MOD_DAV
 $LOAD_MOD_DAV_FS
@@ -547,6 +551,8 @@ Alias /fsdavroot $ABS_BUILDDIR/$TESTDIR/
 <Directory $ABS_BUILDDIR/$TESTDIR/fsdavroot>
   DAV filesystem
 </Directory>
+
+SetEnv MATCH_REPOSITORIES repositories
 __EOF__
 
 location_common() {
@@ -571,12 +577,13 @@ __EOF__
 
 # If httpd supports expressions, use them in the main repository location
 if [ "$HTTPD_MMN" -ge "20111025" ]; then
-  location_common '<LocationMatch "^/svn-test-work/(?<REPOSITORIES>repositories)">'
+#  location_common '<LocationMatch "^/svn-test-work/(?<REPOSITORIES>repositories)">'
+location_common '<Location /svn-test-work/repositories>'
   cat >> "$HTTPD_CFG" <<__EOF__
   SVNParentPath     "$ABS_BUILDDIR/$TESTDIR" "%{env:MATCH_REPOSITORIES}"
   Require           valid-user
   ${SVN_PATH_AUTHZ_LINE}
-</LocationMatch>
+</Location>
 __EOF__
 else
   location_common '<Location /svn-test-work/repositories>'