Change 30695 by [EMAIL PROTECTED] on 2007/03/22 20:59:51
Integrate:
[ 29056]
Subject: Re: Off by one in the trie code?
From: demerphq <[EMAIL PROTECTED]>
Date: Wed, 18 Oct 2006 20:51:41 +0200
Message-ID: <[EMAIL PROTECTED]>
change test files that do a require "./test.pl"; without a BEGIN block
to ensure prototypes are seen, plus fix any breakage this reveals.
[ 29178]
Regression test by Yves Orton for : [perl #36046] Special var @-
becomes arbitrarily large
Affected files ...
... //depot/maint-5.8/perl/ext/Devel/Peek/t/Peek.t#13 integrate
... //depot/maint-5.8/perl/ext/POSIX/t/posix.t#11 integrate
... //depot/maint-5.8/perl/lib/vmsish.t#6 integrate
... //depot/maint-5.8/perl/t/comp/parser.t#22 integrate
... //depot/maint-5.8/perl/t/comp/utf.t#5 integrate
... //depot/maint-5.8/perl/t/io/argv.t#4 integrate
... //depot/maint-5.8/perl/t/io/utf8.t#12 integrate
... //depot/maint-5.8/perl/t/op/pat.t#45 integrate
... //depot/maint-5.8/perl/t/op/stash.t#4 integrate
... //depot/maint-5.8/perl/t/run/switchC.t#5 integrate
... //depot/maint-5.8/perl/t/run/switchd.t#8 integrate
... //depot/maint-5.8/perl/t/run/switches.t#8 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/Devel/Peek/t/Peek.t#13 (text) ====
Index: perl/ext/Devel/Peek/t/Peek.t
--- perl/ext/Devel/Peek/t/Peek.t#12~30341~ 2007-02-17 09:38:25.000000000
-0800
+++ perl/ext/Devel/Peek/t/Peek.t 2007-03-22 13:59:51.000000000 -0700
@@ -10,7 +10,7 @@
}
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
use Devel::Peek;
==== //depot/maint-5.8/perl/ext/POSIX/t/posix.t#11 (text) ====
Index: perl/ext/POSIX/t/posix.t
--- perl/ext/POSIX/t/posix.t#10~30522~ 2007-03-09 09:20:49.000000000 -0800
+++ perl/ext/POSIX/t/posix.t 2007-03-22 13:59:51.000000000 -0700
@@ -10,7 +10,7 @@
}
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan(tests => 66);
use POSIX qw(fcntl_h signal_h limits_h _exit getcwd open read strftime write
==== //depot/maint-5.8/perl/lib/vmsish.t#6 (text) ====
Index: perl/lib/vmsish.t
--- perl/lib/vmsish.t#5~30159~ 2007-02-07 08:57:11.000000000 -0800
+++ perl/lib/vmsish.t 2007-03-22 13:59:51.000000000 -0700
@@ -10,7 +10,7 @@
my $Invoke_Perl = qq(MCR $perl "-I[-.lib]");
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan(tests => 25);
SKIP: {
==== //depot/maint-5.8/perl/t/comp/parser.t#22 (text) ====
Index: perl/t/comp/parser.t
--- perl/t/comp/parser.t#21~30663~ 2007-03-21 11:17:59.000000000 -0700
+++ perl/t/comp/parser.t 2007-03-22 13:59:51.000000000 -0700
@@ -8,7 +8,7 @@
@INC = '../lib';
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan( tests => 95 );
eval '[EMAIL PROTECTED];';
==== //depot/maint-5.8/perl/t/comp/utf.t#5 (text) ====
Index: perl/t/comp/utf.t
--- perl/t/comp/utf.t#4~22986~ 2004-06-23 08:30:36.000000000 -0700
+++ perl/t/comp/utf.t 2007-03-22 13:59:51.000000000 -0700
@@ -18,7 +18,7 @@
}
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan(tests => 15);
==== //depot/maint-5.8/perl/t/io/argv.t#4 (xtext) ====
Index: perl/t/io/argv.t
--- perl/t/io/argv.t#3~26697~ 2006-01-07 05:18:30.000000000 -0800
+++ perl/t/io/argv.t 2007-03-22 13:59:51.000000000 -0700
@@ -5,7 +5,7 @@
@INC = '../lib';
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan(tests => 22);
==== //depot/maint-5.8/perl/t/io/utf8.t#12 (xtext) ====
Index: perl/t/io/utf8.t
--- perl/t/io/utf8.t#11~30498~ 2007-03-07 09:01:50.000000000 -0800
+++ perl/t/io/utf8.t 2007-03-22 13:59:51.000000000 -0700
@@ -11,7 +11,7 @@
no utf8; # needed for use utf8 not griping about the raw octets
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan(tests => 55);
@@ -231,7 +231,7 @@
print F chr(0x100);
close(F);
- isnt( defined $@ );
+ isnt( defined $@, !0 );
undef $@;
open F, ">a";
@@ -239,7 +239,7 @@
print F chr(0x100);
close(F);
- isnt( defined $@ );
+ isnt( defined $@, !0 );
no warnings 'utf8';
@@ -248,7 +248,7 @@
print F chr(0x100);
close(F);
- isnt( defined $@ );
+ isnt( defined $@, !0 );
use warnings 'utf8';
==== //depot/maint-5.8/perl/t/op/pat.t#45 (xtext) ====
Index: perl/t/op/pat.t
--- perl/t/op/pat.t#44~30694~ 2007-03-22 12:09:14.000000000 -0700
+++ perl/t/op/pat.t 2007-03-22 13:59:51.000000000 -0700
@@ -6,9 +6,6 @@
$| = 1;
-# please update note at bottom of file when you change this
-print "1..1248\n";
-
BEGIN {
chdir 't' if -d 't';
@INC = '../lib';
@@ -3763,5 +3760,16 @@
ok($ok, $msg);
}
+{
+ my $str='abc';
+ my $count=0;
+ my $mval=0;
+ my $pval=0;
+ while ($str=~/b/g) { $mval=$#-; $pval=$#+; $count++ }
+ iseq($mval,0,"[EMAIL PROTECTED] should be empty [RT#36046]");
+ iseq($pval,0,"[EMAIL PROTECTED] should be empty [RT#36046]");
+ iseq($count,1,"should have matched once only [RT#36046]");
+}
-# last test 1248
+# Don't forget to update this!
+BEGIN{print "1..1251\n"};
==== //depot/maint-5.8/perl/t/op/stash.t#4 (text) ====
Index: perl/t/op/stash.t
--- perl/t/op/stash.t#3~30191~ 2007-02-10 09:19:08.000000000 -0800
+++ perl/t/op/stash.t 2007-03-22 13:59:51.000000000 -0700
@@ -5,7 +5,7 @@
@INC = qw(../lib);
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan( tests => 11 );
==== //depot/maint-5.8/perl/t/run/switchC.t#5 (text) ====
Index: perl/t/run/switchC.t
--- perl/t/run/switchC.t#4~19103~ 2003-03-31 02:41:09.000000000 -0800
+++ perl/t/run/switchC.t 2007-03-22 13:59:51.000000000 -0700
@@ -11,7 +11,7 @@
}
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan(tests => 6);
==== //depot/maint-5.8/perl/t/run/switchd.t#8 (text) ====
Index: perl/t/run/switchd.t
--- perl/t/run/switchd.t#7~30539~ 2007-03-10 10:15:47.000000000 -0800
+++ perl/t/run/switchd.t 2007-03-22 13:59:51.000000000 -0700
@@ -5,7 +5,7 @@
@INC = qw(../lib lib);
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
# This test depends on t/lib/Devel/switchd.pm.
==== //depot/maint-5.8/perl/t/run/switches.t#8 (text) ====
Index: perl/t/run/switches.t
--- perl/t/run/switches.t#7~29865~ 2007-01-17 15:48:41.000000000 -0800
+++ perl/t/run/switches.t 2007-03-22 13:59:51.000000000 -0700
@@ -9,7 +9,7 @@
@INC = '../lib';
}
-require "./test.pl";
+BEGIN { require "./test.pl"; }
plan(tests => 27);
End of Patch.
