[perl.git] branch blead, updated. v5.15.2-187-g00c1390

[Rafael Garcia-Suarez]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/00c1390f3fd32e7cc0959bd9d47ee28d14ef7e42?hp=925798f29c677c612a63a08a92ebb5f169e27b02>

- Log -----------------------------------------------------------------
commit 00c1390f3fd32e7cc0959bd9d47ee28d14ef7e42
Author: Rafael Garcia-Suarez <r...@consttype.org>
Date:   Wed Aug 31 21:59:40 2011 +0200

    Make switchC.t pass if the environment variable PERL_UNICODE contains "S"
    
    (actually doing so the quick way, by skipping the last test, that tests
    for -CS on the shebang line)
-----------------------------------------------------------------------

Summary of changes:
 t/run/switchC.t |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/t/run/switchC.t b/t/run/switchC.t
index 5223b00..b1a243c 100644
--- a/t/run/switchC.t
+++ b/t/run/switchC.t
@@ -28,7 +28,7 @@ like( $r, qr/^$b(?:\r?\n)?$/s, '-CO: no warning on UTF-8 
output' );
 SKIP: {
     if (exists $ENV{PERL_UNICODE} &&
        ($ENV{PERL_UNICODE} eq "" || $ENV{PERL_UNICODE} =~ /[SO]/)) {
-       skip(qq[cannot test with PERL_UNICODE locale "" or /[SO]/], 1);
+       skip(qq[cannot test with PERL_UNICODE "" or /[SO]/], 1);
     }
     $r = runperl( switches => [ '-CI', '-w' ],
                  prog     => 'print ord(<STDIN>)',
@@ -96,8 +96,13 @@ $r = runperl( switches => [ '-CA', '-w' ],
 like( $r, qr/^Too late for "-CS" option at -e line 1\.$/s,
       '#!perl -C with different -C on command line' );
 
-$r = runperl( switches => [ '-w' ],
-             progs    => [ '#!perl -CS', 'print chr(256)' ],
-              stderr   => 1, );
-like( $r, qr/^Too late for "-CS" option at -e line 1\.$/s,
-      '#!perl -C but not command line' );
+SKIP: {
+    if (exists $ENV{PERL_UNICODE} && $ENV{PERL_UNICODE} =~ /S/) {
+       skip(qq[cannot test with PERL_UNICODE including "S"], 1);
+    }
+    $r = runperl( switches => [ '-w' ],
+                  progs    => [ '#!perl -CS', 'print chr(256)' ],
+                  stderr   => 1, );
+    like( $r, qr/^Too late for "-CS" option at -e line 1\.$/s,
+          '#!perl -C but not command line' );
+}

--
Perl5 Master Repository