Commit 6ab8b699 authored by Jacob Champion's avatar Jacob Champion
Browse files

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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1782066 13f79535-47bb-0310-9956-ffa450edef68
parent 79642a4f

Makefile.in

+3 −0
Original line number Original line Diff line number Diff line
@@ -332,6 +332,7 @@ check-conf: 
	                    -e 's#@@Port@@#$(PORT)#g' \

	                    -e 's#@@Port@@#$(PORT)#g' \

	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \

	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \

	                    -e 's#$(prefix)#$(top_builddir)/check#g' \

	                    -e 's#$(prefix)#$(top_builddir)/check#g' \

	                    -e 's/^#ServerName /ServerName /' \

	                    -e '/@@LoadModule@@/d' \

	                    -e '/@@LoadModule@@/d' \

	                    < $$i; \

	                    < $$i; \

	            else \

	            else \
@@ -340,6 +341,7 @@ check-conf: 
	                    -e 's#@@Port@@#$(PORT)#g' \

	                    -e 's#@@Port@@#$(PORT)#g' \

	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \

	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \

	                    -e 's#$(prefix)#$(top_builddir)/check#g' \

	                    -e 's#$(prefix)#$(top_builddir)/check#g' \

	                    -e 's/^#ServerName /ServerName /' \

	                    -e 'p' \

	                    -e 'p' \

	                    < $$i; \

	                    < $$i; \

	                if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \

	                if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \
@@ -385,6 +387,7 @@ check-conf: 
	                    -e 's#@@Port@@#$(PORT)#g' \

	                    -e 's#@@Port@@#$(PORT)#g' \

	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \

	                    -e 's#@@SSLPort@@#$(SSLPORT)#g' \

	                    -e 's#$(prefix)#$(top_builddir)/check#g' \

	                    -e 's#$(prefix)#$(top_builddir)/check#g' \

	                    -e 's/^#ServerName /ServerName /' \

	                    < $$i; \

	                    < $$i; \

	            fi \

	            fi \

	        ) > $(top_builddir)/check/conf/$$i; \

	        ) > $(top_builddir)/check/conf/$$i; \