From 9803ed409d7ddf2ede30c3cba80c68abb8d9e2b3 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Thu, 9 Nov 2023 17:00:52 -0700 Subject: [PATCH] Revert "locale_threads: start of using platform locales" This reverts commit a7a8dea3aabb81a05aacaf3a26c49854a5854111. --- lib/locale_threads.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/locale_threads.t b/lib/locale_threads.t index 00994f11971c..212bf6345fcc 100644 --- a/lib/locale_threads.t +++ b/lib/locale_threads.t @@ -37,8 +37,7 @@ my $debug = 0; my %map_category_name_to_number; my %map_category_number_to_name; my @valid_categories = valid_locale_categories(); -my @platform_categories = platform_locale_categories(); -foreach my $category (@platform_categories) { +foreach my $category (@valid_categories) { my $cat_num = eval "&POSIX::$category"; die "Can't determine ${category}'s number: $@" if $@; @@ -520,6 +519,7 @@ $iterations_per_test_group = 1 if $iterations_per_test_group == 0; # LC_ALL get tested. But skip this nicety on platforms where we are restricted from # using all the available categories, as it would make the code more complex # for not that much gain. +my @platform_categories = platform_locale_categories(); my $lc_all_frequency = scalar @platform_categories == scalar @valid_categories ? 3 : -1; @@ -899,7 +899,7 @@ SKIP: { # These tests were determined by grepping through the code base for # locale-sensitive operations, and then figuring out something to exercise # them. - foreach my $category (@platform_categories) { + foreach my $category (@valid_categories) { no warnings 'uninitialized'; print STDERR __FILE__, ": ", __LINE__, ": $category\n" if $debug > 1;