From patchwork Wed Jun 22 06:33:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 55266 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0DE043834F0A for ; Wed, 22 Jun 2022 06:35:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DE043834F0A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1655879709; bh=301ora/FQKSY05jJ5Ef0AteHjaBS+cHay297WSawPgM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=n3WW4SRxyIGYJcMBMycET4KrbX6MkwutWiCKV4gNUtP7sqKPZDdFv2XXO5froqbAx +q+ncMz1ZZkkB/NvILQzj8HJT8adWqdir8IIHJM1IORq8MCCy1z1k7RVOhA+Zhd7IH 8qYPWIxpb5W0eJ8rcW1GYCXmrcCTaYivH+bh/ZwM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id 6ACA73834F21; Wed, 22 Jun 2022 06:33:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6ACA73834F21 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 1303C116106; Wed, 22 Jun 2022 02:33:32 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id jVqZQ9ML7+pc; Wed, 22 Jun 2022 02:33:32 -0400 (EDT) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id D04FF1160F1; Wed, 22 Jun 2022 02:33:29 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 25M6XGts724109 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Jun 2022 03:33:18 -0300 To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: testsuite: skip fs last_write_time tests if not available Organization: Free thinker, does not speak for AdaCore Date: Wed, 22 Jun 2022 03:33:16 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The last_write_time functions are defined in ways that are useful, or that fail immediately, depending on various macros. When they fail immediately, the filesystem last_write_time.cc tests fail noisily, but the fail is entirely expected. Define HAVE_LWT in the last_write_time.cc tests, according to the macros that select implementations of last_write_time, and use it to skip tests that are expected to fail. Regstrapped on x86_64-linux-gnu, also tested with a cross to aarch64-rtems6. Ok to install? PS: I realize _GLIBCXX_HAVE_SYS_STAT_H is tested for in two different ways in the #if expressions added to the tests. This mirrors the different uses in the do_stat template body, and in fs::last_write_time(const path&, file_time_type, error_code&). Perhaps they should all be using either value or definedness, but I didn't want to go there, at least not at first, so I retained the apparent inconsistency. for libstdc++-v3/ChangeLog * testsuite/27_io/filesystem/operations/last_write_time.cc: Skip the test if the features are unavailable. * testsuite/experimental/filesystem/operations/last_write_time.cc: Likewise. --- .../27_io/filesystem/operations/last_write_time.cc | 11 +++++++++++ .../filesystem/operations/last_write_time.cc | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc index 7d6468a512424..ecdd45d6ac99e 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc @@ -33,6 +33,14 @@ #endif #include +#if (_GLIBCXX_USE_UTIMENSAT \ + || (_GLIBCXX_USE_UTIME && _GLIBCXX_HAVE_SYS_STAT_H)) \ + && defined (_GLIBCXX_HAVE_SYS_STAT_H) +# define HAVE_LWT 1 +#else +# define HAVE_LWT 0 +#endif + using time_type = std::filesystem::file_time_type; namespace chrono = std::chrono; @@ -209,6 +217,9 @@ test02() int main() { + if (!HAVE_LWT) + return 0; + test01(); test02(); } diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc index 38fafc392ca9e..562c1114a7fb3 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc @@ -34,6 +34,14 @@ #endif #include +#if (_GLIBCXX_USE_UTIMENSAT \ + || (_GLIBCXX_USE_UTIME && _GLIBCXX_HAVE_SYS_STAT_H)) \ + && defined (_GLIBCXX_HAVE_SYS_STAT_H) +# define HAVE_LWT 1 +#else +# define HAVE_LWT 0 +#endif + using time_type = std::experimental::filesystem::file_time_type; namespace chrono = std::chrono; @@ -175,6 +183,9 @@ test02() int main() { + if (!HAVE_LWT) + return 0; + test01(); test02(); }