diff mbox series

[committed] libstdc++: Remove dg-xfail-run-if in std/time/tzdb_list/1.cc

Message ID 20230115164703.1354873-1-jwakely@redhat.com
State New
Headers show
Series [committed] libstdc++: Remove dg-xfail-run-if in std/time/tzdb_list/1.cc | expand

Commit Message

Jonathan Wakely Jan. 15, 2023, 4:47 p.m. UTC 
Tested x86_64-linux and powerpc-aix. Pushed to trunk.

-- >8 --

Use the global override_used to tell whether the target supports the
override functionality that the test_reload and test_erase functions
rely on.

libstdc++-v3/ChangeLog:

	* testsuite/std/time/tzdb_list/1.cc: Remove dg-xfail-run-if
	and fail gracefully if defining the weak symbol doesn't work.
---
 libstdc++-v3/testsuite/std/time/tzdb_list/1.cc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc b/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
index 2b121ff219d..e52f346d266 100644
--- a/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
+++ b/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
@@ -2,13 +2,13 @@ 
 // { dg-do run { target c++20 } }
 // { dg-require-effective-target tzdb }
 // { dg-require-effective-target cxx11_abi }
-// { dg-xfail-run-if "no weak override on AIX" { powerpc-ibm-aix* } }
 
 #include <chrono>
 #include <fstream>
+#include <cstdio>
 #include <testsuite_hooks.h>
 
-static bool override_used = true;
+static bool override_used = false;
 
 namespace __gnu_cxx
 {
@@ -119,6 +119,12 @@  int main()
   std::ofstream("tzdata.zi") << tzdata_zi;
 
   test_access();
-  test_reload();
-  test_erase();
+
+  if (override_used)
+  {
+    test_reload();
+    test_erase();
+  }
+  else
+    std::puts("__gnu_cxx::zoneinfo_dir_override() doesn't work on this target");
 }