[libcxx-commits] [PATCH] D118240: [libcxx] [test] Fix the locale.time.put.byname/put1 testcase on Linux and Windows

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo updated this revision to Diff 403335.
mstorsjo added a comment.

Applied suggestion.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D118240/new/

https://reviews.llvm.org/D118240

Files:
  libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp


Index: libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
===================================================================
--- libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
+++ libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
@@ -9,7 +9,6 @@
 // NetBSD does not support LC_TIME at the moment
 // XFAIL: netbsd
 
-// XFAIL: LIBCXX-WINDOWS-FIXME
 // XFAIL: LIBCXX-AIX-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
@@ -29,9 +28,6 @@
 //     ~time_put_byname();
 // };
 
-// TODO: investigation needed
-// XFAIL: target={{.*}}-linux-gnu{{.*}}
-
 #include <locale>
 #include <cassert>
 #include "test_macros.h"
@@ -74,12 +70,13 @@
     }
     {
         const my_facet f(LOCALE_fr_FR_UTF_8, 1);
-        std::string pat("Today is %A which is abbreviated %a.");
+        std::string pat("Today is %A which is abbreviated '%a'.");
         iter = f.put(output_iterator<char*>(str), ios, '*', &t,
                      pat.data(), pat.data() + pat.size());
         std::string ex(str, iter.base());
-        assert((ex == "Today is Samedi which is abbreviated Sam.")||
-               (ex == "Today is samedi which is abbreviated sam." ));
+        assert((ex == "Today is Samedi which is abbreviated 'Sam'.")||
+               (ex == "Today is samedi which is abbreviated 'sam'." )||
+               (ex == "Today is samedi which is abbreviated 'sam.'."));
     }
 
   return 0;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118240.403335.patch
Type: text/x-patch
Size: 1519 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220126/fb0678d2/attachment.bin>