r39038 - in /trunk/libtest-leaktrace-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/Test/ lib/Test/LeakTrace/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Wed Jul 1 14:43:51 UTC 2009


Author: jawnsy-guest
Date: Wed Jul  1 14:43:45 2009
New Revision: 39038

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39038
Log:
* New upstream release
  + Allow Test::More subtests

Modified:
    trunk/libtest-leaktrace-perl/Changes
    trunk/libtest-leaktrace-perl/META.yml
    trunk/libtest-leaktrace-perl/debian/changelog
    trunk/libtest-leaktrace-perl/inc/Module/Install.pm
    trunk/libtest-leaktrace-perl/inc/Module/Install/Base.pm
    trunk/libtest-leaktrace-perl/inc/Module/Install/MakeMaker.pm
    trunk/libtest-leaktrace-perl/inc/Module/Install/Makefile.pm
    trunk/libtest-leaktrace-perl/inc/Module/Install/Metadata.pm
    trunk/libtest-leaktrace-perl/lib/Test/LeakTrace.pm
    trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/JA.pod
    trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/Script.pm
    trunk/libtest-leaktrace-perl/ppport.h

Modified: trunk/libtest-leaktrace-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/Changes?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/Changes (original)
+++ trunk/libtest-leaktrace-perl/Changes Wed Jul  1 14:43:45 2009
@@ -1,4 +1,9 @@
 Revision history for Perl extension Test::LeakTrace
