diff -up Package-Stash-XS-0.22/t/01-basic.t.tm Package-Stash-XS-0.22/t/01-basic.t --- Package-Stash-XS-0.22/t/01-basic.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/01-basic.t 2011-03-05 09:45:46.463400267 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 122; use Test::Fatal; use Package::Stash; @@ -416,5 +416,3 @@ like(exception { "list_all_symbols CODE", ); } - -done_testing; diff -up Package-Stash-XS-0.22/t/02-extension.t.tm Package-Stash-XS-0.22/t/02-extension.t --- Package-Stash-XS-0.22/t/02-extension.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/02-extension.t 2011-03-05 09:45:46.477402444 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 15; use Test::Fatal; { @@ -72,5 +72,3 @@ is(exception { }, undef, '... created %Foo::baz successfully'); ok(!defined($Foo::{baz}), '... the %baz slot has still not been created'); - -done_testing; diff -up Package-Stash-XS-0.22/t/03-io.t.tm Package-Stash-XS-0.22/t/03-io.t --- Package-Stash-XS-0.22/t/03-io.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/03-io.t 2011-03-05 09:45:46.477402444 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 11; use Test::Fatal; { @@ -47,5 +47,3 @@ use Package::Stash; ok($stash->has_symbol('baz'), "has baz"); is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz"); } - -done_testing; diff -up Package-Stash-XS-0.22/t/04-get.t.tm Package-Stash-XS-0.22/t/04-get.t --- Package-Stash-XS-0.22/t/04-get.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/04-get.t 2011-03-05 09:45:46.477402444 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 36; use Package::Stash; use Scalar::Util; @@ -182,5 +182,3 @@ use Scalar::Util; "stash has the right variable"); } } - -done_testing; diff -up Package-Stash-XS-0.22/t/05-isa.t.tm Package-Stash-XS-0.22/t/05-isa.t --- Package-Stash-XS-0.22/t/05-isa.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/05-isa.t 2011-03-05 09:45:46.478402600 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 1; use Package::Stash; @@ -17,6 +17,7 @@ use Package::Stash; my $stash = Package::Stash->new('Foo'); my @ISA = ('Bar'); @{$stash->get_or_add_symbol('@ISA')} = @ISA; +SKIP: { +skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88; isa_ok('Foo', 'Bar'); - -done_testing; +} diff -up Package-Stash-XS-0.22/t/06-addsub.t.tm Package-Stash-XS-0.22/t/06-addsub.t --- Package-Stash-XS-0.22/t/06-addsub.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/06-addsub.t 2011-03-05 09:45:46.478402600 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 7; use Test::Fatal; BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE @@ -42,5 +42,3 @@ $foo_stash->add_symbol( is $DB::sub{'Foo::dunk'}, sprintf "%s:%d-%d", "FileName", 100, 199, '... got the right %DB::sub value for dunk with specified args'; - -done_testing; diff -up Package-Stash-XS-0.22/t/07-edge-cases.t.tm Package-Stash-XS-0.22/t/07-edge-cases.t --- Package-Stash-XS-0.22/t/07-edge-cases.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/07-edge-cases.t 2011-03-05 09:46:27.063715248 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 16; use Test::Fatal; use Package::Stash; @@ -80,5 +80,3 @@ use_ok('CompileTime'); } ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted"); } - -done_testing; diff -up Package-Stash-XS-0.22/t/10-synopsis.t.tm Package-Stash-XS-0.22/t/10-synopsis.t --- Package-Stash-XS-0.22/t/10-synopsis.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/10-synopsis.t 2011-03-05 09:45:46.479402756 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; +use Test::More tests => 3; use Package::Stash; @@ -15,5 +15,3 @@ $stash->add_symbol('%foo', {bar => 1}); ok(!$stash->has_symbol('$foo'), "doesn't have anything in scalar slot"); my $namespace = $stash->namespace; is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly"); - -done_testing; diff -up Package-Stash-XS-0.22/t/author-20-leaks.t.tm Package-Stash-XS-0.22/t/author-20-leaks.t --- Package-Stash-XS-0.22/t/author-20-leaks.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/author-20-leaks.t 2011-03-05 09:45:46.480402911 +0000 @@ -17,6 +17,8 @@ use Test::LeakTrace; use Package::Stash; use Symbol; +plan tests => 25; + { package Bar; } @@ -144,7 +146,10 @@ use Symbol; ok($foo->has_symbol('@ISA')); is(ref($foo->get_symbol('@ISA')), 'ARRAY'); is_deeply($foo->get_symbol('@ISA'), ['Exporter']); + SKIP: { + skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88; isa_ok('Foo', 'Exporter'); + } } { @@ -198,5 +203,3 @@ use Symbol; eval { $foo->get_or_add_symbol('&blorg') }; } "doesn't leak on errors"; } - -done_testing; diff -up Package-Stash-XS-0.22/t/author-21-leaks-debug.t.tm Package-Stash-XS-0.22/t/author-21-leaks-debug.t --- Package-Stash-XS-0.22/t/author-21-leaks-debug.t.tm 2011-03-04 19:12:28.000000000 +0000 +++ Package-Stash-XS-0.22/t/author-21-leaks-debug.t 2011-03-05 09:45:46.480402911 +0000 @@ -19,6 +19,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE use Package::Stash; use Symbol; +plan tests => 25; + { package Bar; } @@ -146,7 +148,10 @@ use Symbol; ok($foo->has_symbol('@ISA')); is(ref($foo->get_symbol('@ISA')), 'ARRAY'); is_deeply($foo->get_symbol('@ISA'), ['Exporter']); + SKIP: { + skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88; isa_ok('Foo', 'Exporter'); + } } { @@ -200,5 +205,3 @@ use Symbol; eval { $foo->get_or_add_symbol('&blorg') }; } "doesn't leak on errors"; } - -done_testing;