public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Tamar Christina <tnfchris@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-struct-reorg-wip)] libstdc++: Fix some warnings in filesystem tests Date: Fri, 17 Jul 2020 13:27:38 +0000 (GMT) [thread overview] Message-ID: <20200717132738.A91B13A5B033@sourceware.org> (raw) https://gcc.gnu.org/g:9412b35affa46a18f7e657fb449b449ac9a4a599 commit 9412b35affa46a18f7e657fb449b449ac9a4a599 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Mar 5 17:21:24 2020 +0000 libstdc++: Fix some warnings in filesystem tests There's a -Wunused-but-set-variable warning in operations/all.cc which can be fixed with [[maybe_unused]]. The statements in operations/copy.cc give -Wunused-value warnings. I think I meant to use |= rather than !=. And operations/file_size.cc gets -Wsign-compare warnings. * testsuite/27_io/filesystem/operations/all.cc: Mark unused variable. * testsuite/27_io/filesystem/operations/copy.cc: Fix typo. * testsuite/experimental/filesystem/operations/copy.cc: Likewise. * testsuite/27_io/filesystem/operations/file_size.cc: Use correct type for return value, and in comparison. * testsuite/experimental/filesystem/operations/file_size.cc: Likewise. Diff: --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/testsuite/27_io/filesystem/operations/all.cc | 2 +- libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc | 2 +- .../testsuite/27_io/filesystem/operations/file_size.cc | 12 ++++++------ .../testsuite/experimental/filesystem/operations/copy.cc | 2 +- .../experimental/filesystem/operations/file_size.cc | 12 ++++++------ 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fd4d502badd..8c94885ff29 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2020-03-05 Jonathan Wakely <jwakely@redhat.com> + * testsuite/27_io/filesystem/operations/all.cc: Mark unused variable. + * testsuite/27_io/filesystem/operations/copy.cc: Fix typo. + * testsuite/experimental/filesystem/operations/copy.cc: Likewise. + * testsuite/27_io/filesystem/operations/file_size.cc: Use correct type + for return value, and in comparison. + * testsuite/experimental/filesystem/operations/file_size.cc: Likewise. + PR libstdc++/94051 * include/std/string_view: Include <bits/ostream_insert.h>. * testsuite/21_strings/basic_string_view/inserters/94051.cc: New test. diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/all.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/all.cc index a53c777e522..982f8626cad 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/all.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/all.cc @@ -39,7 +39,7 @@ main() const std::filesystem::perm_options permopts{}; std::filesystem::space_info sp; std::error_code ec; - bool b; + bool b [[maybe_unused]]; std::uintmax_t size; std::filesystem::absolute(p); diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc index 69fa693fcb3..f7aac8a302f 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc @@ -57,7 +57,7 @@ test01() VERIFY( !exists(to) ); ec.clear(); - opts != fs::copy_options::recursive; + opts |= fs::copy_options::recursive; fs::copy("/", to, opts, ec); VERIFY( ec == std::make_error_code(std::errc::is_a_directory) ); VERIFY( !exists(to) ); diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/file_size.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/file_size.cc index 4aa0ba1ec43..fecd4fb2696 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/file_size.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/file_size.cc @@ -29,9 +29,9 @@ void test01() { std::error_code ec; - size_t size = fs::file_size(".", ec); + auto size = fs::file_size(".", ec); VERIFY( ec == std::errc::is_a_directory ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); try { size = fs::file_size("."); @@ -40,7 +40,7 @@ test01() ec = e.code(); } VERIFY( ec == std::errc::is_a_directory ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); } void @@ -49,9 +49,9 @@ test02() fs::path p = __gnu_test::nonexistent_path(); std::error_code ec; - size_t size = fs::file_size(p, ec); + auto size = fs::file_size(p, ec); VERIFY( ec ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); try { size = fs::file_size(p); @@ -60,7 +60,7 @@ test02() ec = e.code(); } VERIFY( ec ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); } int diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc index e1bda0ffb6f..e1e6d1dcc15 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc @@ -57,7 +57,7 @@ test01() VERIFY( !exists(to) ); ec.clear(); - opts != fs::copy_options::recursive; + opts |= fs::copy_options::recursive; fs::copy("/", to, opts, ec); VERIFY( ec == std::make_error_code(std::errc::is_a_directory) ); VERIFY( !exists(to) ); diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/file_size.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/file_size.cc index f609da7f395..ea4df63f55b 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/file_size.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/file_size.cc @@ -29,9 +29,9 @@ void test01() { std::error_code ec; - size_t size = fs::file_size(".", ec); + auto size = fs::file_size(".", ec); VERIFY( ec == std::errc::is_a_directory ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); try { size = fs::file_size("."); @@ -40,7 +40,7 @@ test01() ec = e.code(); } VERIFY( ec == std::errc::is_a_directory ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); } void @@ -49,9 +49,9 @@ test02() fs::path p = __gnu_test::nonexistent_path(); std::error_code ec; - size_t size = fs::file_size(p, ec); + auto size = fs::file_size(p, ec); VERIFY( ec ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); try { size = fs::file_size(p); @@ -60,7 +60,7 @@ test02() ec = e.code(); } VERIFY( ec ); - VERIFY( size == -1 ); + VERIFY( size == (std::uintmax_t)-1 ); } int
reply other threads:[~2020-07-17 13:27 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=20200717132738.A91B13A5B033@sourceware.org \ --to=tnfchris@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@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: linkBe 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).