+
+0.10 Wed Jul  1 15:36:57 2009
+	- support for Test::More subtests (http://use.perl.org/~Ovid/journal/39193)
+		- thanks to charsbar (http://d.hatena.ne.jp/charsbar/20090701/1246415840)
+	- remove deprecated functions (not_leaked() and leaked_cmp_ok())
 
 0.09 Mon Mar 30 11:11:53 2009
 	- test functions become no-op under Devel::Cover (RT#294666)

Modified: trunk/libtest-leaktrace-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/META.yml?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/META.yml (original)
+++ trunk/libtest-leaktrace-perl/META.yml Wed Jul  1 14:43:45 2009
@@ -2,10 +2,12 @@
 abstract: 'Traces memory leaks'
 author:
   - 'Goro Fuji(gfx) <gfuji(at)cpan.org>.'
+build_requires:
+  ExtUtils::MakeMaker: 6.42
 configure_requires:
-  ExtUtils::MakeMaker: 6.44
+  ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.81'
+generated_by: 'Module::Install version 0.91'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -13,12 +15,14 @@
 name: Test-LeakTrace
 no_index:
   directory:
+    - example
     - inc
     - t
+    - xt
 requires:
   Exporter: 5.57
   Test::More: 0.62
   perl: 5.8.1
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.09
+version: 0.10

Modified: trunk/libtest-leaktrace-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/debian/changelog?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/debian/changelog (original)
+++ trunk/libtest-leaktrace-perl/debian/changelog Wed Jul  1 14:43:45 2009
@@ -1,3 +1,10 @@
+libtest-leaktrace-perl (0.10-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    + Allow Test::More subtests
+
+ -- Jonathan Yu <frequency at cpan.org>  Wed, 01 Jul 2009 06:27:11 -0400
+
 libtest-leaktrace-perl (0.09-2) UNRELEASED; urgency=low
 
   [ gregor herrmann ]

Modified: trunk/libtest-leaktrace-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/inc/Module/Install.pm?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install.pm Wed Jul  1 14:43:45 2009
@@ -17,12 +17,10 @@
 #     3. The ./inc/ version of Module::Install loads
 # }
 
-BEGIN {
-	require 5.004;
-}
+use 5.005;
 use strict 'vars';
 
-use vars qw{$VERSION};
+use vars qw{$VERSION $MAIN};
 BEGIN {
 	# All Module::Install core packages now require synchronised versions.
 	# This will be used to ensure we don't accidentally load old or
@@ -30,7 +28,10 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '0.81';
+	$VERSION = '0.91';
+
+	# Storage for the pseudo-singleton
+	$MAIN    = undef;
 
 	*inc::Module::Install::VERSION = *VERSION;
 	@inc::Module::Install::ISA     = __PACKAGE__;
@@ -93,6 +94,7 @@
 
 
 
+
 # Build.PL was formerly supported, but no longer is due to excessive
 # difficulty in implementing every single feature twice.
 if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
@@ -131,14 +133,22 @@
 	$sym->{$cwd} = sub {
 		my $pwd = Cwd::cwd();
 		if ( my $code = $sym->{$pwd} ) {
-			# delegate back to parent dirs
+			# Delegate back to parent dirs
 			goto &$code unless $cwd eq $pwd;
 		}
 		$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
-		unless ( uc($1) eq $1 ) {
-			unshift @_, ( $self, $1 );
-			goto &{$self->can('call')};
+		my $method = $1;
+		if ( uc($method) eq $method ) {
+			# Do nothing
+			return;
+		} elsif ( $method =~ /^_/ and $self->can($method) ) {
+			# Dispatch to the root M:I class
+			return $self->$method(@_);
 		}
+
+		# Dispatch to the appropriate plugin
+		unshift @_, ( $self, $1 );
+		goto &{$self->can('call')};
 	};
 }
 
@@ -163,6 +173,9 @@
 	delete $INC{"$self->{file}"};
 	delete $INC{"$self->{path}.pm"};
 
+	# Save to the singleton
+	$MAIN = $self;
+
 	return 1;
 }
 
@@ -176,8 +189,7 @@
 
 	my @exts = @{$self->{extensions}};
 	unless ( @exts ) {
-		my $admin = $self->{admin};
-		@exts = $admin->load_all_extensions;
+		@exts = $self->{admin}->load_all_extensions;
 	}
 
 	my %seen;
@@ -260,7 +272,7 @@
 sub load_extensions {
 	my ($self, $path, $top) = @_;
 
-	unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
+	unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
 		unshift @INC, $self->{prefix};
 	}
 
@@ -341,7 +353,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '<', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
 	}
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
@@ -372,7 +384,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '>', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
 	}
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";

Modified: trunk/libtest-leaktrace-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/inc/Module/Install/Base.pm?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/Base.pm Wed Jul  1 14:43:45 2009
@@ -1,7 +1,11 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.81';
+use strict 'vars';
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = '0.91';
+}
 
 # Suspend handler for "redefined" warnings
 BEGIN {
@@ -9,54 +13,56 @@
 	$SIG{__WARN__} = sub { $w };
 }
 
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 41
+#line 42
 
 sub new {
-    my ($class, %args) = @_;
-
-    foreach my $method ( qw(call load) ) {
-        *{"$class\::$method"} = sub {
-            shift()->_top->$method(@_);
-        } unless defined &{"$class\::$method"};
-    }
-
-    bless( \%args, $class );
+	my $class = shift;
+	unless ( defined &{"${class}::call"} ) {
+		*{"${class}::call"} = sub { shift->_top->call(@_) };
+	}
+	unless ( defined &{"${class}::load"} ) {
+		*{"${class}::load"} = sub { shift->_top->load(@_) };
+	}
+	bless { @_ }, $class;
 }
 
 #line 61
 
 sub AUTOLOAD {
-    my $self = shift;
-    local $@;
-    my $autoload = eval { $self->_top->autoload } or return;
-    goto &$autoload;
+	local $@;
+	my $func = eval { shift->_top->autoload } or return;
+	goto &$func;
 }
 
-#line 76
+#line 75
 
-sub _top { $_[0]->{_top} }
+sub _top {
+	$_[0]->{_top};
+}
 
-#line 89
+#line 90
 
 sub admin {
-    $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+	$_[0]->_top->{admin}
+	or
+	Module::Install::Base::FakeAdmin->new;
 }
 
-#line 101
+#line 106
 
 sub is_admin {
-    $_[0]->admin->VERSION;
+	$_[0]->admin->VERSION;
 }
 
 sub DESTROY {}
 
 package Module::Install::Base::FakeAdmin;
 
-my $Fake;
-sub new { $Fake ||= bless(\@_, $_[0]) }
+my $fake;
+
+sub new {
+	$fake ||= bless(\@_, $_[0]);
+}
 
 sub AUTOLOAD {}
 
@@ -69,4 +75,4 @@
 
 1;
 
-#line 146
+#line 154

Modified: trunk/libtest-leaktrace-perl/inc/Module/Install/MakeMaker.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/inc/Module/Install/MakeMaker.pm?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/MakeMaker.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/MakeMaker.pm Wed Jul  1 14:43:45 2009
@@ -2,14 +2,14 @@
 package Module::Install::MakeMaker;
 
 use strict;
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.81';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 my $makefile;

Modified: trunk/libtest-leaktrace-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/inc/Module/Install/Makefile.pm?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/Makefile.pm Wed Jul  1 14:43:45 2009
@@ -2,14 +2,14 @@
 package Module::Install::Makefile;
 
 use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.81';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub Makefile { $_[0] }
@@ -114,17 +114,32 @@
 	my $self = shift;
 	die "&Makefile->write() takes no arguments\n" if @_;
 
-	# Make sure we have a new enough
+	# Check the current Perl version
+	my $perl_version = $self->perl_version;
+	if ( $perl_version ) {
+		eval "use $perl_version; 1"
+			or die "ERROR: perl: Version $] is installed, "
+			. "but we need version >= $perl_version";
+	}
+
+	# Make sure we have a new enough MakeMaker
 	require ExtUtils::MakeMaker;
 
-	# MakeMaker can complain about module versions that include
-	# an underscore, even though its own version may contain one!
-	# Hence the funny regexp to get rid of it.  See RT #35800
-	# for details.
-
-	$self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
-
-	# Generate the
+	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
+		# MakeMaker can complain about module versions that include
+		# an underscore, even though its own version may contain one!
+		# Hence the funny regexp to get rid of it.  See RT #35800
+		# for details.
+		$self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+	} else {
+		# Allow legacy-compatibility with 5.005 by depending on the
+		# most recent EU:MM that supported 5.005.
+		$self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+	}
+
+	# Generate the MakeMaker params
 	my $args = $self->makemaker_args;
 	$args->{DISTNAME} = $self->name;
 	$args->{NAME}     = $self->module_name || $self->name;
