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

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Thu Aug 5 10:05:51 UTC 2010


Author: ansgar-guest
Date: Thu Aug  5 10:05:32 2010
New Revision: 61199

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61199
Log:
* New upstream release.
* Allows negative values in no_leaks_ok. This allows the tests for
  cipux-rpc and cipux-storage to pass again. (Closes: #591138, #591141)
* debian/copyright: Update years of copyright; refer to
  /usr/share/common-licenses/GPL-1.
* Make build-dep on perl unversioned: stable already has 5.10.
* debian/rules: Use sed to fix path to perl interpreter in example scripts.
* Bump Standards-Version to 3.9.1.
* Add myself to Uploaders.

Modified:
    trunk/libtest-leaktrace-perl/Changes
    trunk/libtest-leaktrace-perl/LeakTrace.xs
    trunk/libtest-leaktrace-perl/META.yml
    trunk/libtest-leaktrace-perl/debian/changelog
    trunk/libtest-leaktrace-perl/debian/control
    trunk/libtest-leaktrace-perl/debian/copyright
    trunk/libtest-leaktrace-perl/debian/rules
    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/t/03_count.t
    trunk/libtest-leaktrace-perl/t/10_bad_use.t

Modified: trunk/libtest-leaktrace-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/Changes?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/Changes (original)
+++ trunk/libtest-leaktrace-perl/Changes Thu Aug  5 10:05:32 2010
@@ -1,4 +1,11 @@
 Revision history for Perl extension Test::LeakTrace
+
+0.13 Sun Aug  1 15:17:23 2010
+    - Fix tests for older perls
+
+0.12 Sun Aug  1 15:11:34 2010
+    - Use ">= 0", instead of "== 0" for no_leaks_ok()
+    - Add count_sv() to count all the SVs in a perl interpreter
 
 0.11 Mon Jun 14 16:16:49 2010
     - Resolve RT #58133: "False-positive related to XS code"

Modified: trunk/libtest-leaktrace-perl/LeakTrace.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/LeakTrace.xs?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/LeakTrace.xs (original)
+++ trunk/libtest-leaktrace-perl/LeakTrace.xs Thu Aug  5 10:05:32 2010
@@ -499,7 +499,7 @@
     RETVAL
 
 UV
-_count_sv_in_arena()
+count_sv()
 CODE:
     RETVAL = count_sv_in_arena(aTHX);
 OUTPUT:

Modified: trunk/libtest-leaktrace-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/META.yml?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/META.yml (original)
+++ trunk/libtest-leaktrace-perl/META.yml Thu Aug  5 10:05:32 2010
@@ -7,7 +7,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.98'
+generated_by: 'Module::Install version 1.00'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -26,4 +26,4 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/gfx/Perl-Test-LeakTrace.git
-version: 0.11
+version: 0.13

Modified: trunk/libtest-leaktrace-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/debian/changelog?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/debian/changelog (original)
+++ trunk/libtest-leaktrace-perl/debian/changelog Thu Aug  5 10:05:32 2010
@@ -1,3 +1,17 @@
+libtest-leaktrace-perl (0.13-1) unstable; urgency=low
+
+  * New upstream release.
+  * Allows negative values in no_leaks_ok. This allows the tests for
+    cipux-rpc and cipux-storage to pass again. (Closes: #591138, #591141)
+  * debian/copyright: Update years of copyright; refer to
+    /usr/share/common-licenses/GPL-1.
+  * Make build-dep on perl unversioned: stable already has 5.10.
+  * debian/rules: Use sed to fix path to perl interpreter in example scripts.
+  * Bump Standards-Version to 3.9.1.
+  * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Thu, 05 Aug 2010 19:01:10 +0900
+
 libtest-leaktrace-perl (0.11-1) unstable; urgency=low
 
   [ Ryan Niebur ]

Modified: trunk/libtest-leaktrace-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/debian/control?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/debian/control (original)
+++ trunk/libtest-leaktrace-perl/debian/control Thu Aug  5 10:05:32 2010
@@ -1,11 +1,11 @@
 Source: libtest-leaktrace-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), perl (>= 5.10.0)
+Build-Depends: debhelper (>= 7.0.50~), perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Xavier Oswald <x.oswald at free.fr>, Jonathan Yu <jawnsy at cpan.org>,
- Chris Butler <chrisb at debian.org>
-Standards-Version: 3.8.4
+ Chris Butler <chrisb at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>
+Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/Test-LeakTrace/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtest-leaktrace-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libtest-leaktrace-perl/

Modified: trunk/libtest-leaktrace-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/debian/copyright?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/debian/copyright (original)
+++ trunk/libtest-leaktrace-perl/debian/copyright Thu Aug  5 10:05:32 2010
@@ -3,8 +3,7 @@
 Source: http://search.cpan.org/dist/Test-LeakTrace/
 Name: Test-LeakTrace
 
-Files: *
-Copyright: 2009, Goro Fuji (gfx) <gfuji(at)cpan.org>.
+Copyright: 2010, Goro Fuji (gfx) <gfuji(at)cpan.org>.
 License: Artistic or GPL-1+
 
 Files: debian/*
@@ -28,12 +27,13 @@
 Files: ptr_table.h
 Copyright: 1991-2007 by Larry Wall and others
 License: Artistic or GPL-1+
+
 License: Artistic
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License, which comes with Perl.
  .
  On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ can be found in `/usr/share/common-licenses/Artistic'.
 
 License: GPL-1+
  This program is free software; you can redistribute it and/or modify
@@ -41,5 +41,5 @@
  the Free Software Foundation; either version 1, or (at your option)
  any later version.
  .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ On Debian GNU/Linux systems, the complete text of version 1 of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.

Modified: trunk/libtest-leaktrace-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/debian/rules?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/debian/rules (original)
+++ trunk/libtest-leaktrace-perl/debian/rules Thu Aug  5 10:05:32 2010
@@ -1,4 +1,11 @@
 #!/usr/bin/make -f
+
+PACKAGE := $(shell dh_listpackages)
+TMP     := $(CURDIR)/debian/$(PACKAGE)
 
 %:
 	dh $@
+
+override_dh_installexamples:
+	dh_installexamples
+	sed -i "1s,#!perl,#!/usr/bin/perl," $(TMP)/usr/share/doc/$(PACKAGE)/examples/*

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=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install.pm Thu Aug  5 10:05:32 2010
@@ -22,7 +22,6 @@
 use Cwd        ();
 use File::Find ();
 use File::Path ();
-use FindBin;
 
 use vars qw{$VERSION $MAIN};
 BEGIN {
@@ -32,7 +31,7 @@
 	# 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.98';
+	$VERSION = '1.00';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -231,7 +230,12 @@
 sub new {
 	my ($class, %args) = @_;
 
-	FindBin->again;
+	delete $INC{'FindBin.pm'};
+	{
+		# to suppress the redefine warning
+		local $SIG{__WARN__} = sub {};
+		require FindBin;
+	}
 
 	# ignore the prefix on extension modules built from top level.
 	my $base_path = Cwd::abs_path($FindBin::Bin);

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=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/Base.pm Thu Aug  5 10:05:32 2010
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.98';
+	$VERSION = '1.00';
 }
 
 # Suspend handler for "redefined" warnings

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=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/MakeMaker.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/MakeMaker.pm Thu Aug  5 10:05:32 2010
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.98';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

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=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/Makefile.pm Thu Aug  5 10:05:32 2010
@@ -8,7 +8,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.98';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

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=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libtest-leaktrace-perl/inc/Module/Install/Metadata.pm Thu Aug  5 10:05:32 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.98';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 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=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/lib/Test/LeakTrace.pm (original)
+++ trunk/libtest-leaktrace-perl/lib/Test/LeakTrace.pm Thu Aug  5 10:05:32 2010
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.11';
+our $VERSION = '0.13';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
@@ -16,12 +16,13 @@
 our @EXPORT = qw(
     leaktrace leaked_refs leaked_info leaked_count
     no_leaks_ok leaks_cmp_ok
+    count_sv
 );
 
 our %EXPORT_TAGS = (
     all  => \@EXPORT,
     test => [qw(no_leaks_ok leaks_cmp_ok)],
-    util => [qw(leaktrace leaked_refs leaked_info leaked_count)],
+    util => [qw(leaktrace leaked_refs leaked_info leaked_count count_sv)],
 );
 
 
@@ -30,6 +31,13 @@
 
     if(!defined($mode) && !defined wantarray){
         warnings::warnif void => "Useless use of $name() in void context";
+    }
+
+    if($name eq 'leaked_count') {
+        my $start;
+        $start = count_sv();
+        $block->();
+        return count_sv() - $start;
     }
 
     local $SIG{__DIE__} = 'DEFAULT';
@@ -81,11 +89,7 @@
     # calls to prepare cache in $block
     $block->();
 
-    #my $got = _do_leaktrace($block, 'leaked_count', 0);
-    my($start, $got);
-    $start = _count_sv_in_arena();
-    $block->();
-    $got   = _count_sv_in_arena() - $start;
+    my $got = _do_leaktrace($block, 'leaked_count', 0);
 
     my $desc = sprintf 'leaks %s %-2s %s', $got, $cmp_op, $expected;
     if(defined $description){
@@ -110,7 +114,7 @@
 
 sub no_leaks_ok(&;$){
     # ($block, $description)
-    splice @_, 1, 0, ('==', 0); # ($block, '==', 0, $description);
+    splice @_, 1, 0, ('<=', 0); # ($block, '<=', 0, $description);
     goto &leaks_cmp_ok;
 }
 
@@ -126,7 +130,7 @@
 
 =head1 VERSION
 
-This document describes Test::LeakTrace version 0.11.
+This document describes Test::LeakTrace version 0.13.
 
 =head1 SYNOPSIS
 
@@ -244,6 +248,10 @@
 Note that I<BLOCK> is called more than once. This is because
 I<BLOCK> might prepare caches which are not memory leaks.
 
+=head3 C<< count_sv() >>
+
+Counts all the SVs in the arena.
+
 =head2 Script interface
 
 Like C<Devel::LeakTrace> C<Test::LeakTrace::Script> is provided for whole scripts.
@@ -323,7 +331,7 @@
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright (c) 2009, Goro Fuji(gfx). Some rights reserved.
+Copyright (c) 2009-2010, Goro Fuji(gfx). All rights reserved.
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.

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=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/JA.pod (original)
+++ trunk/libtest-leaktrace-perl/lib/Test/LeakTrace/JA.pod Thu Aug  5 10:05:32 2010
@@ -7,7 +7,7 @@
 
 =head1 VERSION
 
-This document describes Test::LeakTrace version 0.11.
+This document describes Test::LeakTrace version 0.13.
 
 =head1 SYNOPSIS
 

Modified: trunk/libtest-leaktrace-perl/t/03_count.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/t/03_count.t?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/t/03_count.t (original)
+++ trunk/libtest-leaktrace-perl/t/03_count.t Thu Aug  5 10:05:32 2010
@@ -12,8 +12,8 @@
 	$a{b} = 1;
 	$b{a} = 2;
 }
-is leaked_count(\&normal), 0, 'not leaked(1)';
-is leaked_count(\&normal), 0, 'not leaked(2)';
+cmp_ok leaked_count(\&normal), '<=', 0, 'not leaked(1)';
+cmp_ok leaked_count(\&normal), '<=', 0, 'not leaked(2)';
 
 sub leaked{
 	my %a;

Modified: trunk/libtest-leaktrace-perl/t/10_bad_use.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-leaktrace-perl/t/10_bad_use.t?rev=61199&op=diff
==============================================================================
--- trunk/libtest-leaktrace-perl/t/10_bad_use.t (original)
+++ trunk/libtest-leaktrace-perl/t/10_bad_use.t Thu Aug  5 10:05:32 2010
@@ -7,8 +7,8 @@
 
 for(1 .. 2){
 	eval{
-		my $count = leaked_count{
-			my $count = leaked_count{
+		my @a = leaked_refs{
+			my @b = leaked_refs{
 				my %a = (foo => 42);
 				my %b = (bar => 3.14);
 




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