lib/locale.t: Improve skipping of incompatible locales

Perl works properly with only a subset of the possible locales out
there.  This improves the detection of those and the skipping.

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/locale.t b/lib/locale.t
index 4a2cb75234..9695d86980 100644
--- a/lib/locale.t
+++ b/lib/locale.t
@@ -750,8 +750,9 @@ debug "Scanning for locales...\n";
 
 require POSIX; import POSIX ':locale_h';
 
-my @Locale = find_locales([ 'LC_CTYPE', 'LC_NUMERIC', 'LC_ALL' ]);
-my @include_incompatible_locales = find_locales('LC_CTYPE',
+my $categories = [ 'LC_CTYPE', 'LC_NUMERIC', 'LC_ALL' ];
+my @Locale = find_locales($categories);
+my @include_incompatible_locales = find_locales($categories,
                                                 'even incompatible locales');
 
 # The locales included in the incompatible list that aren't in the compatible
@@ -778,12 +779,16 @@ if (@Locale < @include_incompatible_locales) {
             push @warnings, ($warning =~ s/\n/\n# /sgr);
         };
 
-        setlocale(&POSIX::LC_CTYPE, $bad_locale);
+        my $ret = setlocale(&POSIX::LC_CTYPE, $bad_locale);
 
         my $message = "testing of locale '$bad_locale' is skipped";
         if (@warnings) {
             skip $message . ":\n# " . join "\n# ", @warnings;
         }
+        elsif (! $ret) {
+            skip("$message:\n#"
+               . " setlocale(&POSIX::LC_CTYPE, '$bad_locale') failed");
+        }
         else {
             fail $message . ", because it is was found to be incompatible with"
                           . " Perl, but could not discern reason";