From: Jacob Champion Date: Tue, 7 Feb 2017 19:45:12 +0000 (+0000) Subject: check: silence ServerName warnings with MPM DSOs X-Git-Tag: 2.5.0-alpha~689^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04ce4cacfa38eddc87c55d94e51a3bc71ab63263;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/Makefile.in b/Makefile.in index 1ab4cff406d..4eacffe9c0f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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; \