From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 88A8938418BE; Tue, 21 Jun 2022 00:17:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88A8938418BE Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] libstdc++: fs: rtems subdir renaming X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: d17aab2d8041c6325a2f2c14a6097041748da886 X-Git-Newrev: dca0b800ae22df25a6819be7a8d49f665daba0c2 Message-Id: <20220621001709.88A8938418BE@sourceware.org> Date: Tue, 21 Jun 2022 00:17:09 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2022 00:17:09 -0000 https://gcc.gnu.org/g:dca0b800ae22df25a6819be7a8d49f665daba0c2 commit dca0b800ae22df25a6819be7a8d49f665daba0c2 Author: Alexandre Oliva Date: Mon Jun 20 20:49:22 2022 -0300 libstdc++: fs: rtems subdir renaming 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. 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. Diff: --- libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc | 6 +++++- .../testsuite/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 2fb2068dfd3..cf5d543b816 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 d2175652a79..1ef386fe73a 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); }