Author: svn-role
Date: Sun Mar 27 14:53:30 2022
New Revision: 1899242
URL: http://svn.apache.org/viewvc?rev=1899242&view=rev
Log:
Merge r1891908 from trunk:
* r1891908
Fix a bug where «make davautocheck» immediately after configure failed
hard because of an unbuilt dependency.
Justification:
Small fix. Prevents spurious hard fails of 'make davautocheck'.
Votes:
+1: danielsh, dsahlberg, markphip
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/Makefile.in
subversion/branches/1.14.x/STATUS
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1891908
Modified: subversion/branches/1.14.x/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/Makefile.in?rev=1899242&r1=1899241&r2=1899242&view=diff
==============================================================================
--- subversion/branches/1.14.x/Makefile.in (original)
+++ subversion/branches/1.14.x/Makefile.in Sun Mar 27 14:53:30 2022
@@ -633,12 +633,12 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
# First, set up Apache as documented in
# subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
@$(MAKE) check BASE_URL=http://localhost
# Automatically configure and run Apache httpd on a random port, and then
# run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
@APXS=$(APXS) MAKE=$(MAKE) $(SHELL)
$(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899242&r1=1899241&r2=1899242&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 14:53:30 2022
@@ -108,14 +108,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1891908
- Fix a bug where «make davautocheck» immediately after configure failed
- hard because of an unbuilt dependency.
- Justification:
- Small fix. Prevents spurious hard fails of 'make davautocheck'.
- Votes:
- +1: danielsh, dsahlberg, markphip
-
* r1885199
swig-py: Skip some tests on Python 2 if default encoding is 'utf-8'.
Justification:
