From patchwork Wed Jun 22 06:27:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1646354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=VWs6L9aA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LSYNF0Jrdz9s5V for ; Wed, 22 Jun 2022 16:27:56 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D43293834F01 for ; Wed, 22 Jun 2022 06:27:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D43293834F01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1655879273; bh=Q+hX/Q9YNlmGgdjGrPPKkKGICUGcLUpzYWEIVOhAYOI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=VWs6L9aA/YYXxdQ57MQRzqjOOxrKEyIuCOzg2kQcHITWCtBJkxs0ap8yeMUAZtVpz U0KuW9HDcAPtLbvQIfTn6T/94PbNeJe/utntIQg21JHn6XUJnQD6y1S8jz5e/ml4kV tCwvQQcF7JucL33zD2ux2J1J/LYEzZJ+AcwZEgVA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTPS id 049023835829; Wed, 22 Jun 2022 06:27:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 049023835829 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 9EE341160F1; Wed, 22 Jun 2022 02:27:33 -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 B4Z4fmg6-lL3; Wed, 22 Jun 2022 02:27:33 -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 6611D1160ED; Wed, 22 Jun 2022 02:27:33 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 25M6RPCo723985 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Jun 2022 03:27:25 -0300 To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: testsuite: skip fs space tests if not available Organization: Free thinker, does not speak for AdaCore Date: Wed, 22 Jun 2022 03:27:25 -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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The do_space function is defined in ways that are useful, or that fail immediately, depending on various macros. When it fails immediately, the filesystem space.cc tests fail noisily, but the fail is entirely expected. Define HAVE_SPACE in the space.cc tests, according to the macros that select implementations of do_space, 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? for libstdc++-v3/ChangeLog * testsuite/27_io/filesystem/operations/space.cc: Skip the test if the feature is unavailable. * testsuite/experimental/filesystem/operations/space.cc: Likewise. --- .../testsuite/27_io/filesystem/operations/space.cc | 10 ++++++++++ .../experimental/filesystem/operations/space.cc | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc index 05997cac1dfa4..029d65655b1a7 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc @@ -24,6 +24,13 @@ #include #include +#if defined (_GLIBCXX_HAVE_SYS_STATVFS_H) \ + || defined (_GLIBCXX_FILESYSTEM_IS_WINDOWS) +# define HAVE_SPACE 1 +#else +# define HAVE_SPACE 0 +#endif + bool check(std::filesystem::space_info const& s) { const std::uintmax_t err = -1; @@ -59,6 +66,9 @@ test02() int main() { + if (!HAVE_SPACE) + return 0; + test01(); test02(); } diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc index 10ee0f06871df..83868dea9b5e3 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc @@ -25,6 +25,13 @@ #include #include +#if defined (_GLIBCXX_HAVE_SYS_STATVFS_H) \ + || defined (_GLIBCXX_FILESYSTEM_IS_WINDOWS) +# define HAVE_SPACE 1 +#else +# define HAVE_SPACE 0 +#endif + namespace fs = std::experimental::filesystem; bool check(fs::space_info const& s) @@ -60,6 +67,9 @@ test02() int main() { + if (!HAVE_SPACE) + return 0; + test01(); test02(); }