diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-02-01 23:58:08 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-02-02 00:01:43 +0000 |
| commit | d98668eb06f532b2dbe0c721fa1b9ed6e643df27 (patch) | |
| tree | c1b6d024a70a473c0178dd38415d0c8e80a79c29 | |
| parent | c17975d81aaed49ff759c20c68b31304a6953d58 (diff) | |
libstdc++: Do not use dirent::d_type unconditionally
These new tests should not use the d_type member unless it's actually
present on the OS.
libstdc++-v3/ChangeLog:
* testsuite/27_io/filesystem/iterators/error_reporting.cc: Use
autoconf macro to check whether d_type is present.
* testsuite/experimental/filesystem/iterators/error_reporting.cc:
Likewise.
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc index 81ef1069367..1f297a731a3 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc @@ -36,14 +36,18 @@ extern "C" struct dirent* readdir(DIR*) { case 1: global_dirent.d_ino = 999; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_REG global_dirent.d_type = DT_REG; +#endif global_dirent.d_reclen = 0; std::char_traits<char>::copy(global_dirent.d_name, "file", 5); choice = 0; return &global_dirent; case 2: global_dirent.d_ino = 111; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_DIR global_dirent.d_type = DT_DIR; +#endif global_dirent.d_reclen = 60; std::char_traits<char>::copy(global_dirent.d_name, "subdir", 7); choice = 1; diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc index ade62732028..806c511ebef 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc @@ -37,14 +37,18 @@ extern "C" struct dirent* readdir(DIR*) { case 1: global_dirent.d_ino = 999; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_REG global_dirent.d_type = DT_REG; +#endif global_dirent.d_reclen = 0; std::char_traits<char>::copy(global_dirent.d_name, "file", 5); choice = 0; return &global_dirent; case 2: global_dirent.d_ino = 111; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_DIR global_dirent.d_type = DT_DIR; +#endif global_dirent.d_reclen = 60; std::char_traits<char>::copy(global_dirent.d_name, "subdir", 7); choice = 1; |