[libapache-ssllookup-perl] 02/03: Remove patch to test suite for loading modules required for Apache 2.4 Instead, specify debian/apache2.conf as the base Apache config file

[Christopher Hoskin]

This is an automated email from the git hooks/post-receive script.

grinorcole-guest pushed a commit to branch master
in repository libapache-ssllookup-perl.

commit 7e4114b1e9911ee5ac98c9b508b4fd7f7dc79320
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sun Mar 15 22:54:25 2015 +0000

    Remove patch to test suite for loading modules required for Apache 2.4
    Instead, specify debian/apache2.conf as the base Apache config file
---
 debian/apache2.conf              | 6 ++++++
 debian/changelog                 | 9 ---------
 debian/patches/series            | 1 -
 debian/rules                     | 5 +++++
 debian/tests/control             | 2 +-
 debian/tests/pkg-perl/test-files | 2 ++
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/apache2.conf b/debian/apache2.conf
new file mode 100644
index 0000000..1f2b124
--- /dev/null
+++ b/debian/apache2.conf
@@ -0,0 +1,6 @@
+<IfModule !mod_mpm_event.c>
+    LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
+</IfModule>
+<IfModule !mod_authz_core.c>
+    LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
+</IfModule>
diff --git a/debian/changelog b/debian/changelog
index e7a98dc..d6ee957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,5 @@
 libapache-ssllookup-perl (2.00-04-1) UNRELEASED; urgency=low
 
-  TODO:
-  - most tests are skipped with
-    "apache2: Could not open configuration file /etc/apache2/httpd.conf: No such file or directory"
-    some of our other libapache*-perl packages have overrides with
-    APACHE_TEST_EXTRA_ARGS="-httpd_conf $(CURDIR)/debian/apache2.conf"
-    maybe this works here as well? (this could also save tests.patch maybe)
-  - autopkgtest error:
-    bash: t/TEST: No such file or directory
-
   * Initial Release. Closes: #780511
 
  -- Christopher Hoskin <christopher.hoskin at gmail.com>  Sun, 15 Mar 2015 17:16:53 +0000
diff --git a/debian/patches/series b/debian/patches/series
index e0b1ef0..3da8fd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 MP_dTHX.patch
-tests.patch
diff --git a/debian/rules b/debian/rules
index b7330cc..b586d85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,10 @@ APR_INC := $(shell /usr/bin/apr-config --includedir)
 override_dh_auto_build:
 	dh_auto_build -- C_INCLUDE_PATH="$(APR_INC)"
 
+override_dh_auto_test:
+	APACHE_TEST_EXTRA_ARGS="-httpd_conf $(CURDIR)/debian/apache2.conf" \
+                dh_auto_test
+
+
 %:
 	dh $@
diff --git a/debian/tests/control b/debian/tests/control
index ece153b..c3b42a4 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 #Replace usual build-deps (which runs smoke tests) with custom
-Test-Command: t/TEST
+Test-Command: t/TEST -httpd_conf ../debian/apache2.conf
 Depends: @, @builddeps@
 Restrictions: allow-stderr
 
diff --git a/debian/tests/pkg-perl/test-files b/debian/tests/pkg-perl/test-files
new file mode 100644
index 0000000..2474e1d
--- /dev/null
+++ b/debian/tests/pkg-perl/test-files
@@ -0,0 +1,2 @@
+t/
+debian/apache2.conf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache-ssllookup-perl.git