In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/eaff586aa6444fb20654ed863b7ff35e136737e8?hp=7bdb4ff0943cf93297712faf504cdd425426e57f>

- Log -----------------------------------------------------------------
commit eaff586aa6444fb20654ed863b7ff35e136737e8
Author: Father Chrysostomos <[email protected]>
Date:   Mon Sep 1 22:17:08 2014 -0700

    Fix t/op/taint.t on Windows
    
    $ENV{PATH} seems to be the problem.  If we clear it, then we can’t
    spawn another process.  I am basing this solely on this comment ear-
    lier in the file:
    
        # On Windows we can't spawn a fresh Perl interpreter unless at
        # least the Windows system directory (usually C:\Windows\System32)
        # is still on the PATH.  There is however no way to determine the
        # actual path on the current system without loading the Win32
        # module, so we just restore the original $ENV{PATH} here.
-----------------------------------------------------------------------

Summary of changes:
 t/op/taint.t | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/t/op/taint.t b/t/op/taint.t
index cb9074d..f9e8331 100644
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -2323,12 +2323,18 @@ $_ = "$TAINT".reset "x";
 is eval { eval $::x.1 }, 1, 'reset does not taint undef';
 
 # [perl #122669]
-is runperl(
-   switches => [ '-T' ],
-   prog => 'use constant K=>$^X; 0 if K; BEGIN{} use strict; print 122669, 
qq-\n-',
-   stderr => 1,
- ), "122669\n",
-    'tainted constant as logop condition should not prevent "use"';
+{
+    # See the comment above the first formline test.
+    local $ENV{PATH} = $ENV{PATH};
+    $ENV{PATH} = $old_env_path if $Is_MSWin32;
+    is runperl(
+       switches => [ '-T' ],
+       prog => 'use constant K=>$^X; 0 if K; BEGIN{} use strict; '
+              .'print 122669, qq-\n-',
+       stderr => 1,
+     ), "122669\n",
+        'tainted constant as logop condition should not prevent "use"';
+}
 
 # This may bomb out with the alarm signal so keep it last
 SKIP: {

--
Perl5 Master Repository

Reply via email to