From: Alexandre Oliva <oliva@adacore.com>
To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org
Subject: [PATCH] libstdc++: fs: rtems subdir renaming
Date: Wed, 22 Jun 2022 03:35:14 -0300 [thread overview]
Message-ID: <or5ykt9pel.fsf@lxoliva.fsfla.org> (raw)
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 <https://stallmansupport.org>
reply other threads:[~2022-06-22 6:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=or5ykt9pel.fsf@lxoliva.fsfla.org \
--to=oliva@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).