]> git.decadent.org.uk Git - maypole.git/commitdiff
Added patch to make apache_mvc test work with Apache2 modules.
authorBen Hutchings <ben@decadent.org.uk>
Mon, 20 Aug 2007 21:31:41 +0000 (21:31 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 4 Nov 2008 03:32:54 +0000 (03:32 +0000)
debian/patches/102_fix-apache_mvc-test.diff [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/102_fix-apache_mvc-test.diff b/debian/patches/102_fix-apache_mvc-test.diff
new file mode 100644 (file)
index 0000000..db9a4fa
--- /dev/null
@@ -0,0 +1,18 @@
+--- maypole.orig/t/apache_mvc.t
++++ maypole/t/apache_mvc.t
+@@ -2,10 +2,13 @@
+ use strict;
+ use Test::More;
+ BEGIN {
+-    if (eval { require Apache::Request }) {
++    if (eval { require Apache2::RequestRec }) {
++      $ENV{MOD_PERL_API_VERSION} = 2;
++        plan tests => 3;
++    } elsif (eval { require Apache::Request }) {
+         plan tests => 3;
+     } else {
+-        Test::More->import(skip_all =>"Apache::Request is not installed: $@");
++        Test::More->import(skip_all =>"Neither Apache2::RequestRec nor Apache::Request is installed: $@");
+     }
+ }
index f4daffd536212980facd36ebba6789fb38de7041..1b38d8c842443cbe7957e49c293793ec419e954e 100644 (file)
@@ -1,2 +1,3 @@
 101_fix-extension-mime-type.diff
+102_fix-apache_mvc-test.diff
 201_no-file-mmagic-xs.diff