In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/e3da8f0230c2fc441705491cb1d27ed71aeba71d?hp=7072da8afeba4c87ae623cd913e274396ffcf1cd>
- Log -----------------------------------------------------------------
commit e3da8f0230c2fc441705491cb1d27ed71aeba71d
Author: David Mitchell <da...@iabyn.com>
Date: Sun Nov 23 11:34:07 2014 +0000
fix recent Concise tests under PERL_UNICODE=''
Some smokers run with PERL_UNICODE set; this has the side effect of
making Concise display nextstate ops with open hints flags, e.g.
nextstate(....) v:>,<,% ->8
where :... are the flags.
Concise 'golden samples' should have these flags set; they're stripped
from the expected output in the non-PERL_UNICODE case, rather than
being stripped from the actual output in the PERL_UNICODE case.
(It would probably make life easier if we did it the other way round.)
-----------------------------------------------------------------------
Summary of changes:
ext/B/t/optree_misc.t | 14 +++++++-------
ext/B/t/optree_samples.t | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ext/B/t/optree_misc.t b/ext/B/t/optree_misc.t
index 351b1ed..cb5eae3 100644
--- a/ext/B/t/optree_misc.t
+++ b/ext/B/t/optree_misc.t
@@ -31,7 +31,7 @@ checkOptree ( name => 'OP_AELEMFAST opclass',
# - <@> lineseq KP ->7
# 1 <;> nextstate(main 634 optree_misc.t:25) v:>,<,% ->2
# 2 <0> padav[@x:634,636] vM/LVINTRO ->3
-# - <;> ex-nextstate(main 1594 optree_misc.t:27) v ->3
+# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,% ->3
# - <1> rv2av[t4] vK/OURINTR,1 ->3
# - <#> gv[*y] s ->-
# 3 <;> nextstate(main 636 optree_misc.t:25) v:>,<,%,{ ->4
@@ -48,7 +48,7 @@ EOT_EOT
# - <@> lineseq KP ->7
# 1 <;> nextstate(main 634 optree_misc.t:27) v:>,<,% ->2
# 2 <0> padav[@x:634,636] vM/LVINTRO ->3
-# - <;> ex-nextstate(main 1594 optree_misc.t:27) v ->3
+# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,% ->3
# - <1> rv2av[t3] vK/OURINTR,1 ->3
# - <$> gv(*y) s ->-
# 3 <;> nextstate(main 636 optree_misc.t:27) v:>,<,%,{ ->4
@@ -159,7 +159,7 @@ checkOptree ( name => 'formats',
# 2 <0> pushmark s ->3
# 3 <$> const[PV "@<<<\n"] s ->4
# - <@> lineseq lK ->5
-# - <;> ex-nextstate(main 3 tmp35894B:3) v ->4
+# - <;> ex-nextstate(main 3 tmp35894B:3) v:>,<,% ->4
# - <1> ex-rv2sv sK/1 ->-
# 4 <#> gvsv[*a] s ->5
# 6 <;> nextstate(main 1 -:6) v:>,<,% ->7
@@ -167,19 +167,19 @@ checkOptree ( name => 'formats',
# 7 <0> pushmark s ->8
# 8 <$> const[PV "@>>>\n"] s ->9
# - <@> lineseq lK ->b
-# - <;> ex-nextstate(main 3 tmp35894B:5) v ->9
+# - <;> ex-nextstate(main 3 tmp35894B:5) v:>,<,% ->9
# a <1> rv2av[t3] lK/1 ->b
# 9 <#> gv[*b] s ->a
EOT_EOT
# main::STDOUT (FORMAT):
# c <1> leavewrite[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->c
-# 1 <;> nextstate(main 1 -:4) v:>,<,% ->2
+# 1 <;> nextstate(main 1 -:4) v:>,<,%:>,<,% ->2
# 5 <@> formline vK/2 ->6
# 2 <0> pushmark s ->3
# 3 <$> const(PV "@<<<\n") s ->4
# - <@> lineseq lK ->5
-# - <;> ex-nextstate(main 3 tmp35894B:3) v ->4
+# - <;> ex-nextstate(main 3 tmp35894B:3) v:>,<,% ->4
# - <1> ex-rv2sv sK/1 ->-
# 4 <$> gvsv(*a) s ->5
# 6 <;> nextstate(main 1 -:6) v:>,<,% ->7
@@ -187,7 +187,7 @@ EOT_EOT
# 7 <0> pushmark s ->8
# 8 <$> const(PV "@>>>\n") s ->9
# - <@> lineseq lK ->b
-# - <;> ex-nextstate(main 3 tmp35894B:5) v ->9
+# - <;> ex-nextstate(main 3 tmp35894B:5) v:>,<,% ->9
# a <1> rv2av[t3] lK/1 ->b
# 9 <$> gv(*b) s ->a
EONT_EONT
diff --git a/ext/B/t/optree_samples.t b/ext/B/t/optree_samples.t
index 36458d5..9a11278 100644
--- a/ext/B/t/optree_samples.t
+++ b/ext/B/t/optree_samples.t
@@ -34,7 +34,7 @@ checkOptree ( name => '-basic sub {if shift print
then,else}',
# 3 <|> cond_expr(other->4) K/1 ->8
# 2 <0> shift s* ->3
# - <@> scope K ->-
-# - <;> ex-nextstate(main 1594 optree_samples.t:25) v ->4
+# - <;> ex-nextstate(main 1594 optree_samples.t:25) v:>,<,% ->4
# 6 <@> print sK ->7
# 4 <0> pushmark s ->5
# 5 <$> const[PV "then"] s ->6
@@ -52,7 +52,7 @@ EOT_EOT
# 3 <|> cond_expr(other->4) K/1 ->8
# 2 <0> shift s* ->3
# - <@> scope K ->-
-# - <;> ex-nextstate(main 1594 optree_samples.t:25) v ->4
+# - <;> ex-nextstate(main 1594 optree_samples.t:25) v:>,<,% ->4
# 6 <@> print sK ->7
# 4 <0> pushmark s ->5
# 5 <$> const(PV "then") s ->6
@@ -83,7 +83,7 @@ checkOptree ( name => '-basic (see above, with my $a =
shift)',
# 7 <|> cond_expr(other->8) K/1 ->c
# 6 <0> padsv[$a:666,670] s ->7
# - <@> scope K ->-
-# - <;> ex-nextstate(main 1603 optree_samples.t:70) v ->8
+# - <;> ex-nextstate(main 1603 optree_samples.t:70) v:>,<,% ->8
# a <@> print sK ->b
# 8 <0> pushmark s ->9
# 9 <$> const[PV "foo"] s ->a
@@ -105,7 +105,7 @@ EOT_EOT
# 7 <|> cond_expr(other->8) K/1 ->c
# 6 <0> padsv[$a:666,670] s ->7
# - <@> scope K ->-
-# - <;> ex-nextstate(main 1603 optree_samples.t:70) v ->8
+# - <;> ex-nextstate(main 1603 optree_samples.t:70) v:>,<,% ->8
# a <@> print sK ->b
# 8 <0> pushmark s ->9
# 9 <$> const(PV "foo") s ->a
--
Perl5 Master Repository
