Narrow down the -C test skippage.

p4raw-id: //depot/perl@18802

diff --git a/t/run/switchC.t b/t/run/switchC.t
index ba17cb9..c3cc403 100644 (file)
--- a/t/run/switchC.t
+++ b/t/run/switchC.t
@@ -26,14 +26,13 @@ $r = runperl( switches => [ '-CO', '-w' ],
 is( $r, "\xC4\x80", '-CO: no warning on UTF-8 output' );
 
 SKIP: {
-    for my $l (qw(LC_ALL LC_CTYPE LANG)) {
-       skip("cannot easily test under UTF-8 locale", 1)
-           if $ENV{$l} =~ /utf-?8/i;
+    if (exists $ENV{PERL_UNICODE} &&
+       ($ENV{PERL_UNICODE} eq "" || $ENV{PERL_UNICODE} =~ /[SO]/)) {
+       skip(qq[cannot test with PERL_UNICODE locale "" or /[SO]/], 1);
     }
     $r = runperl( switches => [ '-CI', '-w' ],
                  prog     => 'print ord(<STDIN>)',
                  stderr   => 1,
-                 verbose  => 1,
                  stdin    => "\xC4\x80" );
     is( $r, 256, '-CI: read in UTF-8 input' );
 }