X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FTest-Valgrind.git;a=blobdiff_plain;f=lib%2FTest%2FValgrind%2FCommand.pm;h=be786e9d281542d59f104acd202658dd8de75a55;hp=a305ed65b361143bbad8f530974891dfb1d26fa4;hb=63def84a00e5e8260b0456e0dfc716d35aab435a;hpb=8cacc78f5dbd91f8ff36075b44d923edd659541f

diff --git a/lib/Test/Valgrind/Command.pm b/lib/Test/Valgrind/Command.pm
index a305ed6..be786e9 100644
--- a/lib/Test/Valgrind/Command.pm
+++ b/lib/Test/Valgrind/Command.pm
@@ -24,6 +24,8 @@ They should also provide a default setup for generating suppressions.
 
 =cut
 
+use Test::Valgrind::Util;
+
 use base qw<Test::Valgrind::Carp>;
 
 =head1 METHODS
@@ -48,10 +50,10 @@ sub new {
 
  my %args = @_;
 
- if ($class eq __PACKAGE__ and my $cmd = delete $args{command}) {
-  $cmd =~ s/[^\w:]//g;
-  $cmd = __PACKAGE__ . "::$cmd" if $cmd !~ /::/;
-  $class->_croak("Couldn't load command $cmd: $@") unless eval "require $cmd;1";
+ my $cmd = delete $args{command};
+ if ($class eq __PACKAGE__ and defined $cmd) {
+  ($cmd, my $msg) = Test::Valgrind::Util::validate_subclass($cmd);
+  $class->_croak($msg) unless defined $cmd;
   return $cmd->new(%args);
  }