latest switch/say/~~

[p5sagit/p5-mst-13.2.git] / ext / B / t / optree_varinit.t

diff --git a/ext/B/t/optree_varinit.t b/ext/B/t/optree_varinit.t
index f70854e..844b6df 100644 (file)
--- a/ext/B/t/optree_varinit.t
+++ b/ext/B/t/optree_varinit.t
@@ -1,19 +1,19 @@
 #!perl
 
 BEGIN {
-    chdir 't';
-    @INC = ('../lib', '../ext/B/t');
+    if ($ENV{PERL_CORE}){
+       chdir('t') if -d 't';
+       @INC = ('.', '../lib', '../ext/B/t');
+    } else {
+       unshift @INC, 't';
+       push @INC, "../../t";
+    }
     require Config;
     if (($Config::Config{'extensions'} !~ /\bB\b/) ){
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
-    if ($Config{'extensions'} !~ /\bData\/Dumper\b/) {
-       print
-           "1..0 # Skip: Data::Dumper was not built, needed by OptreeCheck\n";
-       exit 0;
-    }
-    require './test.pl';
+    # require 'test.pl'; # now done by OptreeCheck
 }
 use OptreeCheck;
 use Config;
@@ -109,6 +109,7 @@ EONT_EONT
 
 checkOptree ( name     => 'local $a',
              prog      => 'local $a',
+             errs      => ['Name "main::a" used only once: possible typo at -e line 1.'],
              bcopts    => '-basic',
              expect    => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
 4  <@> leave[1 ref] vKP/REFC ->(end)
@@ -130,15 +131,19 @@ checkOptree ( name        => 'sub {my $a=undef}',
              code      => sub {my $a=undef},
              bcopts    => '-basic',
              expect    => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
-3  <1> leavesub[1 ref] K/REFC,1 ->(end)
--     <@> lineseq KP ->3
-1        <;> nextstate(main 24 optree.t:99) v ->2
-2        <0> padsv[$a:24,25] sRM*/LVINTRO ->3
+5  <1> leavesub[1 ref] K/REFC,1 ->(end)
+-     <@> lineseq KP ->5
+1        <;> nextstate(main 641 optree_varinit.t:130) v ->2
+4        <2> sassign sKS/2 ->5
+2           <0> undef s ->3
+3           <0> padsv[$a:641,642] sRM*/LVINTRO ->4
 EOT_EOT
-# 3  <1> leavesub[1 ref] K/REFC,1 ->(end)
-# -     <@> lineseq KP ->3
-# 1        <;> nextstate(main 54 optree.t:149) v ->2
-# 2        <0> padsv[$a:54,55] sRM*/LVINTRO ->3
+# 5  <1> leavesub[1 ref] K/REFC,1 ->(end)
+# -     <@> lineseq KP ->5
+# 1        <;> nextstate(main 641 optree_varinit.t:130) v ->2
+# 4        <2> sassign sKS/2 ->5
+# 2           <0> undef s ->3
+# 3           <0> padsv[$a:641,642] sRM*/LVINTRO ->4
 EONT_EONT
 
 checkOptree ( name     => 'sub {our $a=undef}',
@@ -189,15 +194,19 @@ checkOptree ( name        => 'my $a=undef',
              prog      => 'my $a=undef',
              bcopts    => '-basic',
              expect    => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
-4  <@> leave[1 ref] vKP/REFC ->(end)
+6  <@> leave[1 ref] vKP/REFC ->(end)
 1     <0> enter ->2
 2     <;> nextstate(main 1 -e:1) v ->3
-3     <0> padsv[$a:1,2] vRM*/LVINTRO ->4
+5     <2> sassign vKS/2 ->6
+3        <0> undef s ->4
+4        <0> padsv[$a:1,2] sRM*/LVINTRO ->5
 EOT_EOT
-# 4  <@> leave[1 ref] vKP/REFC ->(end)
+# 6  <@> leave[1 ref] vKP/REFC ->(end)
 # 1     <0> enter ->2
 # 2     <;> nextstate(main 1 -e:1) v ->3
-# 3     <0> padsv[$a:1,2] vRM*/LVINTRO ->4
+# 5     <2> sassign vKS/2 ->6
+# 3        <0> undef s ->4
+# 4        <0> padsv[$a:1,2] sRM*/LVINTRO ->5
 EONT_EONT
 
 checkOptree ( name     => 'our $a=undef',
@@ -224,6 +233,7 @@ EONT_EONT
 
 checkOptree ( name     => 'local $a=undef',
              prog      => 'local $a=undef',
+             errs      => ['Name "main::a" used only once: possible typo at -e line 1.'],
              note      => 'locals are rare, probly not worth doing',
              bcopts    => '-basic',
              expect    => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
@@ -246,7 +256,6 @@ EONT_EONT
 
 checkOptree ( name     => 'sub {my $a=()}',
              code      => sub {my $a=()},
-              todo     => 'apparently done, by patch #?',
              bcopts    => '-exec',
              expect    => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
 1  <;> nextstate(main -439 optree.t:105) v
@@ -300,7 +309,6 @@ EONT_EONT
 
 checkOptree ( name     => 'my $a=()',
              prog      => 'my $a=()',
-              todo     => 'apparently done, by patch #?',
              bcopts    => '-exec',
              expect    => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
 1  <0> enter 
@@ -340,6 +348,7 @@ EONT_EONT
 
 checkOptree ( name     => 'local $a=()',
              prog      => 'local $a=()',
+             errs      => ['Name "main::a" used only once: possible typo at -e line 1.'],
               #todo    => 'probly not worth doing',
              bcopts    => '-exec',
              expect    => <<'EOT_EOT', expect_nt => <<'EONT_EONT');