@@ -133,7 +148,7 @@
 	if ( $self->tests ) {
 		$args->{test} = { TESTS => $self->tests };
 	}
-	if ($] >= 5.005) {
+	if ( $] >= 5.005 ) {
 		$args->{ABSTRACT} = $self->abstract;
 		$args->{AUTHOR}   = $self->author;
 	}
@@ -147,7 +162,7 @@
 		delete $args->{SIGN};
 	}
 
-	# merge both kinds of requires into prereq_pm
+	# Merge both kinds of requires into prereq_pm
 	my $prereq = ($args->{PREREQ_PM} ||= {});
 	%$prereq = ( %$prereq,
 		map { @$_ }
@@ -250,4 +265,4 @@
 
 __END__
 
-#line 379
+#line 394

Modified: trunk/libtest-leaktrace-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/inc/Module/Install/Metadata.pm?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/Metadata.pm Wed Jul  1 14:43:45 2009
@@ -2,18 +2,17 @@
 package Module::Install::Metadata;
 
 use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.81';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 
 my @boolean_keys = qw{
 	sign
-	mymeta
 };
 
 my @scalar_keys = qw{
@@ -440,21 +439,21 @@
 	/ixms ) {
 		my $license_text = $1;
 		my @phrases      = (
-			'under the same (?:terms|license) as perl itself' => 'perl',        1,
-			'GNU general public license'                      => 'gpl',         1,
-			'GNU public license'                              => 'gpl',         1,
-			'GNU lesser general public license'               => 'lgpl',        1,
-			'GNU lesser public license'                       => 'lgpl',        1,
-			'GNU library general public license'              => 'lgpl',        1,
-			'GNU library public license'                      => 'lgpl',        1,
-			'BSD license'                                     => 'bsd',         1,
-			'Artistic license'                                => 'artistic',    1,
-			'GPL'                                             => 'gpl',         1,
-			'LGPL'                                            => 'lgpl',        1,
-			'BSD'                                             => 'bsd',         1,
-			'Artistic'                                        => 'artistic',    1,
-			'MIT'                                             => 'mit',         1,
-			'proprietary'                                     => 'proprietary', 0,
+			'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+			'GNU general public license'         => 'gpl',         1,
+			'GNU public license'                 => 'gpl',         1,
+			'GNU lesser general public license'  => 'lgpl',        1,
+			'GNU lesser public license'          => 'lgpl',        1,
+			'GNU library general public license' => 'lgpl',        1,
+			'GNU library public license'         => 'lgpl',        1,
+			'BSD license'                        => 'bsd',         1,
+			'Artistic license'                   => 'artistic',    1,
+			'GPL'                                => 'gpl',         1,
+			'LGPL'                               => 'lgpl',        1,
+			'BSD'                                => 'bsd',         1,
+			'Artistic'                           => 'artistic',    1,
+			'MIT'                                => 'mit',         1,
+			'proprietary'                        => 'proprietary', 0,
 		);
 		while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
 			$pattern =~ s{\s+}{\\s+}g;
@@ -506,17 +505,29 @@
 	}
 }
 
