X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FTest-Leaner.git;a=blobdiff_plain;f=lib%2FTest%2FLeaner.pm;fp=lib%2FTest%2FLeaner.pm;h=8e45f3c8bfe9d4a24266ffeea5b68c78d5263eac;hp=72531845aac4a400a729807632de6ae37213c3ca;hb=7b03c18e358942c3388e3ba4d93319333a25b9cf;hpb=46581a5ea4e511b8e7ab3b6498433e08e4de8cb2 diff --git a/lib/Test/Leaner.pm b/lib/Test/Leaner.pm index 7253184..8e45f3c 100644 --- a/lib/Test/Leaner.pm +++ b/lib/Test/Leaner.pm @@ -165,14 +165,13 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) { my $leaner_stash = \%Test::Leaner::; my $more_stash = \%Test::More::; - my %valid_imports; + my %stubbed; for (@EXPORT) { my $replacement = exists $more_stash->{$_} ? *{$more_stash->{$_}}{CODE} : undef; - if (defined $replacement) { - $valid_imports{$_} = 1; - } else { + unless (defined $replacement) { + $stubbed{$_}++; $replacement = sub { @_ = ("$_ is not implemented in this version of Test::More"); goto &croak; @@ -186,15 +185,15 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) { shift; my @imports = &_handle_import_args; - @imports = @EXPORT unless @imports; + @imports = @EXPORT unless @imports; my @test_more_imports; for (@imports) { - if ($valid_imports{$_}) { - push @test_more_imports, $_; - } else { + if ($stubbed{$_}) { my $pkg = caller; no strict 'refs'; *{$pkg."::$_"} = $leaner_stash->{$_}; + } else { + push @test_more_imports, $_; } }