From patchwork Wed Jun 22 06:24:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1646353 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=P8R/D0FH; 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 (ip-8-43-85-97.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 4LSYKp3BCwz9s5V for ; Wed, 22 Jun 2022 16:25:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 244DE3835751 for ; Wed, 22 Jun 2022 06:25:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 244DE3835751 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1655879147; bh=TrzvZPS7hOP+nA1Vl4Qo4p9dC3WhfE69DMu95g6JsXI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=P8R/D0FH2KiU8/ncrmcfpWt4V5aSFnn7OEhPUx8Wbb6PsV1U2p2jmDv9B+yONN5UA c+uEbRdllPxzMXxFrntXSnTK7KSiW1hacNKiqVTJLlb8dovQH8c6TKzJoTGzbGUiu7 2m2If332lHX73UMoL21/Gsa07lWp1Hf+3WUnaX6o= 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 A1D3E386C59D; Wed, 22 Jun 2022 06:24:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A1D3E386C59D Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 471A41160F1; Wed, 22 Jun 2022 02:24:54 -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 reTHGlwr18nD; Wed, 22 Jun 2022 02:24:54 -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 0DA9B1160ED; Wed, 22 Jun 2022 02:24:53 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 25M6OhVZ723924 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Jun 2022 03:24:43 -0300 To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: testsuite: fs rename to self may fail Organization: Free thinker, does not speak for AdaCore Date: Wed, 22 Jun 2022 03:24:43 -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" rtems6's rename() implementation errors with EEXIST when the rename-to filename exists, even when renaming a file to itself or when renaming a nonexisting file. Adjust expectations. Regstrapped on x86_64-linux-gnu, also tested with a cross to aarch64-rtems6. Ok to install? PS: https://devel.rtems.org/ticket/2169 doesn't seem to suggest plans to change behavior so as to comply with POSIX. for libstdc++-v3/ChangeLog * testsuite/27_io/filesystem/operations/rename.cc (test01): Accept EEXIST fail on self-rename, on rename of a nonexisting file, and on rename to existing file. Clean up p1 in case it remains. * testsuite/experimental/filesystem/operations/rename.cc (test01): Accept EEXIST fail on self-rename, and on rename to existing file. Clean up p1 in case it remains. --- .../27_io/filesystem/operations/rename.cc | 11 ++++++----- .../experimental/filesystem/operations/rename.cc | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc index 936e306041290..2fb2068dfd3c5 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc @@ -46,14 +46,14 @@ test01() ec = bad_ec; std::ofstream{p1}; // create file - fs::rename(p1, p1, ec); // no-op - VERIFY( !ec ); + fs::rename(p1, p1, ec); // no-op, but may fail + VERIFY( !ec || ec.value() == EEXIST ); VERIFY( is_regular_file(p1) ); ec.clear(); rename(p2, p1, ec); VERIFY( ec ); - VERIFY( ec.value() == ENOENT ); + VERIFY( ec.value() == ENOENT || ec.value() == EEXIST ); VERIFY( is_regular_file(p1) ); ec = bad_ec; @@ -65,10 +65,11 @@ test01() ec = bad_ec; std::ofstream{p1}; // create file fs::rename(p1, p2, ec); - VERIFY( !ec ); - VERIFY( !exists(p1) ); + VERIFY( !ec || ec.value() == EEXIST ); + VERIFY( !exists(p1) || ec ); VERIFY( is_regular_file(p2) ); + fs::remove(p1, ec); fs::remove(p2, ec); } diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc index 520d48ef8d844..d2175652a79a8 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc @@ -47,8 +47,8 @@ test01() ec = bad_ec; std::ofstream{p1}; // create file - fs::rename(p1, p1, ec); // no-op - VERIFY( !ec ); + fs::rename(p1, p1, ec); // no-op, but may fail + VERIFY( !ec || ec.value() == EEXIST ); VERIFY( is_regular_file(p1) ); ec.clear(); @@ -65,10 +65,11 @@ test01() ec = bad_ec; std::ofstream{p1}; // create file fs::rename(p1, p2, ec); - VERIFY( !ec ); - VERIFY( !exists(p1) ); + VERIFY( !ec || ec.value() == EEXIST ); + VERIFY( !exists(p1) || ec ); VERIFY( is_regular_file(p2) ); + fs::remove(p1, ec); fs::remove(p2, ec); }