summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorJacob Champion <jchampion@apache.org>2017-02-07 19:45:12 +0000
committerJacob Champion <jchampion@apache.org>2017-02-07 19:45:12 +0000
commit04ce4cacfa38eddc87c55d94e51a3bc71ab63263 (patch)
tree371eaf9bdca692d18ea9a101b609880321de3bb7 /Makefile.in
parentdfcc8f39485f157586f23e5ea151a5181cbdbb26 (diff)
downloadhttpd-04ce4cacfa38eddc87c55d94e51a3bc71ab63263.tar.gz
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
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 1ab4cff406..4eacffe9c0 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; \