httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jchamp...@apache.org
Subject svn commit: r1782066 - /httpd/httpd/branches/trunk-test-integration/Makefile.in
Date Tue, 07 Feb 2017 19:45:12 GMT
Author: jchampion
Date: Tue Feb  7 19:45:12 2017
New Revision: 1782066

URL: http://svn.apache.org/viewvc?rev=1782066&view=rev
Log:
check: silence ServerName warnings with MPM DSOs

When using shared MPMs, `httpd -V` will perform a full configuration
check, which emits warnings when there is no defined ServerName.
Unfortunately the test suite does a -V check for every test section,
spamming the output with noise.

Work around this by just uncommenting the example ServerName in the test
config.

Modified:
    httpd/httpd/branches/trunk-test-integration/Makefile.in

Modified: httpd/httpd/branches/trunk-test-integration/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/trunk-test-integration/Makefile.in?rev=1782066&r1=1782065&r2=1782066&view=diff
==============================================================================
--- httpd/httpd/branches/trunk-test-integration/Makefile.in (original)
+++ httpd/httpd/branches/trunk-test-integration/Makefile.in Tue Feb  7 19:45:12 2017
@@ -332,6 +332,7 @@ check-conf:
 	                    -e 's#@@Port@@#$(PORT)#g' \
 	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	                    -e 's#$(prefix)#$(top_builddir)/check#g' \
+	                    -e 's/^#ServerName /ServerName /' \
 	                    -e '/@@LoadModule@@/d' \
 	                    < $$i; \
 	            else \
@@ -340,6 +341,7 @@ check-conf:
 	                    -e 's#@@Port@@#$(PORT)#g' \
 	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	                    -e 's#$(prefix)#$(top_builddir)/check#g' \
+	                    -e 's/^#ServerName /ServerName /' \
 	                    -e 'p' \
 	                    < $$i; \
 	                if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \
@@ -385,6 +387,7 @@ check-conf:
 	                    -e 's#@@Port@@#$(PORT)#g' \
 	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	                    -e 's#$(prefix)#$(top_builddir)/check#g' \
+	                    -e 's/^#ServerName /ServerName /' \
 	                    < $$i; \
 	            fi \
 	        ) > $(top_builddir)/check/conf/$$i; \



Mime
View raw message