Skip to content

Commit

Permalink
Get test suite to pass under 5.13.6 (peepeeness!)
Browse files Browse the repository at this point in the history
  • Loading branch information
ribasushi committed Oct 26, 2010
1 parent e660028 commit d12d827
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 7 additions & 2 deletions t/52leaks.t
Expand Up @@ -12,6 +12,11 @@ BEGIN {
}

use Test::More;
BEGIN {
plan skip_all => '5.13.6 leaks like a sieve (fixed in blead/cefd5c7c)'
if $] == '5.013006';
}

use Scalar::Util qw/refaddr reftype weaken/;
use Carp qw/longmess/;
use Try::Tiny;
Expand Down Expand Up @@ -151,11 +156,11 @@ memory_cycle_ok($weak_registry, 'No cycles in the weakened object collection')
# Naturally we have some exceptions
my $cleared;
for my $slot (keys %$weak_registry) {
if ($slot =~ /^SQL\:\:Translator/) {
if ($slot =~ /^\QSQL::Translator/) {
# SQLT is a piece of shit, leaks all over
delete $weak_registry->{$slot};
}
elsif ($slot =~ /^Hash\:\:Merge/) {
elsif ($slot =~ /^\QHash::Merge/) {
# only clear one object - more would indicate trouble
delete $weak_registry->{$slot}
unless $cleared->{hash_merge_singleton}{$weak_registry->{$slot}{weakref}{behavior}}++;
Expand Down
2 changes: 2 additions & 0 deletions t/lib/DBICTest.pm
Expand Up @@ -112,6 +112,8 @@ sub _database {
}

sub __mk_disconnect_guard {
return if $] == '5.013006'; # leaks handles, delaying DESTROY, can't work right

my $db_file = shift;
return unless -f $db_file;

Expand Down

0 comments on commit d12d827

Please sign in to comment.