+sub test_requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->test_requires( $module => $version );
+	}
+}
+
 # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
 # numbers (eg, 5.006001 or 5.008009).
 # Also, convert double-part versions (eg, 5.8)
 sub _perl_version {
 	my $v = $_[-1];
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;	
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
 	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
 	$v =~ s/(\.\d\d\d)000$/$1/;
 	$v =~ s/_.+$//;
 	if ( ref($v) ) {
-		$v = $v + 0; # Numify
+		# Numify
+		$v = $v + 0;
 	}
 	return $v;
 }
@@ -526,21 +537,56 @@
 
 
 ######################################################################
-# MYMETA.yml Support
+# MYMETA Support
 
 sub WriteMyMeta {
 	die "WriteMyMeta has been deprecated";
 }
 
-sub write_mymeta {
-	my $self = shift;
-	
-	# If there's no existing META.yml there is nothing we can do
-	return unless -f 'META.yml';
+sub write_mymeta_yaml {
+	my $self = shift;
 
 	# We need YAML::Tiny to write the MYMETA.yml file
 	unless ( eval { require YAML::Tiny; 1; } ) {
 		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.yml\n";
+	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+	my $self = shift;
+
+	# We need JSON to write the MYMETA.json file
+	unless ( eval { require JSON; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.json\n";
+	Module::Install::_write(
+		'MYMETA.json',
+		JSON->new->pretty(1)->canonical->encode($meta),
+	);
+}
+
+sub _write_mymeta_data {
+	my $self = shift;
+
+	# If there's no existing META.yml there is nothing we can do
+	return undef unless -f 'META.yml';
+
+	# We need Parse::CPAN::Meta to load the file
+	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+		return undef;
 	}
 
 	# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
 	}
 
 	# Load the advisory META.yml file
-	my @yaml = YAML::Tiny::LoadFile('META.yml');
+	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
 	my $meta = $yaml[0];
 
 	# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
 		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
 	}
 
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);	
+	return $meta;
 }
 
 1;

Modified: trunk/libtest-leaktrace-perl/lib/Test/LeakTrace.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/lib/Test/LeakTrace.pm?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/lib/Test/LeakTrace.pm (original)
+++ trunk/libtest-leaktrace-perl/lib/Test/LeakTrace.pm Wed Jul  1 14:43:45 2009
@@ -4,12 +4,15 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
-use Exporter qw(import);
+use Test::Builder::Module;
+our @ISA = qw(Test::Builder::Module);
+
+use Exporter qw(import); # use Exporter::import for backward compatibility
 our @EXPORT = qw(
 	leaktrace leaked_refs leaked_info leaked_count
 	no_leaks_ok leaks_cmp_ok
@@ -21,17 +24,6 @@
 	util => [qw(leaktrace leaked_refs leaked_info leaked_count)],
 );
 
