diff options
author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-05-08 17:40:34 +0000 |
---|---|---|
committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-05-08 17:40:34 +0000 |
commit | ef9da7543400a2b6afaa028ae2ebbbc64cd7ceb0 (patch) | |
tree | 731fdc1869f2e206351a4274d36720c5365e36cd /t | |
parent | b4bd11bcb2b7a82b45aa02185638dd82ec8532ae (diff) | |
parent | 79d429636c0ad8e34ae1ff92342e0d8313415f2b (diff) | |
download | perl-ef9da7543400a2b6afaa028ae2ebbbc64cd7ceb0.tar.gz |
Integrate mainline
p4raw-id: //depot/perlio@16494
Diffstat (limited to 't')
-rw-r--r-- | t/run/fresh_perl.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/run/fresh_perl.t b/t/run/fresh_perl.t index 3cac42fcd8..ad0f363c60 100644 --- a/t/run/fresh_perl.t +++ b/t/run/fresh_perl.t @@ -573,7 +573,7 @@ EOT EXPECT ok ######## -# This test is here instead of pragma/locale.t because +# This test is here instead of lib/locale.t because # the bug depends on in the internal state of the locale # settings and pragma/locale messes up that state pretty badly. # We need a "fresh run". @@ -591,7 +591,7 @@ $have_setlocale = 0 if $@; $have_setlocale = 0 if (($^O eq 'MSWin32' || $^O eq 'NetWare') && $Config{cc} =~ /^(cl|gcc)/i); exit(0) unless $have_setlocale; my @locales; -if (-x "/usr/bin/locale" && open(LOCALES, "/usr/bin/locale -a|")) { +if (-x "/usr/bin/locale" && open(LOCALES, "/usr/bin/locale -a 2>/dev/null|")) { while(<LOCALES>) { chomp; push(@locales, $_); |