Fix-n-skip the tests under 5005threads.

p4raw-id: //depot/perl@6606

1 files changed, 21 insertions, 10 deletions

diff --git a/t/lib/b.t b/t/lib/b.t
index dba3852caa..dbcfc3004b 100755
--- a/t/lib/b.t
+++ b/t/lib/b.t
@@ -114,15 +114,22 @@ $a =~ s/\s+/ /g;
 $a =~ s/\b(s|foo|bar|ullsv)\b\s?//g;
 $a =~ s/^\s+//;
 $a =~ s/\s+$//;
-$b=<<EOF;
+if ($Config{use5005threads} eq 'define') {
+    $b=<<EOF;
+leave enter nextstate label leaveloop enterloop null and defined null
+threadsv readline gv lineseq nextstate aassign null pushmark split pushre
+threadsv const null pushmark rvav gv nextstate subst const unstack nextstate
+EOF
+} else {
+    $b=<<EOF;
 leave enter nextstate label leaveloop enterloop null and defined null
 null gvsv readline gv lineseq nextstate aassign null pushmark split pushre
-null gvsv const null pushmark rvav gv nextstate subst const unstack
-nextstate
+null gvsv const null pushmark rvav gv nextstate subst const unstack nextstate
 EOF
+}
 $b=~s/\n/ /g;$b=~s/\s+/ /g;
 $b =~ s/\s+$//;
-print "# [$a] vs [$b]\nnot " if $a ne $b;
+print "# [$a]\n# vs\n# [$b]\nnot " if $a ne $b;
 ok;
 
 if ($Is_VMS) {
@@ -143,11 +150,15 @@ if ($Config{static_ext} eq ' ') {
   print "ok $test # skipped: one or more static extensions\n"; $test++;
 }
 
-if ($Is_VMS) {
-    $a = `$^X "-I../lib" "-MO=Showlex" -e "my %one"`;
-}
-else {
-    $a = `$^X -I../lib -MO=Showlex -e "my %one" 2>&1`;
+if ($Config{use5005threads} eq 'define') {
+    print "# use5005threads: test $test skipped\n";
+} else {
+    if ($Is_VMS) {
+        $a = `$^X "-I../lib" "-MO=Showlex" -e "my %one"`;
+    }
+    else {
+        $a = `$^X -I../lib -MO=Showlex -e "my %one" 2>&1`;
+    }
+    print "# [$a]\nnot " unless $a =~ /sv_undef.*PVNV.*%one.*sv_undef.*HV/s;
 }
-print "# [$a]\nnot " unless $a =~ /sv_undef.*PVNV.*%one.*sv_undef.*HV/s;
 ok;