Clean up tests

diff --git a/t/10-good.t b/t/10-good.t
index d3ffb905c599d08e5037a323b2703030cd2c3958..3552113d8e590eada9c0d4cb34a805665d8c05b3 100644 (file)
--- a/t/10-good.t
+++ b/t/10-good.t
@@ -6,10 +6,15 @@ use warnings;
 use Test::More;
 
 use lib 't/lib';
-eval 'use Test::Valgrind';
+
+eval {
+ require Test::Valgrind;
+ Test::Valgrind->import;
+};
 if ($@) {
  diag $@;
- plan skip_all => 'Test::Valgrind is required to run test your distribution with valgrind';
+ plan skip_all
+        => 'Test::Valgrind is required to test your distribution with valgrind';
 }
 
 {

diff --git a/t/20-bad.t b/t/20-bad.t
index fbf33bf2c922dc73d538232f0e1e5866cbb5e059..490b779254f59ce56777c6f7a593b8dc03c739e6 100644 (file)
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -6,19 +6,23 @@ use warnings;
 use Test::More;
 
 use lib 't/lib';
-eval 'use Test::Valgrind action => q[Test::Valgrind::Test::Action]';
+
+eval {
+ require Test::Valgrind;
+ Test::Valgrind->import(action => 'Test::Valgrind::Test::Action');
+};
 if ($@) {
  diag $@;
- plan skip_all => 'Test::Valgrind is required to run test your distribution with valgrind';
+ plan skip_all
+        => 'Test::Valgrind is required to test your distribution with valgrind';
 }
 
 eval {
  require XSLoader;
  XSLoader::load('Test::Valgrind', $Test::Valgrind::VERSION);
 };
-
-unless ($@) {
- Test::Valgrind::leak();
-} else {
+if ($@) {
  diag $@;
+} else {
+ Test::Valgrind::leak();
 }