fixed apache_mvc.t to work with Apache2 (bug #29979 patch from Ben Hutchings)

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@589 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 8724d1dc3bc0a192dd29746c1067b75a3d7af04c..456ea8703382b266831131f1183998b43d6018c3 100644 (file)
--- a/Changes
+++ b/Changes
@@ -15,6 +15,8 @@ Bug Fixes :
    Fix to mime detection by file extension
    Fixed MODIFY_CODE_ATTRIBUTES and FETCH_CODE_ATTRIBUTES to work with mod_perl threaded model 
      - Patch from Ben Hutchings http://rt.cpan.org/Public/Bug/Display.html?id=29984
+   fixes for bug 29982 Inconsistency between examples and tutorial (patch from Ben Hutchings)
+   fixed apache_mvc.t to work with Apache2 (bug #29979 patch from Ben Hutchings)
 
 Improvements :
    link macro now takes a target argument, and has slightly better pod

diff --git a/t/apache_mvc.t b/t/apache_mvc.t
index e6a110047b69b79d1b519c3960d406955c9c0544..75e1a0abad523b739515ebb483caa358eeb76091 100644 (file)
--- a/t/apache_mvc.t
+++ b/t/apache_mvc.t
@@ -1,17 +1,22 @@
 #!/usr/bin/perl -w
 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: $@");
     }
 }
 
 require_ok('Apache::MVC');
 ok($Apache::MVC::VERSION, 'defines $VERSION');
 ok(Apache::MVC->can('ar'), 'defines an "ar" accessor');
+
 # defines $VERSION
 # uses mod_perl
 # @ISA = 'Maypole'