Hello community,
here is the log from the commit of package perl-Variable-Magic for
openSUSE:Factory checked in at 2013-10-06 14:56:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Variable-Magic (Old)
and /work/SRC/openSUSE:Factory/.perl-Variable-Magic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Variable-Magic"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Variable-Magic/perl-Variable-Magic.changes
2013-06-13 20:26:18.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Variable-Magic.new/perl-Variable-Magic.changes
2013-10-06 14:56:21.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Oct 4 09:13:37 UTC 2013 - [email protected]
+
+- updated to 0.53
+ This is a maintenance release. The code contains no functional change.
+ Satisfied users of version 0.52 can skip this update.
+ + Fix : [RT #86338] : typo fix.
+ Thanks [email protected] for the patch.
+ + Tst : Author tests are no longer bundled with this distribution.
+ They are only made available to authors in the git repository.
+
+-------------------------------------------------------------------
Old:
----
Variable-Magic-0.52.tar.gz
New:
----
Variable-Magic-0.53.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Variable-Magic.spec ++++++
--- /var/tmp/diff_new_pack.O6qkgh/_old 2013-10-06 14:56:22.000000000 +0200
+++ /var/tmp/diff_new_pack.O6qkgh/_new 2013-10-06 14:56:22.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Variable-Magic
-Version: 0.52
+Version: 0.53
Release: 0
%define cpan_name Variable-Magic
Summary: Associate user-defined magic to variables from Perl
++++++ Variable-Magic-0.52.tar.gz -> Variable-Magic-0.53.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/Changes
new/Variable-Magic-0.53/Changes
--- old/Variable-Magic-0.52/Changes 2012-11-05 03:23:31.000000000 +0100
+++ new/Variable-Magic-0.53/Changes 2013-09-01 19:41:25.000000000 +0200
@@ -1,5 +1,13 @@
Revision history for Variable-Magic
+0.53 2013-09-01 17:50 UTC
+ This is a maintenance release. The code contains no functional change.
+ Satisfied users of version 0.52 can skip this update.
+ + Fix : [RT #86338] : typo fix.
+ Thanks [email protected] for the patch.
+ + Tst : Author tests are no longer bundled with this distribution.
+ They are only made available to authors in the git repository.
+
0.52 2012-11-05 02:30 UTC
+ Add : The new constant VMG_COMPAT_SCALAR_NOLEN evaluates to true
when your perl does not call 'len' magic for scalars, which
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/MANIFEST
new/Variable-Magic-0.53/MANIFEST
--- old/Variable-Magic-0.52/MANIFEST 2012-08-30 19:29:53.000000000 +0200
+++ new/Variable-Magic-0.53/MANIFEST 2013-08-29 01:18:16.000000000 +0200
@@ -39,11 +39,6 @@
t/40-threads.t
t/41-clone.t
t/80-leaks.t
-t/91-pod.t
-t/92-pod-coverage.t
-t/93-pod-spelling.t
-t/95-portability-files.t
-t/99-kwalitee.t
t/lib/VPIT/TestHelpers.pm
t/lib/Variable/Magic/TestDestroyRequired.pm
t/lib/Variable/Magic/TestGlobalDestruction.pm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/META.json
new/Variable-Magic-0.53/META.json
--- old/Variable-Magic-0.52/META.json 2012-11-05 03:23:37.000000000 +0100
+++ new/Variable-Magic-0.53/META.json 2013-09-01 19:43:04.000000000 +0200
@@ -4,7 +4,7 @@
"Vincent Pit <[email protected]>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter
version 2.120921",
+ "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter
version 2.120921",
"license" : [
"perl_5"
],
@@ -50,7 +50,7 @@
"release_status" : "stable",
"resources" : {
"bugtracker" : {
- "web" :
"http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Variable-Magic";
+ "web" : "http://rt.cpan.org/Dist/Display.html?Name=Variable-Magic";
},
"homepage" : "http://search.cpan.org/dist/Variable-Magic/";,
"license" : [
@@ -60,5 +60,5 @@
"url" :
"http://git.profvince.com/?p=perl%2Fmodules%2FVariable-Magic.git";
}
},
- "version" : "0.52"
+ "version" : "0.53"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/META.yml
new/Variable-Magic-0.53/META.yml
--- old/Variable-Magic-0.52/META.yml 2012-11-05 03:23:37.000000000 +0100
+++ new/Variable-Magic-0.53/META.yml 2013-09-01 19:43:04.000000000 +0200
@@ -14,7 +14,7 @@
Config: 0
ExtUtils::MakeMaker: 0
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter
version 2.120921'
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version
2.120921'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -31,8 +31,8 @@
base: 0
perl: 5.008
resources:
- bugtracker: http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Variable-Magic
+ bugtracker: http://rt.cpan.org/Dist/Display.html?Name=Variable-Magic
homepage: http://search.cpan.org/dist/Variable-Magic/
license: http://dev.perl.org/licenses/
repository: http://git.profvince.com/?p=perl%2Fmodules%2FVariable-Magic.git
-version: 0.52
+version: 0.53
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/Makefile.PL
new/Variable-Magic-0.53/Makefile.PL
--- old/Variable-Magic-0.52/Makefile.PL 2012-11-02 02:04:05.000000000 +0100
+++ new/Variable-Magic-0.53/Makefile.PL 2013-08-29 01:18:16.000000000 +0200
@@ -88,7 +88,7 @@
},
dynamic_config => 1,
resources => {
- bugtracker => "http://rt.cpan.org/NoAuth/ReportBug.html?Queue=$dist";,
+ bugtracker => "http://rt.cpan.org/Dist/Display.html?Name=$dist";,
homepage => "http://search.cpan.org/dist/$dist/";,
license => 'http://dev.perl.org/licenses/',
repository => "http://git.profvince.com/?p=perl%2Fmodules%2F$dist.git";,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/README
new/Variable-Magic-0.53/README
--- old/Variable-Magic-0.52/README 2012-11-05 03:23:37.000000000 +0100
+++ new/Variable-Magic-0.53/README 2013-09-01 19:43:05.000000000 +0200
@@ -2,7 +2,7 @@
Variable::Magic - Associate user-defined magic to variables from Perl.
VERSION
- Version 0.52
+ Version 0.53
SYNOPSIS
use Variable::Magic qw<wizard cast VMG_OP_INFO_NAME>;
@@ -72,7 +72,7 @@
The same magic can be applied on scalars, arrays, hashes, subs or
globs. But the same hook (see below for a list) may trigger
- differently depending on the the type of the variable.
+ differently depending on the type of the variable.
* Magic is invisible at Perl level.
@@ -560,12 +560,12 @@
A C compiler. This module may happen to build with a C++ compiler as
well, but don't rely on it, as no guarantee is made in this regard.
- Carp (core since perl 5), XSLoader (since 5.006).
+ Carp (core since perl 5), XSLoader (since 5.6.0).
Copy tests need Tie::Array (core since perl 5.005) and Tie::Hash (since
- 5.002). Some uvar tests need Hash::Util::FieldHash (since 5.009004).
- Glob tests need Symbol (since 5.002). Threads tests need threads and
- threads::shared (both since 5.007003).
+ 5.002). Some uvar tests need Hash::Util::FieldHash (since 5.9.4). Glob
+ tests need Symbol (since 5.002). Threads tests need threads and
+ threads::shared (both since 5.7.3).
SEE ALSO
perlguts and perlapi for internal information about magic.
@@ -593,7 +593,7 @@
<http://www.profvince.com/perl/cover/Variable-Magic>.
COPYRIGHT & LICENSE
- Copyright 2007,2008,2009,2010,2011,2012 Vincent Pit, all rights
+ Copyright 2007,2008,2009,2010,2011,2012,2013 Vincent Pit, all rights
reserved.
This program is free software; you can redistribute it and/or modify it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/lib/Variable/Magic.pm
new/Variable-Magic-0.53/lib/Variable/Magic.pm
--- old/Variable-Magic-0.52/lib/Variable/Magic.pm 2012-11-05
03:17:13.000000000 +0100
+++ new/Variable-Magic-0.53/lib/Variable/Magic.pm 2013-09-01
19:42:22.000000000 +0200
@@ -11,13 +11,13 @@
=head1 VERSION
-Version 0.52
+Version 0.53
=cut
our $VERSION;
BEGIN {
- $VERSION = '0.52';
+ $VERSION = '0.53';
}
=head1 SYNOPSIS
@@ -88,7 +88,7 @@
Magic is type-agnostic.
The same magic can be applied on scalars, arrays, hashes, subs or globs.
-But the same hook (see below for a list) may trigger differently depending on
the the type of the variable.
+But the same hook (see below for a list) may trigger differently depending on
the type of the variable.
=item *
@@ -671,12 +671,12 @@
A C compiler.
This module may happen to build with a C++ compiler as well, but don't rely on
it, as no guarantee is made in this regard.
-L<Carp> (core since perl 5), L<XSLoader> (since 5.006).
+L<Carp> (core since perl 5), L<XSLoader> (since 5.6.0).
Copy tests need L<Tie::Array> (core since perl 5.005) and L<Tie::Hash> (since
5.002).
-Some uvar tests need L<Hash::Util::FieldHash> (since 5.009004).
+Some uvar tests need L<Hash::Util::FieldHash> (since 5.9.4).
Glob tests need L<Symbol> (since 5.002).
-Threads tests need L<threads> and L<threads::shared> (both since 5.007003).
+Threads tests need L<threads> and L<threads::shared> (both since 5.7.3).
=head1 SEE ALSO
@@ -705,7 +705,7 @@
=head1 COPYRIGHT & LICENSE
-Copyright 2007,2008,2009,2010,2011,2012 Vincent Pit, all rights reserved.
+Copyright 2007,2008,2009,2010,2011,2012,2013 Vincent Pit, all rights reserved.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/00-load.t
new/Variable-Magic-0.53/t/00-load.t
--- old/Variable-Magic-0.52/t/00-load.t 2012-08-14 00:10:17.000000000 +0200
+++ new/Variable-Magic-0.53/t/00-load.t 2013-08-29 01:18:16.000000000 +0200
@@ -6,7 +6,7 @@
use Test::More tests => 1;
BEGIN {
- use_ok( 'Variable::Magic' );
+ use_ok( 'Variable::Magic' );
}
my $p = Variable::Magic::VMG_PERL_PATCHLEVEL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/16-huf.t
new/Variable-Magic-0.53/t/16-huf.t
--- old/Variable-Magic-0.52/t/16-huf.t 2012-08-30 19:29:53.000000000 +0200
+++ new/Variable-Magic-0.53/t/16-huf.t 2013-06-03 15:19:02.000000000 +0200
@@ -5,14 +5,13 @@
use Test::More;
-use Variable::Magic qw<wizard cast dispell VMG_UVAR>;
-
use lib 't/lib';
use VPIT::TestHelpers;
+use Variable::Magic qw<wizard cast dispell VMG_UVAR>;
+
if (VMG_UVAR) {
- load_or_skip('Hash::Util::FieldHash', undef, [ ],
- 'required for testing uvar interaction');
+ load_or_skip_all('Hash::Util::FieldHash', undef, [ ]);
plan tests => 2 * 5 + 7 + 1;
} else {
skip_all 'No nice uvar magic for this perl';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/25-copy.t
new/Variable-Magic-0.53/t/25-copy.t
--- old/Variable-Magic-0.52/t/25-copy.t 2012-08-14 00:10:17.000000000 +0200
+++ new/Variable-Magic-0.53/t/25-copy.t 2013-06-03 15:19:02.000000000 +0200
@@ -5,6 +5,9 @@
use Test::More;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
use Variable::Magic qw<cast dispell>;
plan tests => 2 + ((2 * 5 + 3) + (2 * 2 + 1)) + (2 * 9 + 6) + 1;
@@ -16,10 +19,7 @@
my $wiz = init_watcher 'copy', 'copy';
SKIP: {
- my $has_tie_array = do { local $@; eval { require Tie::Array; 1 } };
- skip 'Tie::Array required to test copy magic on arrays'
- => (2 * 5 + 3) + (2 * 2 + 1) unless
$has_tie_array;
- defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
+ load_or_skip('Tie::Array', undef, undef, (2 * 5 + 3) + (2 * 2 + 1));
tie my @a, 'Tie::StdArray';
@a = (1 .. 10);
@@ -51,10 +51,7 @@
}
SKIP: {
- my $has_tie_hash = do { local $@; eval { require Tie::Hash; 1 } };
- skip 'Tie::Hash required to test copy magic on hashes'
- => 2 * 9 + 6 unless
$has_tie_hash;
- defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
+ load_or_skip('Tie::Hash', undef, undef, 2 * 9 + 6);
tie my %h, 'Tie::StdHash';
%h = (a => 1, b => 2, c => 3);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/28-uvar.t
new/Variable-Magic-0.53/t/28-uvar.t
--- old/Variable-Magic-0.52/t/28-uvar.t 2012-08-14 00:10:17.000000000 +0200
+++ new/Variable-Magic-0.53/t/28-uvar.t 2013-06-03 15:19:02.000000000 +0200
@@ -5,6 +5,9 @@
use Test::More;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
use Variable::Magic qw<wizard cast dispell VMG_UVAR>;
if (VMG_UVAR) {
@@ -51,10 +54,7 @@
is $x, 1, 'uvar: fetch directly with also non uvar magic correctly';
SKIP: {
- my $has_tie_hash = do { local $@; eval { require Tie::Hash; 1 } };
- skip 'Tie::Hash required to test uvar magic on tied hashes'
- => 2 * 5 + 4 unless
$has_tie_hash;
- defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
+ load_or_skip('Tie::Hash', undef, undef, 2 * 5 + 4);
tie my %h, 'Tie::StdHash';
%h = (x => 7, y => 8);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/30-scalar.t
new/Variable-Magic-0.53/t/30-scalar.t
--- old/Variable-Magic-0.52/t/30-scalar.t 2012-08-14 00:10:17.000000000
+0200
+++ new/Variable-Magic-0.53/t/30-scalar.t 2013-06-03 15:19:02.000000000
+0200
@@ -7,6 +7,9 @@
use Test::More tests => (2 * 14 + 2) + 2 * (2 * 8 + 4) + 5 + 1;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
use Variable::Magic qw<wizard cast dispell>;
use lib 't/lib';
@@ -103,10 +106,7 @@
watch { $h{b} = 4 } { }, 'hash element: set after delete';
SKIP: {
- unless (do { local $@; eval { require Tie::Array; 1 } }) {
- skip 'Tie::Array required to test clear magic on tied array values' => 5;
- }
- defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
+ load_or_skip('Tie::Array', undef, undef, 5);
tie my @a, 'Tie::StdArray';
$a[0] = $$;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/34-glob.t
new/Variable-Magic-0.53/t/34-glob.t
--- old/Variable-Magic-0.52/t/34-glob.t 2012-08-30 19:29:53.000000000 +0200
+++ new/Variable-Magic-0.53/t/34-glob.t 2013-06-03 15:19:02.000000000 +0200
@@ -9,9 +9,7 @@
use VPIT::TestHelpers;
BEGIN {
- load_or_skip('Symbol', undef, [ 'gensym' ],
- 'required for testing magic for globs');
-
+ load_or_skip_all('Symbol', undef, [ 'gensym' ]);
plan tests => 2 * 17 + 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/91-pod.t
new/Variable-Magic-0.53/t/91-pod.t
--- old/Variable-Magic-0.52/t/91-pod.t 2012-08-30 19:29:53.000000000 +0200
+++ new/Variable-Magic-0.53/t/91-pod.t 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-#!perl -T
-
-use strict;
-use warnings;
-
-use Test::More;
-
-use lib 't/lib';
-use VPIT::TestHelpers;
-
-load_or_skip('Test::Pod', '1.22', [ ],
- 'required for testing POD syntax');
-
-eval 'use Test::Pod'; # Make Kwalitee test happy
-
-all_pod_files_ok();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/92-pod-coverage.t
new/Variable-Magic-0.53/t/92-pod-coverage.t
--- old/Variable-Magic-0.52/t/92-pod-coverage.t 2012-08-30 19:29:53.000000000
+0200
+++ new/Variable-Magic-0.53/t/92-pod-coverage.t 1970-01-01 01:00:00.000000000
+0100
@@ -1,18 +0,0 @@
-#!perl -T
-
-use strict;
-use warnings;
-
-use Test::More;
-
-use lib 't/lib';
-use VPIT::TestHelpers;
-
-my $desc = 'required for testing POD coverage';
-
-load_or_skip('Test::Pod::Coverage', '1.08', [ ], $desc);
-load_or_skip('Pod::Coverage', '0.18', undef, $desc);
-
-eval 'use Test::Pod::Coverage'; # Make Kwalitee test happy
-
-all_pod_coverage_ok( { also_private => [ qr/^_/, qr/^CLONE(_SKIP)?$/ ] } );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/93-pod-spelling.t
new/Variable-Magic-0.53/t/93-pod-spelling.t
--- old/Variable-Magic-0.52/t/93-pod-spelling.t 2012-11-02 01:32:59.000000000
+0100
+++ new/Variable-Magic-0.53/t/93-pod-spelling.t 1970-01-01 01:00:00.000000000
+0100
@@ -1,14 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use Test::More;
-
-use lib 't/lib';
-use VPIT::TestHelpers;
-
-load_or_skip('Test::Pod::Spelling::CommonMistakes', '1.0', [ ],
- 'required for testing POD spelling');
-
-all_pod_files_ok();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/95-portability-files.t
new/Variable-Magic-0.53/t/95-portability-files.t
--- old/Variable-Magic-0.52/t/95-portability-files.t 2012-08-30
19:29:53.000000000 +0200
+++ new/Variable-Magic-0.53/t/95-portability-files.t 1970-01-01
01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#!perl -T
-
-use strict;
-use warnings;
-
-use Test::More;
-
-use lib 't/lib';
-use VPIT::TestHelpers;
-
-load_or_skip('Test::Portability::Files', undef, [ ],
- 'required for testing filenames portability');
-
-run_tests();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/99-kwalitee.t
new/Variable-Magic-0.53/t/99-kwalitee.t
--- old/Variable-Magic-0.52/t/99-kwalitee.t 2012-08-30 19:29:53.000000000
+0200
+++ new/Variable-Magic-0.53/t/99-kwalitee.t 1970-01-01 01:00:00.000000000
+0100
@@ -1,31 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use Test::More;
-
-use lib 't/lib';
-use VPIT::TestHelpers;
-
-my $guard = VPIT::TestHelpers::Guard->new(
- sub { unlink for glob 'Debian_CPANTS.txt*' }
-);
-
-my $desc = 'required to test kwalitee';
-
-load_or_skip('Parse::RecDescent', '1.967006', undef, $desc);
-load_or_skip('Module::ExtractUse', '0.24', undef, $desc);
-load_or_skip('Test::Kwalitee', '1.01', undef, $desc);
-
-SKIP: {
- eval { Test::Kwalitee->import(); };
- if (my $err = $@) {
- 1 while chomp $err;
- require Test::Builder;
- my $Test = Test::Builder->new;
- my $plan = $Test->has_plan;
- $Test->skip_all($err) if not defined $plan or $plan eq 'no_plan';
- skip $err => $plan - $Test->current_test;
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Variable-Magic-0.52/t/lib/VPIT/TestHelpers.pm
new/Variable-Magic-0.53/t/lib/VPIT/TestHelpers.pm
--- old/Variable-Magic-0.52/t/lib/VPIT/TestHelpers.pm 2012-08-30
19:29:53.000000000 +0200
+++ new/Variable-Magic-0.53/t/lib/VPIT/TestHelpers.pm 2013-06-03
15:19:02.000000000 +0200
@@ -4,42 +4,61 @@
use warnings;
my %exports = (
- load_or_skip => \&load_or_skip,
- skip_all => \&skip_all,
+ load_or_skip => \&load_or_skip,
+ load_or_skip_all => \&load_or_skip_all,
+ skip_all => \&skip_all,
);
sub import {
my $pkg = caller;
+
while (my ($name, $code) = each %exports) {
no strict 'refs';
*{$pkg.'::'.$name} = $code;
}
}
-sub skip_all {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
+my $test_sub = sub {
+ my $sub = shift;
+
+ my $stash;
+ if ($INC{'Test/Leaner.pm'}) {
+ $stash = \%Test::Leaner::;
+ } else {
+ require Test::More;
+ $stash = \%Test::More::;
+ }
+
+ my $glob = $stash->{$sub};
+ return $glob ? *$glob{CODE} : undef;
+};
+
+sub skip { $test_sub->('skip')->(@_) }
+
+sub skip_all { $test_sub->('plan')->(skip_all => $_[0]) }
sub diag {
- require Test::More;
- Test::More::diag($_) for @_;
+ my $diag = $test_sub->('diag');
+ $diag->($_) for @_;
}
our $TODO;
local $TODO;
-sub load_or_skip {
- my ($pkg, $ver, $imports, $desc) = @_;
+sub load {
+ my ($pkg, $ver, $imports) = @_;
+
my $spec = $ver && $ver !~ /^[0._]*$/ ? "$pkg $ver" : $pkg;
+ my $err;
+
local $@;
if (eval "use $spec (); 1") {
$ver = do { no strict 'refs'; ${"${pkg}::VERSION"} };
$ver = 'undef' unless defined $ver;
+
if ($imports) {
my @imports = @$imports;
- my $caller = (caller 0)[0];
+ my $caller = (caller 1)[0];
local $@;
my $res = eval <<"IMPORTER";
package
@@ -47,12 +66,40 @@
BEGIN { \$pkg->import(\@imports) }
1;
IMPORTER
- skip_all "Could not import '@imports' from $pkg $ver: $@" unless $res;
+ $err = "Could not import '@imports' from $pkg $ver: $@" unless $res;
}
- diag "Using $pkg $ver";
} else {
- skip_all "$spec $desc";
+ (my $file = "$pkg.pm") =~ s{::}{/}g;
+ delete $INC{$file};
+ $err = "Could not load $spec";
}
+
+ if ($err) {
+ return wantarray ? (0, $err) : 0;
+ } else {
+ diag "Using $pkg $ver";
+ return 1;
+ }
+}
+
+sub load_or_skip {
+ my ($pkg, $ver, $imports, $tests) = @_;
+
+ die 'You must specify how many tests to skip' unless defined $tests;
+
+ my ($loaded, $err) = load($pkg, $ver, $imports);
+ skip $err => $tests unless $loaded;
+
+ return $loaded;
+}
+
+sub load_or_skip_all {
+ my ($pkg, $ver, $imports) = @_;
+
+ my ($loaded, $err) = load($pkg, $ver, $imports);
+ skip_all $err unless $loaded;
+
+ return $loaded;
}
package VPIT::TestHelpers::Guard;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Variable-Magic-0.52/t/lib/Variable/Magic/TestThreads.pm
new/Variable-Magic-0.53/t/lib/Variable/Magic/TestThreads.pm
--- old/Variable-Magic-0.52/t/lib/Variable/Magic/TestThreads.pm 2012-08-30
19:29:53.000000000 +0200
+++ new/Variable-Magic-0.53/t/lib/Variable/Magic/TestThreads.pm 2013-06-03
15:19:02.000000000 +0200
@@ -25,9 +25,8 @@
skip_all 'perl 5.13.4 required to test thread safety'
unless $force or "$]" >=
5.013_004;
- my $desc = 'required to test thread safety';
- load_or_skip('threads', $force ? '0' : '1.67', [ ], $desc);
- load_or_skip('threads::shared', $force ? '0' : '1.14', [ ], $desc);
+ load_or_skip_all('threads', $force ? '0' : '1.67', [ ]);
+ load_or_skip_all('threads::shared', $force ? '0' : '1.14', [ ]);
my %exports = (
spawn => \&spawn,
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
