Merge pull request #45815 from JuliaLang/sf/ko_kr_utf8

Clarify non-Unicode Korean tests
JuliaLang · Jun 30, 2022 · fec6951 · fec6951
2 parents cce506f + c78a8db
commit fec6951
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/stdlib/Dates/test/io.jl b/stdlib/Dates/test/io.jl
@@ -548,7 +548,7 @@ end
             @test Time("$t12", "$HH:MMp") == t
         end
         local tmstruct, strftime
-        withlocales(["C"]) do
+        withlocales(["C"]) do locale
             # test am/pm comparison handling
             tmstruct = Libc.strptime("%I:%M%p", t12)
             strftime = Libc.strftime("%I:%M%p", tmstruct)

diff --git a/test/misc.jl b/test/misc.jl
@@ -986,19 +986,28 @@ end
 @test_nowarn Core.eval(Main, :(import ....Main))
 
 # issue #27239
+using Base.BinaryPlatforms: HostPlatform, libc
 @testset "strftime tests issue #27239" begin
-    # change to non-Unicode Korean
+    # change to non-Unicode Korean to test that it is properly transcoded into valid UTF-8
     korloc = ["ko_KR.EUC-KR", "ko_KR.CP949", "ko_KR.949", "Korean_Korea.949"]
-    timestrs = String[]
-    withlocales(korloc) do
-        # system dependent formats
-        push!(timestrs, Libc.strftime(0.0))
-        push!(timestrs, Libc.strftime("%a %A %b %B %p %Z", 0))
+    at_least_one_locale_found = false
+    withlocales(korloc) do locale
+        at_least_one_locale_found = true
+        # Test both the default format and a custom formatting string
+        for s in (Libc.strftime(0.0), Libc.strftime("%a %A %b %B %p %Z", 0))
+            # Ensure that we always get valid UTF-8 back
+            @test isvalid(s)
+
+            # On `musl` it is impossible for `setlocale` to fail, it just falls back to
+            # the default system locale, which on our buildbots is en_US.UTF-8.  We'll
+            # assert that what we get does _not_ start with `Thu`, as that's what all
+            # en_US.UTF-8 encodings would start with.
+            # X-ref: https://musl.openwall.narkive.com/kO1vpTWJ/setlocale-behavior-with-missing-locales
+            @test !startswith(s, "Thu") broken=(libc(HostPlatform()) == "musl")
+        end
     end
-    # tests
-    isempty(timestrs) && @warn "skipping stftime tests: no locale found for testing"
-    for s in timestrs
-        @test isvalid(s)
+    if !at_least_one_locale_found
+        @warn "skipping stftime tests: no locale found for testing"
     end
 end
 

diff --git a/test/testhelpers/withlocales.jl b/test/testhelpers/withlocales.jl
@@ -9,15 +9,14 @@ function withlocales(f, newlocales)
             locales[cat] = unsafe_string(cstr)
         end
     end
-    timestrs = String[]
     try
         # change to each of given locales
         for lc in newlocales
             set = true
             for (cat, _) in locales
                 set &= ccall(:setlocale, Cstring, (Cint, Cstring), cat, lc) != C_NULL
             end
-            set && f()
+            set && f(lc)
         end
     finally
         # recover locales