only skip two tests if captureoutput is missing

skip all apache_mvc tests if missing mod_perl

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

diff --git a/t/apache_mvc.t b/t/apache_mvc.t
index e6561289fa74ef370b18ed37e0b5de724d24d00d..9a3eafdb09b71ee081f0d14d3ac1940b13fd4aca 100644 (file)
--- a/t/apache_mvc.t
+++ b/t/apache_mvc.t
@@ -1,7 +1,10 @@
 #!/usr/bin/perl -w
 use strict;
-use Test::More tests => 10;
-
+use Test::More;
+BEGIN { if (eval { require mod_perl }) { 
+            plan tests => 2;
+        } else { Test::More->import(skip_all =>"mod_perl is not installed: $@") }
+      }
 require_ok('Apache::MVC');
 ok($Apache::MVC::VERSION, 'defines $VERSION');
 # defines $VERSION

diff --git a/t/cgi_maypole.t b/t/cgi_maypole.t
index d8a5ccf7b0a219c1d222f7f63f8178f7a774fac0..977201a638d2137b9f5bd2cdfd6bd9cb706b07f8 100644 (file)
--- a/t/cgi_maypole.t
+++ b/t/cgi_maypole.t
@@ -86,7 +86,7 @@ is_deeply($r->params, $r->query, '... query and params are identical');
 can_ok($r => 'send_output');
 SKIP: {
     eval "require IO::CaptureOutput";
-    skip "IO::CaptureOutput not installed", 3 if $@;
+    skip "IO::CaptureOutput not installed", 2 if $@;
     $r->content_type('text/plain');
     $r->document_encoding('iso8859-1');
     $r->output('Hello World!');