svn commit: r1892121 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

[ds...@apache.org]

Author: dsahlberg
Date: Mon Aug  9 01:25:26 2021
New Revision: 1892121

URL: http://svn.apache.org/viewvc?rev=1892121&view=rev
Log:
Fix an error message when running make davautocheck.

* subversion/tests/cmdline/davautocheck.sh: 
  (location_common_without_authz): New function copied from location_common
    but don't add AuthzSVNAccessFile.
  (location_common): Removed rules already in location_common_without_autz,
    calling this function and adding AuthzSVNAccessFile afterwards.
  (<Location /authz-test-work/in-repos-authz>): Use new function to add
    the common section.

Found by: danielsh

Discussed on dev@: http://mail-archives.apache.org/mod_mbox/subversion-dev/202107.mbox/%3C20210716130047.GA31027%40tarpaulin.shahaf.local2%3E (second part of the mail).

Modified:
    subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1892121&r1=1892120&r2=1892121&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Mon Aug  9 01:25:26 2021
@@ -547,10 +547,9 @@ Alias /fsdavroot $ABS_BUILDDIR/subversio
 
 <Location /svn-test-work/repositories>
 __EOF__
-location_common() {
+location_common_without_authz() {
 cat >> "$HTTPD_CFG" <<__EOF__
   DAV               svn
-  AuthzSVNAccessFile "$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
   AuthType          Basic
   AuthName          "Subversion Repository"
   AuthUserFile      $HTTPD_USERS
@@ -560,6 +559,12 @@ cat >> "$HTTPD_CFG" <<__EOF__
   SVNBlockRead      ${BLOCK_READ_SETTING}
 __EOF__
 }
+location_common() {
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+  AuthzSVNAccessFile "$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
+__EOF__
+}
 location_common
 cat >> "$HTTPD_CFG" <<__EOF__
   SVNParentPath     "$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
@@ -612,7 +617,7 @@ cat >> "$HTTPD_CFG" <<__EOF__
 </Location>
 <Location /authz-test-work/in-repos-authz>
 __EOF__
-location_common
+location_common_without_authz
 cat >> "$HTTPD_CFG" <<__EOF__
   SVNParentPath     "$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
   Require           valid-user