[libcxx] r280612 - Apply curr_symbol.pass.cpp test fix to missed test case

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Sat Sep 3 21:09:25 PDT 2016


Author: ericwf
Date: Sat Sep  3 23:09:25 2016
New Revision: 280612

URL: http://llvm.org/viewvc/llvm-project?rev=280612&view=rev
Log:
Apply curr_symbol.pass.cpp test fix to missed test case

Modified:
    libcxx/trunk/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp

Modified: libcxx/trunk/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp?rev=280612&r1=280611&r2=280612&view=diff
==============================================================================
--- libcxx/trunk/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp (original)
+++ libcxx/trunk/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp Sat Sep  3 23:09:25 2016
@@ -118,7 +118,7 @@ int main()
         // GLIBC >= 2.24 uses currency_symbol="<U20BD>"
         // See also: http://www.fileformat.info/info/unicode/char/20bd/index.htm
 #if defined(TEST_GLIBC_PREREQ) && TEST_GLIBC_PREREQ(2, 24)
-        assert(f.curr_symbol() == " \xE2\x82\xBD");
+        assert(f.curr_symbol() == " \u20BD");
 #else
         assert(f.curr_symbol() == " \xD1\x80\xD1\x83\xD0\xB1");
 #endif
@@ -129,8 +129,13 @@ int main()
     }
     {
         Fwf f(LOCALE_ru_RU_UTF_8, 1);
+#if defined(TEST_GLIBC_PREREQ) && TEST_GLIBC_PREREQ(2, 24)
+        assert(f.curr_symbol() == L" \u20BD");
+#else
         assert(f.curr_symbol() == L" \x440\x443\x431");
+#endif
     }
+
     {
         Fwt f(LOCALE_ru_RU_UTF_8, 1);
         assert(f.curr_symbol() == L" RUB");




More information about the cfe-commits mailing list