[libc++] Fixes time formatter test output for Linux on PowerPC #75526

lei137 · 2023-12-14T20:38:02Z

Fix output to match actual.

llvmbot · 2023-12-14T20:38:31Z

@llvm/pr-subscribers-libcxx

Author: Lei Huang (lei137)

Changes

Fix output to match actual.

Full diff: https://github.com/llvm/llvm-project/pull/75526.diff

3 Files Affected:

(modified) libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp (+6-2)
(modified) libcxx/test/std/time/time.syn/formatter.local_time.pass.cpp (+6-2)
(modified) libcxx/test/std/time/time.syn/formatter.sys_time.pass.cpp (+6-2)

diff --git a/libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp b/libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp
index aec6e78d994da9..b07282593d759c 100644
--- a/libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp
+++ b/libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp
@@ -821,7 +821,9 @@ static void test_valid_values_date_time() {
   // Use the global locale (fr_FR)
   check(
 // https://sourceware.org/bugzilla/show_bug.cgi?id=24054
-#if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
+#if defined(__powerpc__) && defined(__linux__)
+      SV("%c='jeu. 01 janv. 1970 00:00:00 UTC'\t%Ec='jeu. 01 janv. 1970 00:00:00 UTC'\n"),
+#elif defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
       SV("%c='jeu. 01 janv. 1970 00:00:00 GMT'\t%Ec='jeu. 01 janv. 1970 00:00:00 GMT'\n"),
 #elif defined(_AIX)
       SV("%c=' 1 janvier 1970 à 00:00:00 UTC'\t%Ec=' 1 janvier 1970 à 00:00:00 UTC'\n"),
@@ -839,7 +841,9 @@ static void test_valid_values_date_time() {
 
   check(
 // https://sourceware.org/bugzilla/show_bug.cgi?id=24054
-#if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
+#if defined(__powerpc__) && defined(__linux__)
+      SV("%c='ven. 13 févr. 2009 23:31:30 UTC'\t%Ec='ven. 13 févr. 2009 23:31:30 UTC'\n"),
+#elif defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
       SV("%c='ven. 13 févr. 2009 23:31:30 GMT'\t%Ec='ven. 13 févr. 2009 23:31:30 GMT'\n"),
 #elif defined(_AIX)
       SV("%c='13 février 2009 à 23:31:30 UTC'\t%Ec='13 février 2009 à 23:31:30 UTC'\n"),
diff --git a/libcxx/test/std/time/time.syn/formatter.local_time.pass.cpp b/libcxx/test/std/time/time.syn/formatter.local_time.pass.cpp
index 71dd7fba9fb701..45c3a12ea35cb2 100644
--- a/libcxx/test/std/time/time.syn/formatter.local_time.pass.cpp
+++ b/libcxx/test/std/time/time.syn/formatter.local_time.pass.cpp
@@ -820,7 +820,9 @@ static void test_valid_values_date_time() {
   // Use the global locale (fr_FR)
   check(
 // https://sourceware.org/bugzilla/show_bug.cgi?id=24054
-#if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
+#if defined(__powerpc__) && defined(__linux__)
+      SV("%c='jeu. 01 janv. 1970 00:00:00 UTC'\t%Ec='jeu. 01 janv. 1970 00:00:00 UTC'\n"),
+#elif defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
       SV("%c='jeu. 01 janv. 1970 00:00:00 GMT'\t%Ec='jeu. 01 janv. 1970 00:00:00 GMT'\n"),
 #elif defined(_AIX)
       SV("%c=' 1 janvier 1970 à 00:00:00 UTC'\t%Ec=' 1 janvier 1970 à 00:00:00 UTC'\n"),
@@ -838,7 +840,9 @@ static void test_valid_values_date_time() {
 
   check(
 // https://sourceware.org/bugzilla/show_bug.cgi?id=24054
-#if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
+#if defined(__powerpc__) && defined(__linux__)
+      SV("%c='ven. 13 févr. 2009 23:31:30 UTC'\t%Ec='ven. 13 févr. 2009 23:31:30 UTC'\n"),
+#elif defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
       SV("%c='ven. 13 févr. 2009 23:31:30 GMT'\t%Ec='ven. 13 févr. 2009 23:31:30 GMT'\n"),
 #elif defined(_AIX)
       SV("%c='13 février 2009 à 23:31:30 UTC'\t%Ec='13 février 2009 à 23:31:30 UTC'\n"),
diff --git a/libcxx/test/std/time/time.syn/formatter.sys_time.pass.cpp b/libcxx/test/std/time/time.syn/formatter.sys_time.pass.cpp
index ebc45c7e87351f..2fed270cbade72 100644
--- a/libcxx/test/std/time/time.syn/formatter.sys_time.pass.cpp
+++ b/libcxx/test/std/time/time.syn/formatter.sys_time.pass.cpp
@@ -817,7 +817,9 @@ static void test_valid_values_date_time() {
   // Use the global locale (fr_FR)
   check(
 // https://sourceware.org/bugzilla/show_bug.cgi?id=24054
-#if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
+#if defined(__powerpc__) && defined(__linux__)
+      SV("%c='jeu. 01 janv. 1970 00:00:00 UTC'\t%Ec='jeu. 01 janv. 1970 00:00:00 UTC'\n"),
+#elif defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
       SV("%c='jeu. 01 janv. 1970 00:00:00 GMT'\t%Ec='jeu. 01 janv. 1970 00:00:00 GMT'\n"),
 #elif defined(_AIX)
       SV("%c=' 1 janvier 1970 à 00:00:00 UTC'\t%Ec=' 1 janvier 1970 à 00:00:00 UTC'\n"),
@@ -835,7 +837,9 @@ static void test_valid_values_date_time() {
 
   check(
 // https://sourceware.org/bugzilla/show_bug.cgi?id=24054
-#if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
+#if defined(__powerpc__) && defined(__linux__)
+      SV("%c='ven. 13 févr. 2009 23:31:30 UTC'\t%Ec='ven. 13 févr. 2009 23:31:30 UTC'\n"),
+#elif defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 29
       SV("%c='ven. 13 févr. 2009 23:31:30 GMT'\t%Ec='ven. 13 févr. 2009 23:31:30 GMT'\n"),
 #elif defined(_AIX)
       SV("%c='13 février 2009 à 23:31:30 UTC'\t%Ec='13 février 2009 à 23:31:30 UTC'\n"),

EricWF

Using __powerpc__ to configure locale specific differences in platform is the wrong way to go about this.

You likely need to identify what libc your system has, and what version it is, and why it provides different locales.

Further, we should then figure out if those locales produce the desired output before changing our test suite to tolerate them.

libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp

lei137 · 2024-01-08T20:48:42Z

@EricWF @mordante Is it possible to update the test case to NOT take into account the time zone/standard being used? I see Apple/win32/FreeBSD does not emit that info. I looked and we have different machines setup differently depending on where it's physically located and I am not sure the best thing to do is to switch the ones using the time standard configuration to using the GMT time zone. Alternatively I can just disable these tests for linux PowerPC? Your feedback is appreciated. Thank-you!

mordante

@EricWF @mordante Is it possible to update the test case to NOT take into account the time zone/standard being used? I see Apple/win32/FreeBSD does not emit that info. I looked and we have different machines setup differently depending on where it's physically located and I am not sure the best thing to do is to switch the ones using the time standard configuration to using the GMT time zone. Alternatively I can just disable these tests for linux PowerPC? Your feedback is appreciated. Thank-you!

@lei137 for which clocks is the time zone information wrong?

libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp

mordante

Since the CI is happy, LGTM!

lei137 · 2024-02-14T17:29:16Z

Thank-you for identifying the issue @mordante. @EricWF Do you have any other concerns about the current fix?

mordante · 2024-03-03T17:08:07Z

Thank-you for identifying the issue @mordante. @EricWF Do you have any other concerns about the current fix?

Feel free to land this, if Eric has comments we can address them post review.

Adjusts the output to match.

lei137 requested review from mordante and stefanp-synopsys December 14, 2023 20:38

lei137 self-assigned this Dec 14, 2023

lei137 requested a review from a team as a code owner December 14, 2023 20:38

llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Dec 14, 2023

EricWF requested changes Dec 14, 2023

View reviewed changes

libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp Show resolved Hide resolved

libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp Show resolved Hide resolved

EricWF added the ericwf:reviews label Dec 14, 2023

lei137 requested a review from EricWF December 14, 2023 22:45

EricWF removed the ericwf:reviews label Dec 15, 2023

ldionne assigned mordante Dec 18, 2023

mordante reviewed Jan 15, 2024

View reviewed changes

libcxx/test/std/time/time.syn/formatter.file_time.pass.cpp Show resolved Hide resolved

mordante mentioned this pull request Jan 15, 2024

[libc++][format] file_clock should always use UTC as timezone #78184

Closed

mordante approved these changes Feb 11, 2024

View reviewed changes

lei137 added 2 commits March 6, 2024 09:32

[libc++] Fixes time formatter test output for Linux on PowerPC

02516e0

Adjusts the output to match.

remove unintentional change

d8dbf0f

lei137 force-pushed the fixTimeFormatTests branch from 5f98907 to d8dbf0f Compare March 6, 2024 16:32

lei137 merged commit e4d4cfa into llvm:main Mar 7, 2024

lei137 deleted the fixTimeFormatTests branch July 29, 2024 16:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[libc++] Fixes time formatter test output for Linux on PowerPC #75526

[libc++] Fixes time formatter test output for Linux on PowerPC #75526

Uh oh!

lei137 commented Dec 14, 2023

Uh oh!

llvmbot commented Dec 14, 2023

Uh oh!

EricWF left a comment

Uh oh!

Uh oh!

Uh oh!

lei137 commented Jan 8, 2024

Uh oh!

mordante left a comment

Uh oh!

Uh oh!

mordante left a comment

Uh oh!

lei137 commented Feb 14, 2024

Uh oh!

mordante commented Mar 3, 2024

Uh oh!

Uh oh!

[libc++] Fixes time formatter test output for Linux on PowerPC #75526

[libc++] Fixes time formatter test output for Linux on PowerPC #75526

Uh oh!

Conversation

lei137 commented Dec 14, 2023

Uh oh!

llvmbot commented Dec 14, 2023

Uh oh!

EricWF left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

lei137 commented Jan 8, 2024

Uh oh!

mordante left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mordante left a comment

Choose a reason for hiding this comment

Uh oh!

lei137 commented Feb 14, 2024

Uh oh!

mordante commented Mar 3, 2024

Uh oh!

Uh oh!