Fix a2p manpage (from Debian)

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / t / problems.t

diff --git a/lib/ExtUtils/t/problems.t b/lib/ExtUtils/t/problems.t
index 08f3f74..8708532 100644 (file)
--- a/lib/ExtUtils/t/problems.t
+++ b/lib/ExtUtils/t/problems.t
@@ -9,31 +9,38 @@ BEGIN {
         unshift @INC, 't/lib';
     }
 }
-$ENV{PERL_CORE} ? chdir '../lib/ExtUtils/t' : chdir 't';
+chdir 't';
 
 use strict;
-use Test::More tests => 3;
+use Test::More tests => 6;
 use ExtUtils::MM;
+use MakeMaker::Test::Setup::Problem;
 use TieOut;
 
 my $MM = bless { DIR => ['subdir'] }, 'MM';
 
+ok( setup_recurs(), 'setup' );
+END {
+    ok( chdir File::Spec->updir );
+    ok( teardown_recurs(), 'teardown' );
+}
+
 ok( chdir 'Problem-Module', "chdir'd to Problem-Module" ) ||
   diag("chdir failed: $!");
 
 
 # Make sure when Makefile.PL's break, they issue a warning.
 # Also make sure Makefile.PL's in subdirs still have '.' in @INC.
-my $stdout;
-$stdout = tie *STDOUT, 'TieOut' or die;
 {
+    my $stdout = tie *STDOUT, 'TieOut' or die;
+
     my $warning = '';
     local $SIG{__WARN__} = sub { $warning = join '', @_ };
-    $MM->eval_in_subdirs;
+    eval { $MM->eval_in_subdirs; };
 
     is( $stdout->read, qq{\@INC has .\n}, 'cwd in @INC' );
-    like( $warning, 
-          qr{^WARNING from evaluation of .*subdir.*Makefile.PL: YYYAaaaakkk},
+    like( $@, 
+          qr{^ERROR from evaluation of .*subdir.*Makefile.PL: YYYAaaaakkk},
           'Makefile.PL death in subdir warns' );
 
     untie *STDOUT;