1 files changed, 45 insertions, 24 deletions

diff --git a/tests/dir-iterator/driver.cxx b/tests/dir-iterator/driver.cxx
index b73e2e2..c9f7218 100644
--- a/tests/dir-iterator/driver.cxx
+++ b/tests/dir-iterator/driver.cxx
@@ -1,30 +1,17 @@
 // file      : tests/dir-iterator/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
-#ifndef __cpp_lib_modules_ts
 #include <cstddef> // size_t
 #include <iostream>
-#endif
-
-// Other includes.
-
-#ifdef __cpp_modules_ts
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-import butl.path;
-import butl.path_io;
-import butl.utility;
-import butl.filesystem;
-#else
-#include <libbutl/path.mxx>
-#include <libbutl/path-io.mxx>
-#include <libbutl/utility.mxx>    // operator<<(ostream, exception)
-#include <libbutl/filesystem.mxx>
-#endif
+
+#include <libbutl/path.hxx>
+#include <libbutl/path-io.hxx>
+#include <libbutl/utility.hxx>    // operator<<(ostream, exception)
+#include <libbutl/timestamp.hxx>
+#include <libbutl/filesystem.hxx>
+
+#undef NDEBUG
+#include <cassert>
 
 using namespace std;
 using namespace butl;
@@ -40,7 +27,7 @@ operator<< (ostream& os, entry_type e)
   return os << entry_type_string[static_cast<size_t> (e)];
 }
 
-// Usage: argv[0] [-v] [-i] <dir>
+// Usage: argv[0] [-v] [-i|-d] <dir>
 //
 // Iterates over a directory filesystem sub-entries, obtains their types and
 // target types for symlinks.
@@ -52,6 +39,10 @@ operator<< (ostream& os, entry_type e)
 //    Ignore dangling symlinks, rather than fail trying to obtain the target
 //    type.
 //
+// -d
+//    Detect dangling symlinks, rather than fail trying to obtain the target
+//    type.
+//
 int
 main (int argc, const char* argv[])
 {
@@ -59,6 +50,7 @@ main (int argc, const char* argv[])
 
   bool verbose (false);
   bool ignore_dangling (false);
+  bool detect_dangling (false);
 
   int i (1);
   for (; i != argc; ++i)
@@ -69,6 +61,8 @@ main (int argc, const char* argv[])
       verbose = true;
     else if (v == "-i")
       ignore_dangling = true;
+    else if (v == "-d")
+      detect_dangling = true;
     else
       break;
   }
@@ -79,15 +73,42 @@ main (int argc, const char* argv[])
     return 1;
   }
 
+  assert (!ignore_dangling || !detect_dangling);
+
   const char* d (argv[i]);
 
   try
   {
-    for (const dir_entry& de: dir_iterator (dir_path (d), ignore_dangling))
+    for (const dir_entry& de:
+           dir_iterator (dir_path (d),
+                         (ignore_dangling ? dir_iterator::ignore_dangling :
+                          detect_dangling ? dir_iterator::detect_dangling :
+                                            dir_iterator::no_follow)))
     {
+      timestamp mt (de.mtime ());
+      timestamp at (de.atime ());
+
       entry_type lt (de.ltype ());
       entry_type t (lt == entry_type::symlink ? de.type () : lt);
+
       const path& p (de.path ());
+      path fp (de.base () / p);
+
+      entry_time et (t == entry_type::directory
+                     ? dir_time (path_cast<dir_path> (fp))
+                     : file_time (fp));
+
+      if (mt != timestamp_unknown)
+        assert (mt == et.modification);
+
+      if (at != timestamp_unknown)
+        assert (mt == et.access);
+
+      if (de.mtime () != timestamp_unknown)
+        assert (de.mtime () == et.modification);
+
+      if (de.atime () != timestamp_unknown)
+        assert (de.atime () == et.access);
 
       if (verbose)
       {