-# for backwords compatibility (< 0.06)
-# they will been removed at 0.10
-push @EXPORT, qw(not_leaked leaked_cmp_ok);
-sub not_leaked(&;$){
-	warnings::warnif deprecated => 'not_leaked() is deprecated. Use no_leaks_ok() instead.';
-	goto &no_leaks_ok;
-}
-sub leaked_cmp_ok(&$$;$){
-	warnings::warnif deprecated => 'leaked_cmp_ok() is deprecated. Use leaks_cmp_ok() instead.';
-	goto &leaks_cmp_ok;
-}
 
 sub _do_leaktrace{
 	my($block, $name, $need_stateinfo, $mode) = @_;
@@ -79,8 +71,7 @@
 sub leaks_cmp_ok(&$$;$){
 	my($block, $cmp_op, $expected, $description) = @_;
 
-	require 'Test/Builder.pm'; # not to create its namespace
-	my $Test = Test::Builder->new();
+	my $Test = __PACKAGE__->builder;
 
 	if(!_runops_installed()){
 		my $mod = exists $INC{'Devel/Cover.pm'} ? 'Devel::Cover' : 'strange runops routines';
@@ -131,7 +122,7 @@
 
 =head1 VERSION
 
-This document describes Test::LeakTrace version 0.09.
+This document describes Test::LeakTrace version 0.10.
 
 =head1 SYNOPSIS
 

Modified: trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/JA.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/JA.pod?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/JA.pod (original)
+++ trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/JA.pod Wed Jul  1 14:43:45 2009
@@ -7,7 +7,7 @@
 
 =head1 VERSION
 
-This document describes Test::LeakTrace version 0.09.
+This document describes Test::LeakTrace version 0.10.
 
 =head1 SYNOPSIS
 

Modified: trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/Script.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/Script.pm?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/Script.pm (original)
+++ trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/Script.pm Wed Jul  1 14:43:45 2009
@@ -11,6 +11,8 @@
 
 	$Mode = shift if @_;
 }
+
+no warnings 'void';
 
 INIT{
 	Test::LeakTrace::_start(1);

Modified: trunk/libtest-leaktrace-perl/ppport.h
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/ppport.h?rev=39038&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/ppport.h (original)
+++ trunk/libtest-leaktrace-perl/ppport.h Wed Jul  1 14:43:45 2009
@@ -4,7 +4,7 @@
 /*
 ----------------------------------------------------------------------
 
-    ppport.h -- Perl/Pollution/Portability Version 3.16
+    ppport.h -- Perl/Pollution/Portability Version 3.19
 
     Automatically created by Devel::PPPort running under perl 5.010000.
 
@@ -23,8 +23,8 @@
 if (@ARGV && $ARGV[0] eq '--unstrip') {
   eval { require Devel::PPPort };
   $@ and die "Cannot require Devel::PPPort, please install.\n";
-  if (eval $Devel::PPPort::VERSION < 3.16) {
-    die "ppport.h was originally generated with Devel::PPPort 3.16.\n"
+  if (eval $Devel::PPPort::VERSION < 3.19) {
+    die "ppport.h was originally generated with Devel::PPPort 3.19.\n"
       . "Your Devel::PPPort is only version $Devel::PPPort::VERSION.\n"
       . "Please install a newer version, or --unstrip will not work.\n";
   }
@@ -545,15 +545,28 @@
 #endif
 #define INT2PTR(any,d) (any)(PTRV)(d)
 #endif
-#define NUM2PTR(any,d) (any)(PTRV)(d)
-#define PTR2IV(p) INT2PTR(IV,p)
-#define PTR2UV(p) INT2PTR(UV,p)
-#define PTR2NV(p) NUM2PTR(NV,p)
+#endif
+#ifndef PTR2ul
 #if PTRSIZE == LONGSIZE
 #define PTR2ul(p) (unsigned long)(p)
 #else
 #define PTR2ul(p) INT2PTR(unsigned long,p)
 #endif
+#endif
+#ifndef PTR2nat
+#define PTR2nat(p) (PTRV)(p)
+#endif
+#ifndef NUM2PTR
+#define NUM2PTR(any,d) (any)PTR2nat(d)
+#endif
+#ifndef PTR2IV
+#define PTR2IV(p) INT2PTR(IV,p)
+#endif
+#ifndef PTR2UV
+#define PTR2UV(p) INT2PTR(UV,p)
+#endif
+#ifndef PTR2NV
+#define PTR2NV(p) NUM2PTR(NV,p)
 #endif
 #undef START_EXTERN_C
 #undef END_EXTERN_C
@@ -653,6 +666,12 @@
 PL_stack_sp = PL_stack_base + ax + ((off) - 1); \
 return; \
 } STMT_END
+#endif
+#ifndef XSPROTO
+#define XSPROTO(name) void name(pTHX_ CV* cv)
+#endif
+#ifndef SVfARG
+#define SVfARG(p) ((void*)(p))
 #endif
 #ifndef PERL_ABS
 #define PERL_ABS(x) ((x) < 0 ? -(x) : (x))
@@ -789,9 +808,11 @@
 #define PL_dirty dirty
 #define PL_dowarn dowarn
 #define PL_errgv errgv
+#define PL_error_count error_count
 #define PL_expect expect
 #define PL_hexdigit hexdigit
 #define PL_hints hints
+#define PL_in_my in_my
 #define PL_laststatval laststatval
 #define PL_lex_state lex_state
 #define PL_lex_stuff lex_stuff
@@ -845,6 +866,9 @@
 #define PL_lex_state D_PPP_my_PL_parser_var(lex_state)
 #define PL_lex_stuff D_PPP_my_PL_parser_var(lex_stuff)
 #define PL_tokenbuf D_PPP_my_PL_parser_var(tokenbuf)
+#define PL_in_my D_PPP_my_PL_parser_var(in_my)
+#define PL_in_my_stash D_PPP_my_PL_parser_var(in_my_stash)
+#define PL_error_count D_PPP_my_PL_parser_var(error_count)
 #else
 #define PL_parser ((void *) 1)
 #endif
@@ -1251,6 +1275,28 @@
 #ifndef SvREFCNT_inc_simple_void_NN
 #define SvREFCNT_inc_simple_void_NN(sv) (void)(++SvREFCNT((SV*)(sv)))
 #endif
+#ifndef newSV_type
+#if defined(NEED_newSV_type)
+static SV* DPPP_(my_newSV_type)(pTHX_ svtype const t);
+static
+#else
+extern SV* DPPP_(my_newSV_type)(pTHX_ svtype const t);
+#endif
+#ifdef newSV_type
+#undef newSV_type
+#endif
+#define newSV_type(a) DPPP_(my_newSV_type)(aTHX_ a)
+#define Perl_newSV_type DPPP_(my_newSV_type)
+#if defined(NEED_newSV_type) || defined(NEED_newSV_type_GLOBAL)
+SV*
+DPPP_(my_newSV_type)(pTHX_ svtype const t)
+{
+SV* const sv = newSV(0);
+sv_upgrade(sv, t);
+return sv;
+}
+#endif
+#endif
 #if (PERL_BCDVERSION < 0x5006000)
 #define D_PPP_CONSTPV_ARG(x) ((char *) (x))
 #else
@@ -1716,6 +1762,18 @@
 #ifndef SvSHARED_HASH
 #define SvSHARED_HASH(sv) (0 + SvUVX(sv))
 #endif
+#ifndef HvNAME_get
+#define HvNAME_get(hv) HvNAME(hv)
+#endif
+#ifndef HvNAMELEN_get
+#define HvNAMELEN_get(hv) (HvNAME_get(hv) ? (I32)strlen(HvNAME_get(hv)) : 0)
+#endif
+#ifndef GvSVn
+#define GvSVn(gv) GvSV(gv)
+#endif
+#ifndef isGV_with_GP
+#define isGV_with_GP(gv) isGV(gv)
+#endif
 #ifndef WARN_ALL
 #define WARN_ALL 0
 #endif
@@ -1901,6 +1959,9 @@
 #ifndef newSVpvs_flags
 #define newSVpvs_flags(str, flags) newSVpvn_flags(str "", sizeof(str) - 1, flags)
 #endif
+#ifndef newSVpvs_share
+#define newSVpvs_share(str) newSVpvn_share(str "", sizeof(str) - 1, 0)
+#endif
 #ifndef sv_catpvs
 #define sv_catpvs(sv, str) sv_catpvn(sv, str "", sizeof(str) - 1)
 #endif
@@ -1912,6 +1973,15 @@
 #endif
 #ifndef hv_stores
 #define hv_stores(hv, key, val) hv_store(hv, key "", sizeof(key) - 1, val, 0)
+#endif
+#ifndef gv_fetchpvn_flags
+#define gv_fetchpvn_flags(name, len, flags, svt) gv_fetchpv(name, flags, svt)
+#endif
+#ifndef gv_fetchpvs
+#define gv_fetchpvs(name, flags, svt) gv_fetchpvn_flags(name "", sizeof(name) - 1, flags, svt)
+#endif
+#ifndef gv_stashpvs
+#define gv_stashpvs(name, flags) gv_stashpvn(name "", sizeof(name) - 1, flags)
 #endif
 #ifndef SvGETMAGIC
 #define SvGETMAGIC(x) STMT_START { if (SvGMAGICAL(x)) mg_get(x); } STMT_END




More information about the Pkg-perl-cvs-commits mailing list