Change 34680 by [EMAIL PROTECTED] on 2008/10/31 10:02:48
Integrate:
[ 34658]
Integrate:
[ 34554]
Jerry spotted that as a result of change 34483 which upgrades blead to
Test::Simple 0.82, lib/DB.t is now issuing a warning. His original
suggestion was ok(!defined ...) - he, Merijn and I independently
refined this to isnt(..., undef)
[ 34639]
Avoid leaving a VAR.txt after testing terminates on any platform where
you can't unlink an open file by instead opening $^X for read to get a
file handle for test purposes.
Affected files ...
... //depot/maint-5.8/perl/ext/XS/APItest/t/svpeek.t#2 integrate
... //depot/maint-5.8/perl/lib/DB.t#4 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/XS/APItest/t/svpeek.t#2 (text) ====
Index: perl/ext/XS/APItest/t/svpeek.t
--- perl/ext/XS/APItest/t/svpeek.t#1~34439~ 2008-09-29 00:38:35.000000000
-0700
+++ perl/ext/XS/APItest/t/svpeek.t 2008-10-31 03:02:48.000000000 -0700
@@ -58,11 +58,10 @@
is (DPeek (sub {}), '\CV(__ANON__)', 'sub {}');
{ our ($VAR, @VAR, %VAR);
- open VAR, ">VAR.txt";
+ open VAR, "<", $^X or die "Can't open $^X: $!";
sub VAR {}
format VAR =
.
- END { unlink "VAR.txt" };
is (DPeek ( $VAR), 'UNDEF', ' $VAR undef');
is (DPeek (\$VAR), '\UNDEF', '\$VAR undef');
==== //depot/maint-5.8/perl/lib/DB.t#4 (text) ====
Index: perl/lib/DB.t
--- perl/lib/DB.t#3~23035~ 2004-07-04 13:49:10.000000000 -0700
+++ perl/lib/DB.t 2008-10-31 03:02:48.000000000 -0700
@@ -86,7 +86,7 @@
# test DB::_clientname()
is( DB::_clientname('foo=A(1)'), 'foo',
'DB::_clientname should return refname');
-cmp_ok( DB::_clientname('bar'), 'eq', '',
+is( DB::_clientname('bar'), undef,
'DB::_clientname should not return non refname');
# test DB::next() and DB::step()
End of Patch.
