From e620c543434f3cfff5e54066d106ecfade45a472 Mon Sep 17 00:00:00 2001 From: Aaron Trevena Date: Fri, 18 Apr 2008 08:22:18 +0000 Subject: [PATCH] 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 --- Changes | 2 ++ t/apache_mvc.t | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 8724d1d..456ea87 100644 --- 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 e6a1100..75e1a0a 100644 --- 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' -- 2.39.2