diff options
author | 2019-02-13 21:15:00 +0000 | |
---|---|---|
committer | 2019-02-13 21:15:00 +0000 | |
commit | 9f11ffb7133c203312a01e4b986886bc88c7d74b (patch) | |
tree | 6618511204c614b20256e4ef9dea39a7b311d638 /gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm | |
parent | Import perl-5.28.1 (diff) | |
download | wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.tar.xz wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.zip |
Fix merge issues, remove excess files - match perl-5.28.1 dist
looking good sthen@, Great! bluhm@
Diffstat (limited to 'gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm')
-rw-r--r-- | gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm b/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm index 2322d8a9b78..be66239db5d 100644 --- a/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm +++ b/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm @@ -2,13 +2,12 @@ package Test::Builder::Module; use strict; -use Test::Builder 1.00; +use Test::Builder; require Exporter; our @ISA = qw(Exporter); -our $VERSION = '1.001014'; -$VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) +our $VERSION = '1.302133'; =head1 NAME @@ -22,7 +21,7 @@ Test::Builder::Module - Base class for test modules my $CLASS = __PACKAGE__; - use base 'Test::Builder::Module'; + use parent 'Test::Builder::Module'; @EXPORT = qw(ok); sub ok ($;$) { @@ -76,6 +75,8 @@ C<import_extra()>. sub import { my($class) = shift; + Test2::API::test2_load() unless Test2::API::test2_in_preload(); + # Don't run all this when loading ourself. return 1 if $class eq 'Test::Builder::Module'; @@ -90,7 +91,8 @@ sub import { $test->plan(@_); - $class->export_to_level( 1, $class, @imports ); + local $Exporter::ExportLevel = $Exporter::ExportLevel + 1; + $class->Exporter::import(@imports); } sub _strip_imports { |