X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-bad.t;h=7ceb62c8fb490340a1dee29b0faa019bf2953384;hb=550ce3f06282d07682d0816234855efee985aa9a;hp=93765cf05a18b5e66e0b79703bdcf53765ad1bb6;hpb=8d66aa098b18f8c9724b12bf446d330905122c57;p=perl%2Fmodules%2FTest-Valgrind.git

diff --git a/t/30-bad.t b/t/30-bad.t
index 93765cf..7ceb62c 100644
--- a/t/30-bad.t
+++ b/t/30-bad.t
@@ -3,14 +3,29 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
-
 use Test::More;
 
+my $dbg;
+
 sub tester {
  my ($a, $desc) = @_;
  my $passed;
- my $dbg = eval "Test::Valgrind::DEBUGGING()";
+ if (!defined $dbg) {
+  eval "
+   use lib qw{blib/arch};
+   require XSLoader;
+   XSLoader::load('Test::Valgrind', \$Test::Valgrind::VERSION);
+  ";
+  if ($@) {
+   my $err = $@;
+   $dbg = 0;
+   chomp $err;
+   diag "XS test code not available ($err)";
+  } else {
+   my $ret = eval "Test::Valgrind::DEBUGGING()";
+   $dbg = $@ ? 0 : $ret;
+  }
+ }
  if ($desc =~ /still\s+reachable/) {
   $passed = $a >= 9900 && $a < 10100;
   if ($dbg) {
@@ -29,18 +44,18 @@ sub tester {
  return $passed;
 }
 
-eval {
- require XSLoader;
- XSLoader::load('Test::Valgrind', 0.04);
-};
+use lib qw{blib/archpub};
+eval 'use Test::Valgrind cb => \&tester';
 if ($@) {
- plan skip_all => "XS test code not available ($@)";
+ diag $@;
+ plan skip_all => 'Test::Valgrind is required to run test your distribution with valgrind';
 } else {
- use lib qw{blib/archpub};
- eval 'use Test::Valgrind cb => \&tester;';
- if ($@) {
-  plan skip_all => 'Test::Valgrind is required to run test your distribution with valgrind';
- } else {
+ eval "
+  use lib qw{blib/arch};
+  require XSLoader;
+  XSLoader::load('Test::Valgrind', \$Test::Valgrind::VERSION);
+ ";
+ unless ($@) {
   Test::Valgrind::leak();
  }
 }