diff options
| author | Jacob Champion <jchampion@apache.org> | 2017-02-07 20:45:12 +0100 |
|---|---|---|
| committer | Jacob Champion <jchampion@apache.org> | 2017-02-07 20:45:12 +0100 |
| commit | 04ce4cacfa38eddc87c55d94e51a3bc71ab63263 (patch) | |
| tree | 371eaf9bdca692d18ea9a101b609880321de3bb7 | |
| parent | Finish cross-integration with trunk (diff) | |
| download | apache2-04ce4cacfa38eddc87c55d94e51a3bc71ab63263.tar.xz apache2-04ce4cacfa38eddc87c55d94e51a3bc71ab63263.zip | |
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
| -rw-r--r-- | Makefile.in | 3 |
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; \ |