Author: svn-role
Date: Sun Mar 25 04:00:30 2018
New Revision: 1827691
URL: http://svn.apache.org/viewvc?rev=1827691&view=rev
Log:
Merge the r1827105 group from trunk:
* r1827105, r1827114
Add testsuite support for testing FSFS with block-read enabled.
Justification:
Allows testing the code responsible for issue 4725.
Votes:
+1: philip, julianfoad, stefan2
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 25 04:00:30 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1826747
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1826747,1827105,1827114
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1827691&r1=1827690&r2=1827691&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Mar 25 04:00:30 2018
@@ -67,11 +67,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1827105, r1827114
- Add testsuite support for testing FSFS with block-read enabled.
- Justification:
- Allows testing the code responsible for issue 4725.
- Votes:
- +1: philip, julianfoad, stefan2
-
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh?rev=1827691&r1=1827690&r2=1827691&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh Sun Mar
25 04:00:30 2018
@@ -52,6 +52,7 @@
# Run this script with the test suite name and test number to execute just this
# test:
# subversion/tests/cmdline/davautocheck.sh basic 4
+# This script can also be invoked via "make davautocheck".
#
# If the temporary directory is not deleted, it can be reused for further
# manual DAV protocol interoperation testing. HTTPD must be started by
@@ -65,18 +66,19 @@
# APXS=/opt/svn/1.4.x/bin/apxs MODULE_PATH=/opt/svn/1.4.x/modules \
# subversion/tests/cmdline/davautocheck.sh
#
-# To prevent the server from advertising httpv2, pass USE_HTTPV1 in
-# the environment.
+# Other environment variables that are interpreted by this script:
#
-# To enable "SVNCacheRevProps on" set CACHE_REVPROPS in the environment.
+# make davautocheck CACHE_REVPROPS=1 # sets SVNCacheRevProps on
#
-# To test over https set USE_SSL in the environment.
+# make davautocheck BLOCK_READ=1 # sets SVNBlockRead on
#
-# To use value for "SVNPathAuthz" directive set SVN_PATH_AUTHZ with
-# appropriate value in the environment.
+# make davautocheck USE_SSL=1 # run over https
#
-# To load an MPM module for Apache 2.4 use APACHE_MPM=event in the
-# environment.
+# make davautocheck USE_HTTPV1=1 # sets SVNAdvertiseV2Protocol off
+#
+# make davautocheck APACHE_MPM=event # specifies the 2.4 MPM
+#
+# make davautocheck SVN_PATH_AUTHZ=short_circuit # SVNPathAuthz short_circuit
#
# Passing --no-tests as argv[1] will have the script start a server
# but not run any tests. Passing --gdb or --lldb will do the same, and in
@@ -222,6 +224,11 @@ if [ ${CACHE_REVPROPS:+set} ]; then
CACHE_REVPROPS_SETTING=on
fi
+BLOCK_READ_SETTING=off
+if [ ${BLOCK_READ:+set} ]; then
+ BLOCK_READ_SETTING=on
+fi
+
if [ ${MODULE_PATH:+set} ]; then
MOD_DAV_SVN="$MODULE_PATH/mod_dav_svn.so"
MOD_AUTHZ_SVN="$MODULE_PATH/mod_authz_svn.so"
@@ -519,39 +526,41 @@ CustomLog "$HTTPD_ROOT/ops" "%
</Directory>
<Location /svn-test-work/repositories>
+__EOF__
+location_common() {
+cat >> "$HTTPD_CFG" <<__EOF__
DAV svn
- SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
AuthType Basic
AuthName "Subversion Repository"
AuthUserFile $HTTPD_USERS
- Require valid-user
SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
+ SVNListParentPath On
+ SVNBlockRead ${BLOCK_READ_SETTING}
+__EOF__
+}
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
+ SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
+ Require valid-user
${SVN_PATH_AUTHZ_LINE}
</Location>
<Location /ddt-test-work/repositories>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
Require valid-user
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
${SVN_PATH_AUTHZ_LINE}
DontDoThatConfigFile "$HTTPD_DONTDOTHAT"
</Location>
<Location /svn-test-work/local_tmp/repos>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp/repos"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
Require valid-user
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
${SVN_PATH_AUTHZ_LINE}
</Location>
<Location /authz-test-work/anon>
@@ -574,84 +583,54 @@ CustomLog "$HTTPD_ROOT/ops" "%
${SVN_PATH_AUTHZ_LINE}
</Location>
<Location /authz-test-work/mixed>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
Require valid-user
Satisfy Any
${SVN_PATH_AUTHZ_LINE}
</Location>
<Location /authz-test-work/mixed-noauthwhenanon>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
Require valid-user
AuthzSVNNoAuthWhenAnonymousAllowed On
SVNPathAuthz On
</Location>
<Location /authz-test-work/authn>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
Require valid-user
${SVN_PATH_AUTHZ_LINE}
</Location>
<Location /authz-test-work/authn-anonoff>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
Require valid-user
AuthzSVNAnonymous Off
SVNPathAuthz On
</Location>
<Location /authz-test-work/authn-lcuser>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
Require valid-user
AuthzForceUsernameCase Lower
${SVN_PATH_AUTHZ_LINE}
</Location>
<Location /authz-test-work/authn-group>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
AuthGroupFile $HTTPD_GROUPS
Require group random
AuthzSVNAuthoritative Off
@@ -659,15 +638,10 @@ CustomLog "$HTTPD_ROOT/ops" "%
</Location>
<IfModule mod_authz_core.c>
<Location /authz-test-work/sallrany>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
AuthzSendForbiddenOnFailure On
Satisfy All
<RequireAny>
@@ -677,15 +651,10 @@ CustomLog "$HTTPD_ROOT/ops" "%
${SVN_PATH_AUTHZ_LINE}
</Location>
<Location /authz-test-work/sallrall>
- DAV svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp"
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
- SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
- SVNCacheRevProps ${CACHE_REVPROPS_SETTING}
- SVNListParentPath On
- AuthType Basic
- AuthName "Subversion Repository"
- AuthUserFile $HTTPD_USERS
AuthzSendForbiddenOnFailure On
Satisfy All
<RequireAll>
Modified:
subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh?rev=1827691&r1=1827690&r2=1827691&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
Sun Mar 25 04:00:30 2018
@@ -31,6 +31,14 @@
# distribution; it's easiest to just run it as "make svnserveautocheck".
# Like "make check", you can specify further options like
# "make svnserveautocheck FS_TYPE=bdb TESTS=subversion/tests/cmdline/basic.py".
+#
+# Other environment variables that can be passed:
+#
+# make svnserveautocheck CACHE_REVPROPS=1 # run svnserve --cache-revprops
+#
+# make svnserveautocheck BLOCK_READ=1 # run svnserve --block-read on
+#
+# make svnserveautocheck THREADED=1 # run svnserve -T
PYTHON=${PYTHON:-python}
@@ -124,6 +132,10 @@ if [ ${CACHE_REVPROPS:+set} ]; then
SVNSERVE_ARGS="$SVNSERVE_ARGS --cache-revprops on"
fi
+if [ ${BLOCK_READ:+set} ]; then
+ SVNSERVE_ARGS="$SVNSERVE_ARGS --block-read on"
+fi
+
"$SERVER_CMD" -d -r "$ABS_BUILDDIR/subversion/tests/cmdline" \
--listen-host 127.0.0.1 \
--listen-port $SVNSERVE_PORT \
