In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/804352e2cf6da2f05a8e83ac4debc4ceb6617b7c?hp=ed0cac5b003824d9b42c00752f4f894700e967d4>
- Log ----------------------------------------------------------------- commit 804352e2cf6da2f05a8e83ac4debc4ceb6617b7c Author: Father Chrysostomos <[email protected]> Date: Wed Jan 7 09:48:30 2015 -0800 Avoid glob in t/TEST on non-Windows See ticket #123561. The presence of âglobâ was causing perl to attempt to File::Glob at compile time, before @INC is set up. Windows needs to do file globbing on @ARGV for t/TEST to work cor- rectly. Windows only uses TEST for miniperl (it uses harness for âmake testâ), and under miniperl âglobâ doesnât use File::Glob. So it is safe to use âglobâ on Windows. For the sake of other systems, we can put it in a string eval to avoid even compiling the op. M t/TEST commit 82e2da1e1c59d01913b3af8f90692f5ba28bff9d Author: Father Chrysostomos <[email protected]> Date: Wed Jan 7 09:44:22 2015 -0800 op.c: S_maybe_targlex needs no dVAR I thought it would be needed for PL_opargs, but PL_opargs is truly global, even with PERL_GLOBAL_STRUCT. M op.c ----------------------------------------------------------------------- Summary of changes: op.c | 1 - t/TEST | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/op.c b/op.c index 51b0bf0..9e5e926 100644 --- a/op.c +++ b/op.c @@ -10442,7 +10442,6 @@ Perl_ck_smartmatch(pTHX_ OP *o) static OP * S_maybe_targlex(pTHX_ OP *o) { - dVAR; OP * const kid = cLISTOPo->op_first; /* has a disposable target? */ if ((PL_opargs[kid->op_type] & OA_TARGLEX) diff --git a/t/TEST b/t/TEST index 4333eed..480ce17 100755 --- a/t/TEST +++ b/t/TEST @@ -124,7 +124,7 @@ $| = 1; # remove empty elements due to insertion of empty symbols via "''p1'" syntax @ARGV = grep($_,@ARGV) if $^O eq 'VMS'; -@ARGV = map glob, @ARGV if $^O eq 'MSWin32'; +@ARGV = eval 'map glob, @ARGV' if $^O eq 'MSWin32'; our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0; -- Perl5 Master Repository
