Change 34681 by [EMAIL PROTECTED] on 2008/10/31 10:27:18
Integrate:
[ 34663]
Integrate:
[ 34648]
Subject: Fwd: CPAN Upload: S/SA/SAPER/constant-1.17.tar.gz
From: Sébastien Aperghis-Tramoni <[EMAIL PROTECTED]>
Message-Id: <[EMAIL PROTECTED]>
Date: Wed, 29 Oct 2008 22:58:52 +0100
Affected files ...
... //depot/maint-5.8/perl/lib/constant.pm#7 integrate
... //depot/maint-5.8/perl/lib/constant.t#9 integrate
Differences ...
==== //depot/maint-5.8/perl/lib/constant.pm#7 (text) ====
Index: perl/lib/constant.pm
--- perl/lib/constant.pm#6~34431~ 2008-09-27 01:16:41.000000000 -0700
+++ perl/lib/constant.pm 2008-10-31 03:27:18.000000000 -0700
@@ -4,7 +4,7 @@
use warnings::register;
use vars qw($VERSION %declared);
-$VERSION = '1.16';
+$VERSION = '1.17';
#=======================================================================
==== //depot/maint-5.8/perl/lib/constant.t#9 (text) ====
Index: perl/lib/constant.t
--- perl/lib/constant.t#8~33173~ 2008-02-01 11:33:57.000000000 -0800
+++ perl/lib/constant.t 2008-10-31 03:27:18.000000000 -0700
@@ -12,11 +12,11 @@
BEGIN { # ...and save 'em for later
$SIG{'__WARN__'} = sub { push @warnings, @_ }
}
-END { print STDERR @warnings }
+END { @warnings && print STDERR join "\n- ", "accumulated warnings:",
@warnings }
use strict;
-use Test::More tests => 103;
+use Test::More tests => 101;
my $TB = Test::More->builder;
BEGIN { use_ok('constant'); }
@@ -80,13 +80,6 @@
is MESS, q('"'\\"'"\\);
is length(MESS), 8;
-use constant TRAILING => '12 cats';
-{
- local $^W;
- cmp_ok TRAILING, '==', 12;
-}
-is TRAILING, '12 cats';
-
use constant LEADING => " \t1234";
cmp_ok LEADING, '==', 1234;
is LEADING, " \t1234";
@@ -112,7 +105,7 @@
# text may vary, so we can't test much better than this.
cmp_ok length(E2BIG), '>', 6;
-is @warnings, 0 or diag join "\n", "unexpected warning", @warnings;
+is @warnings, 0 or diag join "\n- ", "unexpected warning:", @warnings;
@warnings = (); # just in case
undef &PI;
ok @warnings && ($warnings[0] =~ /Constant sub.* undefined/) or
@@ -122,9 +115,9 @@
is @warnings, 0, "unexpected warning";
my $curr_test = $TB->current_test;
-use constant CSCALAR => \"ok 37\n";
-use constant CHASH => { foo => "ok 38\n" };
-use constant CARRAY => [ undef, "ok 39\n" ];
+use constant CSCALAR => \"ok 35\n";
+use constant CHASH => { foo => "ok 36\n" };
+use constant CARRAY => [ undef, "ok 37\n" ];
use constant CPHASH => [ { foo => 1 }, "ok 40\n" ];
use constant CCODE => sub { "ok $_[0]\n" };
End of Patch.
