From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 040E13858D32 for ; Sun, 15 Jan 2023 16:47:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 040E13858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673801227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9N+3lypdUeAfkBWLrDxVgvr6G/hTU142iyGxBXf4Dpo=; b=fLb3H2Mn4rWyU/Xhxt04YXnFHeI9acJKnWttT7/zKS9Az2E+9FzkRxHAZ+sEKD7uDUa3nq IBhTA+RwIO5VUTk7rmHW9j6LCczoO6FnKdGbspTBxezhhvhsFId9XoBWMoacz4EvltVV/P lX7cKKjYX1KN/TluaoAiv1mo5sAps3s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-653-6bQqikczNi6TDUDty6ZPLQ-1; Sun, 15 Jan 2023 11:47:04 -0500 X-MC-Unique: 6bQqikczNi6TDUDty6ZPLQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06A2B85A588; Sun, 15 Jan 2023 16:47:04 +0000 (UTC) Received: from localhost (unknown [10.33.36.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4B52492B05; Sun, 15 Jan 2023 16:47:03 +0000 (UTC) From: Jonathan Wakely 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 Message-Id: <20230115164703.1354873-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 #include +#include #include -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