Test fails / warnings with perl-current #6612

Message-Id: <E13OEBX-000776-00@libra.cus.cam.ac.uk>

p4raw-id: //depot/perl@6614

diff --git a/t/lib/b.t b/t/lib/b.t
index dbcfc30..b20e2bc 100755 (executable)
--- a/t/lib/b.t
+++ b/t/lib/b.t
@@ -114,7 +114,8 @@ $a =~ s/\s+/ /g;
 $a =~ s/\b(s|foo|bar|ullsv)\b\s?//g;
 $a =~ s/^\s+//;
 $a =~ s/\s+$//;
-if ($Config{use5005threads} eq 'define') {
+my $is_thread = $Config{use5005threads} && $Config{use5005threads} eq 'define';
+if ($is_thread) {
     $b=<<EOF;
 leave enter nextstate label leaveloop enterloop null and defined null
 threadsv readline gv lineseq nextstate aassign null pushmark split pushre
@@ -150,7 +151,7 @@ if ($Config{static_ext} eq ' ') {
   print "ok $test # skipped: one or more static extensions\n"; $test++;
 }
 
-if ($Config{use5005threads} eq 'define') {
+if ($is_thread) {
     print "# use5005threads: test $test skipped\n";
 } else {
     if ($Is_VMS) {

diff --git a/t/lib/peek.t b/t/lib/peek.t
index 43df33e..7b85dcd 100644 (file)
--- a/t/lib/peek.t
+++ b/t/lib/peek.t
@@ -44,7 +44,7 @@ sub do_test {
 our   $a;
 our   $b;
 my    $c;
-local $d;
+local $d = 0;
 
 do_test( 1,
        $a = "foo",
@@ -204,12 +204,12 @@ do_test(13,
     ROOT = $ADDR
     XSUB = 0x0
     XSUBANY = 0
-    GVGV::GV = $ADDR\\t"main" :: "__ANON__"
+    GVGV::GV = $ADDR\\t"main" :: "__ANON__[^"]*"
     FILE = ".+\\b(?i:peek\\.t)"
     DEPTH = 0
 (?:    MUTEXP = $ADDR
-    OWNER = $ADDR)?
-    FLAGS = 0x4
+    OWNER = $ADDR
+)?    FLAGS = 0x4
     PADLIST = $ADDR
     OUTSIDE = $ADDR \\(MAIN\\)');
 
@@ -233,8 +233,8 @@ do_test(14,
     FILE = ".+\\b(?i:peek\\.t)"
     DEPTH = 1
 (?:    MUTEXP = $ADDR
-    OWNER = $ADDR)?
-    FLAGS = 0x0
+    OWNER = $ADDR
+)?    FLAGS = 0x0
     PADLIST = $ADDR
       \\d+\\. $ADDR \\("\\$pattern" \\d+-\\d+\\)
      \\d+\\. $ADDR \\(FAKE "\\$DEBUG" 0-\\d+\\)