Port to use Test::Builder internally

diff --git a/Makefile.PL b/Makefile.PL
index 1ac71726eae30d9e71bc2f3cbe8b3b752c4754f9..cb1e72920941e3ec29434d90363cd19eb535ef49 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -110,7 +110,7 @@ WriteMakefile(
         'Exporter'              => 0,
         'POSIX'                 => 0,
         'Perl::Destruct::Level' => 0,
-        'Test::More'            => 0,
+        'Test::Builder'         => 0,
     },
     dist          => {
         PREOP      => "touch lib/$supp; "

diff --git a/lib/Test/Valgrind.pm b/lib/Test/Valgrind.pm
index 34ff5d903cc5c75ee06c7b2152870749ec789047..a6561301481845a44c87241ecf75fc39f67dec94 100644 (file)
--- a/lib/Test/Valgrind.pm
+++ b/lib/Test/Valgrind.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use Carp qw/croak/;
 use POSIX qw/SIGTERM/;
-use Test::More;
+use Test::Builder;
 
 use Perl::Destruct::Level level => 3;
 
@@ -98,6 +98,8 @@ Specifies a subroutine to execute for each test instead of C<Test::More::is>. It
 
 =cut
 
+my $Test = Test::Builder->new;
+
 my $run;
 
 sub _counter {
@@ -105,7 +107,7 @@ sub _counter {
 }
 
 sub _tester {
- is($_[0], 0, $_[1]);
+ $Test->is_num($_[0], 0, $_[1]);
  _counter(@_);
 }
 
@@ -144,7 +146,7 @@ sub import {
     }
    }
    if (!$vg) {
-    plan skip_all => 'No valgrind executable could be found in your path';
+    $Test->plan(skip_all => 'No valgrind executable could be found in your path');
     return;
    } 
   }
@@ -181,17 +183,17 @@ sub import {
   }
   close $wtr or croak "close(\$wtr): $!";
   local $SIG{INT} = sub { kill -(SIGTERM) => $pid };
-  plan tests => 5 unless $args{no_test};
+  $Test->plan(tests => 5) unless $args{no_test};
   my @tests = (
    'errors',
    'definitely lost', 'indirectly lost', 'possibly lost', 'still reachable'
   );
   my %res = map { $_ => 0 } @tests;
   while (<$rdr>) {
-   diag $_ if $args{diag};
+   $Test->diag($_) if $args{diag};
    if (/^=+\d+=+\s*FATAL\s*:\s*(.*)/) {
     chomp(my $err = $1);
-    diag "Valgrind error: $err";
+    $Test->diag("Valgrind error: $err");
     $res{$_} = undef for @tests;
    }
    if (/ERROR\s+SUMMARY\s*:\s+(\d+)/) {
@@ -232,7 +234,7 @@ If your tests output to STDERR, everything will be eaten in the process. In part
 
 Valgrind 3.1.0 (L<http://valgrind.org>).
 
-L<Carp>, L<POSIX> (core modules since perl 5) and L<Test::More> (since 5.6.2).
+L<Carp>, L<POSIX> (core modules since perl 5) and L<Test::Builder> (since 5.6.2).
 
 L<Perl::Destruct::Level>.