[PATCH] libstdc++: testsuite: skip fs space tests if not available

[PATCH] libstdc++: testsuite: skip fs space tests if not available

[Alexandre Oliva]

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.

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/space.cc: Skip the
	test if the feature is unavailable.
	* testsuite/experimental/filesystem/operations/space.cc:
	Likewise.
---
 .../testsuite/27_io/filesystem/operations/space.cc |   10 ++++++++++
 .../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 05997cac1dfa4..029d65655b1a7 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 <testsuite_fs.h>
 #include <testsuite_hooks.h>
 
+#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 10ee0f06871df..83868dea9b5e3 100644
--- a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc
+++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc
@@ -25,6 +25,13 @@
 #include <testsuite_fs.h>
 #include <testsuite_hooks.h>
 
+#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();
 }

-- 
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>

Re: [PATCH] libstdc++: testsuite: skip fs space tests if not available

[Jonathan Wakely]

On Wed, 22 Jun 2022 at 07:28, Alexandre Oliva via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
>
> 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.
>
> Regstrapped on x86_64-linux-gnu, also tested with a cross to
> aarch64-rtems6.  Ok to install?

OK.

This could be done once in testsuite_fs.h as well.

Re: [PATCH] libstdc++: testsuite: skip fs space tests if not available

[Alexandre Oliva]

On Jun 22, 2022, Jonathan Wakely <jwakely@redhat.com> wrote:

> This could be done once in testsuite_fs.h as well.

Done.  Erhm, I posted the new revision of the patch for this thread in
the last_write_time thread, so I'm posting the last_write_time one here.
This one also depends on dg infrastructure added in the NO_SYMLINKS patch.

Regstrapped on x86_64-linux-gnu, also tested with a cross to
aarch64-rtems6.  Ok to install?


libstdc++: testsuite: skip fs last_write_time tests if dummy

The last_write_time functions are defined in ways that are useful, or
that fail immediately, depending on various macros.  When they fail
immediately, the filesystem last_write_time.cc tests fail noisily, but
the fail is entirely expected.

Define NO_LAST_WRITE_TIME in the last_write_time.cc tests, according
to the macros that select implementations of last_write_time, and use
it through the new dg-require-target-fs-lwt to skip tests that are
expected to fail.


for  libstdc++-v3/ChangeLog

	* testsuite/util/testsuite_fs.h (NO_LAST_WRITE_TIME): Define
	when appropriate.
	* testsuite/lib/libstdc++.exp
	(check_v3_target_fs_last_write_time): New.
	* testsuite/lib/dg-options.exp (dg-require-target-fs-lwt):
	New.
	* testsuite/27_io/filesystem/operations/last_write_time.cc:
	Skip the test if the features are unavailable.
	* testsuite/experimental/filesystem/operations/last_write_time.cc:
	Likewise.
---
 .../27_io/filesystem/operations/last_write_time.cc |    1 +
 .../filesystem/operations/last_write_time.cc       |    1 +
 libstdc++-v3/testsuite/lib/dg-options.exp          |    9 +++++++++
 libstdc++-v3/testsuite/lib/libstdc++.exp           |    8 ++++++++
 libstdc++-v3/testsuite/util/testsuite_fs.h         |    5 +++++
 5 files changed, 24 insertions(+)

diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc
index 7d6468a512424..f6460fb83d70d 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc
@@ -17,6 +17,7 @@
 
 // { dg-do run { target c++17 } }
 // { dg-require-filesystem-ts "" }
+// { dg-require-target-fs-lwt "" }
 
 // 15.25 Permissions [fs.op.last_write_time]
 
diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc
index 38fafc392ca9e..a0bf01ea935c5 100644
--- a/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc
+++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc
@@ -18,6 +18,7 @@
 // { dg-options "-DUSE_FILESYSTEM_TS -lstdc++fs" }
 // { dg-do run { target c++11 } }
 // { dg-require-filesystem-ts "" }
+// { dg-require-target-fs-lwt "" }
 
 // 15.25 Permissions [fs.op.last_write_time]
 
diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp
index 81bb8f448bd44..b61c4c0cb8fcd 100644
--- a/libstdc++-v3/testsuite/lib/dg-options.exp
+++ b/libstdc++-v3/testsuite/lib/dg-options.exp
@@ -259,6 +259,15 @@ proc dg-require-target-fs-space { args } {
     return
 }
 
+proc dg-require-target-fs-lwt { args } {
+    if { ![ check_v3_target_fs_last_write_time ] } {
+	upvar dg-do-what dg-do-what
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	return
+    }
+    return
+}
+
 proc add_options_for_no_pch { flags } {
     # This forces any generated and possibly included PCH to be invalid.
     return "-D__GLIBCXX__=99999999"
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 22fdde8d66374..ca515c6f3548b 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -1286,6 +1286,14 @@ proc check_v3_target_fs_space { } {
     return [v3_check_preprocessor_condition fs_space $cond $inc]
 }
 
+# Return 1 if the libstdc++ filesystem implementation of
+# last_write_time is not an always-failing dummy.
+proc check_v3_target_fs_last_write_time { } {
+    set inc "#include <testsuite_fs.h>"
+    set cond "!defined NO_LAST_WRITE_TIME"
+    return [v3_check_preprocessor_condition fs_last_write_time $cond $inc]
+}
+
 # Return 1 if the "cxx11" ABI is in use using the current flags, 0 otherwise.
 # Any flags provided by RUNTESTFLAGS or a target board will be used here.
 # Flags added in the test by dg-options or dg-add-options will not be used.
diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h
index 89042e5534139..037d9ffc0f429 100644
--- a/libstdc++-v3/testsuite/util/testsuite_fs.h
+++ b/libstdc++-v3/testsuite/util/testsuite_fs.h
@@ -52,6 +52,11 @@ namespace test_fs = std::experimental::filesystem;
 #define NO_SPACE
 #endif
 
+#if !(_GLIBCXX_HAVE_SYS_STAT_H \
+      && (_GLIBCXX_USE_UTIMENSAT || _GLIBCXX_USE_UTIME))
+#define NO_LAST_WRITE_TIME 1
+#endif
+
 namespace __gnu_test
 {
 #define PATH_CHK(p1, p2, fn) \


-- 
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>

Re: [PATCH] libstdc++: testsuite: skip fs space tests if not available

[Jonathan Wakely]

On Thu, 23 Jun 2022 at 12:06, Alexandre Oliva <oliva@adacore.com> wrote:
>
> On Jun 22, 2022, Jonathan Wakely <jwakely@redhat.com> wrote:
>
> > This could be done once in testsuite_fs.h as well.
>
> Done.  Erhm, I posted the new revision of the patch for this thread in
> the last_write_time thread, so I'm posting the last_write_time one here.

Heh, yeah, I just noticed that.


> This one also depends on dg infrastructure added in the NO_SYMLINKS patch.
>
> Regstrapped on x86_64-linux-gnu, also tested with a cross to
> aarch64-rtems6.  Ok to install?

OK, thanks.

>
> libstdc++: testsuite: skip fs last_write_time tests if dummy
>
> The last_write_time functions are defined in ways that are useful, or
> that fail immediately, depending on various macros.  When they fail
> immediately, the filesystem last_write_time.cc tests fail noisily, but
> the fail is entirely expected.
>
> Define NO_LAST_WRITE_TIME in the last_write_time.cc tests, according
> to the macros that select implementations of last_write_time, and use
> it through the new dg-require-target-fs-lwt to skip tests that are
> expected to fail.
>
>
> for  libstdc++-v3/ChangeLog
>
>         * testsuite/util/testsuite_fs.h (NO_LAST_WRITE_TIME): Define
>         when appropriate.
>         * testsuite/lib/libstdc++.exp
>         (check_v3_target_fs_last_write_time): New.
>         * testsuite/lib/dg-options.exp (dg-require-target-fs-lwt):
>         New.
>         * testsuite/27_io/filesystem/operations/last_write_time.cc:
>         Skip the test if the features are unavailable.
>         * testsuite/experimental/filesystem/operations/last_write_time.cc:
>         Likewise.
> ---
>  .../27_io/filesystem/operations/last_write_time.cc |    1 +
>  .../filesystem/operations/last_write_time.cc       |    1 +
>  libstdc++-v3/testsuite/lib/dg-options.exp          |    9 +++++++++
>  libstdc++-v3/testsuite/lib/libstdc++.exp           |    8 ++++++++
>  libstdc++-v3/testsuite/util/testsuite_fs.h         |    5 +++++
>  5 files changed, 24 insertions(+)
>
> diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc
> index 7d6468a512424..f6460fb83d70d 100644
> --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc
> +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/last_write_time.cc
> @@ -17,6 +17,7 @@
>
>  // { dg-do run { target c++17 } }
>  // { dg-require-filesystem-ts "" }
> +// { dg-require-target-fs-lwt "" }
>
>  // 15.25 Permissions [fs.op.last_write_time]
>
> diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc
> index 38fafc392ca9e..a0bf01ea935c5 100644
> --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc
> +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/last_write_time.cc
> @@ -18,6 +18,7 @@
>  // { dg-options "-DUSE_FILESYSTEM_TS -lstdc++fs" }
>  // { dg-do run { target c++11 } }
>  // { dg-require-filesystem-ts "" }
> +// { dg-require-target-fs-lwt "" }
>
>  // 15.25 Permissions [fs.op.last_write_time]
>
> diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp
> index 81bb8f448bd44..b61c4c0cb8fcd 100644
> --- a/libstdc++-v3/testsuite/lib/dg-options.exp
> +++ b/libstdc++-v3/testsuite/lib/dg-options.exp
> @@ -259,6 +259,15 @@ proc dg-require-target-fs-space { args } {
>      return
>  }
>
> +proc dg-require-target-fs-lwt { args } {
> +    if { ![ check_v3_target_fs_last_write_time ] } {
> +       upvar dg-do-what dg-do-what
> +       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
> +       return
> +    }
> +    return
> +}
> +
>  proc add_options_for_no_pch { flags } {
>      # This forces any generated and possibly included PCH to be invalid.
>      return "-D__GLIBCXX__=99999999"
> diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
> index 22fdde8d66374..ca515c6f3548b 100644
> --- a/libstdc++-v3/testsuite/lib/libstdc++.exp
> +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
> @@ -1286,6 +1286,14 @@ proc check_v3_target_fs_space { } {
>      return [v3_check_preprocessor_condition fs_space $cond $inc]
>  }
>
> +# Return 1 if the libstdc++ filesystem implementation of
> +# last_write_time is not an always-failing dummy.
> +proc check_v3_target_fs_last_write_time { } {
> +    set inc "#include <testsuite_fs.h>"
> +    set cond "!defined NO_LAST_WRITE_TIME"
> +    return [v3_check_preprocessor_condition fs_last_write_time $cond $inc]
> +}
> +
>  # Return 1 if the "cxx11" ABI is in use using the current flags, 0 otherwise.
>  # Any flags provided by RUNTESTFLAGS or a target board will be used here.
>  # Flags added in the test by dg-options or dg-add-options will not be used.
> diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h
> index 89042e5534139..037d9ffc0f429 100644
> --- a/libstdc++-v3/testsuite/util/testsuite_fs.h
> +++ b/libstdc++-v3/testsuite/util/testsuite_fs.h
> @@ -52,6 +52,11 @@ namespace test_fs = std::experimental::filesystem;
>  #define NO_SPACE
>  #endif
>
> +#if !(_GLIBCXX_HAVE_SYS_STAT_H \
> +      && (_GLIBCXX_USE_UTIMENSAT || _GLIBCXX_USE_UTIME))
> +#define NO_LAST_WRITE_TIME 1
> +#endif
> +
>  namespace __gnu_test
>  {
>  #define PATH_CHK(p1, p2, fn) \
>
>
> --
> 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>
>