From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Remove dg-xfail-run-if in std/time/tzdb_list/1.cc
Date: Sun, 15 Jan 2023 16:47:03 +0000 [thread overview]
Message-ID: <20230115164703.1354873-1-jwakely@redhat.com> (raw)
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 --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");
}
--
2.39.0
reply other threads:[~2023-01-15 16:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230115164703.1354873-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).