In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/615e2f774517c03a3a6c4d123a812299d9465d74?hp=c5e13bf5ce9484aa5cbdcc8102718ee15d41c091>

- Log -----------------------------------------------------------------
commit 615e2f774517c03a3a6c4d123a812299d9465d74
Author: Steve Hay <[email protected]>
Date:   Wed Feb 20 13:28:46 2013 +0000

    Silence irrelevant stderr output from op/magic.t
    
    Some 'set' commands in this test are intended to verify that an environment
    variable is not set, which causes the command to send a warning message to
    stderr.

M       t/op/magic.t

commit efeca31ee17ce18e493c4afdda03b48ad5a518ce
Author: Steve Hay <[email protected]>
Date:   Wed Feb 20 13:25:41 2013 +0000

    Fix failing op/magic.t test 157
    
    Change 888a67f6b9 added manipulation of __NoNeSuCh2, but it gets
    accidentally picked up by the 'set' command looking for __NoNeSuCh in test
    157 because 'set' will display the value of *all* variables whose prefix
    matches the name given to the command.

M       t/op/magic.t
-----------------------------------------------------------------------

Summary of changes:
 t/op/magic.t |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/op/magic.t b/t/op/magic.t
index 5421d01..d06fcaa 100644
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -72,7 +72,7 @@ sub env_is {
        require Win32;
        my $cp = Win32::GetConsoleOutputCP();
        Win32::SetConsoleOutputCP(Win32::GetACP());
-        (my $set = `set $key`) =~ s/\r\n$/\n/;
+        (my $set = `set $key 2>nul`) =~ s/\r\n$/\n/;
        Win32::SetConsoleOutputCP($cp);
         like $set, qr/^(?:\Q$key\E=)?\Q$val\E$/, $desc;
     } elsif ($Is_VMS) {
@@ -647,10 +647,10 @@ SKIP: {
        }
 
        $ENV{__NoNeSuCh} = 'foo';
-       $ENV{__NoNeSuCh2} = 'foo';
        $0 = 'bar';
        env_is(__NoNeSuCh => 'foo', 'setting $0 does not break %ENV');
 
+       $ENV{__NoNeSuCh2} = 'foo';
        $ENV{__NoNeSuCh2} = undef;
        env_is(__NoNeSuCh2 => '', 'setting a key as undef does not delete it');
 

--
Perl5 Master Repository

Reply via email to