Don't output our plan if one has already been set

diff --git a/lib/Test/Valgrind.pm b/lib/Test/Valgrind.pm
index a6561301481845a44c87241ecf75fc39f67dec94..f5cee9020cc5d8f434e1ad83324a8a85497452cb 100644 (file)
--- a/lib/Test/Valgrind.pm
+++ b/lib/Test/Valgrind.pm
@@ -146,7 +146,7 @@ sub import {
     }
    }
    if (!$vg) {
-    $Test->plan(skip_all => 'No valgrind executable could be found in your path');
+    $Test->skip_all('No valgrind executable could be found in your path');
     return;
    } 
   }
@@ -183,7 +183,7 @@ sub import {
   }
   close $wtr or croak "close(\$wtr): $!";
   local $SIG{INT} = sub { kill -(SIGTERM) => $pid };
-  $Test->plan(tests => 5) unless $args{no_test};
+  $Test->plan(tests => 5) unless $args{no_test} or defined $Test->has_plan;
   my @tests = (
    'errors',
    'definitely lost', 'indirectly lost', 'possibly lost', 'still reachable'