From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTPS id 123C73834F29; Wed, 22 Jun 2022 06:35:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 123C73834F29 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 98C7B116101; Wed, 22 Jun 2022 02:35:21 -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 UWF+fmsnj2xy; Wed, 22 Jun 2022 02:35:21 -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 6233D1160F1; Wed, 22 Jun 2022 02:35:21 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 25M6ZEWJ724165 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Jun 2022 03:35:14 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: fs: rtems subdir renaming Organization: Free thinker, does not speak for AdaCore Errors-To: aoliva@lxoliva.fsfla.org Date: Wed, 22 Jun 2022 03:35:14 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2022 06:35:23 -0000 RTEMS's implementation of rename(), at least on a temporary RAM filesystem, allows a subdir to be moved into itself, but prevents a dir from being renamed (in?)to an existing directory. Adjust the expectations of filesystem rename tests. 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/rename.cc [__rtems__] (test_directories): Skip attempt to rename into itself, or to an existing directory. * testsuite/27_io/filesystem/operations/rename.cc [__rtems__] (test_directories): Likewise. --- .../27_io/filesystem/operations/rename.cc | 6 +++++- .../experimental/filesystem/operations/rename.cc | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc index 2fb2068dfd3c5..cf5d543b816c2 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc @@ -125,11 +125,15 @@ test_directories() VERIFY( is_directory(dir/"subdir2") ); VERIFY( !exists(dir/"subdir") ); +#ifdef __rtems__ + // Can rename a directory to a sub-directory of itself?!? +#else // Cannot rename a directory to a sub-directory of itself. fs::rename(dir/"subdir2", dir/"subdir2/subsubdir", ec); VERIFY( ec ); VERIFY( is_directory(dir/"subdir2") ); VERIFY( !exists(dir/"subdir2"/"subsubdir") ); +#endif // Cannot rename a file to the name of an existing directory. ec.clear(); @@ -155,7 +159,7 @@ test_directories() VERIFY( is_directory(dir/"subdir2") ); VERIFY( is_regular_file(dir/"subdir2/file") ); -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__rtems__) // Cannot rename a directory to an existing directory #else // Can rename a non-empty directory to the name of an empty directory. diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc index d2175652a79a8..1ef386fe73ade 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc @@ -125,11 +125,15 @@ test_directories() VERIFY( is_directory(dir/"subdir2") ); VERIFY( !exists(dir/"subdir") ); +#ifdef __rtems__ + // Can rename a directory to a sub-directory of itself?!? +#else // Cannot rename a directory to a sub-directory of itself. fs::rename(dir/"subdir2", dir/"subdir2/subsubdir", ec); VERIFY( ec ); VERIFY( is_directory(dir/"subdir2") ); VERIFY( !exists(dir/"subdir2"/"subsubdir") ); +#endif // Cannot rename a file to the name of an existing directory. ec.clear(); @@ -158,6 +162,9 @@ test_directories() VERIFY( is_directory(dir/"subdir2") ); VERIFY( is_regular_file(dir/"subdir2/file") ); +#ifdef __rtems__ + // Cannot rename a directory to an existing directory +#else // Can rename a non-empty directory to the name of an empty directory. ec = bad_ec; fs::rename(dir/"subdir2", dir/"subdir", ec); @@ -165,10 +172,12 @@ test_directories() VERIFY( is_directory(dir/"subdir") ); VERIFY( !exists(dir/"subdir2") ); VERIFY( is_regular_file(dir/"subdir/file") ); +#endif + f2.path.clear(); +#endif f.path.clear(); -#endif fs::remove_all(dir, ec); } -- Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ Free Software Activist GNU Toolchain Engineer Disinformation flourishes because many people care deeply about injustice but very few check the facts. Ask me about