From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 6AAFF3841464; Tue, 21 Jun 2022 00:16:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6AAFF3841464 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++: testsuite: skip fs space tests if not available X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 8412b8a269f159eb502e66e4ef99f17717d0cbce X-Git-Newrev: fd08f705983b0cf2b12c136698010d4341de2a70 Message-Id: <20220621001659.6AAFF3841464@sourceware.org> Date: Tue, 21 Jun 2022 00:16:59 +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:16:59 -0000 https://gcc.gnu.org/g:fd08f705983b0cf2b12c136698010d4341de2a70 commit fd08f705983b0cf2b12c136698010d4341de2a70 Author: Alexandre Oliva Date: Mon Jun 20 20:44:00 2022 -0300 libstdc++: testsuite: skip fs space tests if not available The do_space function is defined in ways that are useful, or that fail immediately, depending on various macros. When it fails immediately, the filesystem space.cc tests fail noisily, but the fail is entirely expected. Define HAVE_SPACE in the space.cc tests, according to the macros that select implementations of do_space, and use it to skip tests that are expected to fail. for libstdc++-v3/ChangeLog * testsuite/27_io/filesystem/operations/space.cc: Skip the test if the feature is unavailable. * testsuite/experimental/filesystem/operations/space.cc: Likewise. Diff: --- libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc | 10 ++++++++++ .../testsuite/experimental/filesystem/operations/space.cc | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc index 05997cac1df..029d65655b1 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc @@ -24,6 +24,13 @@ #include #include +#if defined (_GLIBCXX_HAVE_SYS_STATVFS_H) \ + || defined (_GLIBCXX_FILESYSTEM_IS_WINDOWS) +# define HAVE_SPACE 1 +#else +# define HAVE_SPACE 0 +#endif + bool check(std::filesystem::space_info const& s) { const std::uintmax_t err = -1; @@ -59,6 +66,9 @@ test02() int main() { + if (!HAVE_SPACE) + return 0; + test01(); test02(); } diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc index 10ee0f06871..83868dea9b5 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc @@ -25,6 +25,13 @@ #include #include +#if defined (_GLIBCXX_HAVE_SYS_STATVFS_H) \ + || defined (_GLIBCXX_FILESYSTEM_IS_WINDOWS) +# define HAVE_SPACE 1 +#else +# define HAVE_SPACE 0 +#endif + namespace fs = std::experimental::filesystem; bool check(fs::space_info const& s) @@ -60,6 +67,9 @@ test02() int main() { + if (!HAVE_SPACE) + return 0; + test01(); test02(); }