Merge pull request #28308 from vespa-engine/toregge/use-std-filesystem-directory-iterator-in-translog-client-unit-test

Use std::filesystem::directory_iterator in TransLogClient unit test.

1 files changed, 5 insertions, 8 deletions

diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp
index 0f19a0b233b..fdccc221252 100644
--- a/searchlib/src/tests/transactionlog/translogclient_test.cpp
+++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp
@@ -35,7 +35,7 @@ std::unique_ptr<Session> openDomainTest(TransLogClient & tls, const vespalib::st
 bool fillDomainTest(Session * s1, const vespalib::string & name);
 void fillDomainTest(Session * s1, size_t numPackets, size_t numEntries);
 void fillDomainTest(Session * s1, size_t numPackets, size_t numEntries, size_t entrySize);
-uint32_t countFiles(const vespalib::string &dir);
+uint32_t countFiles(const std::string& dir);
 void checkFilledDomainTest(Session &s1, size_t numEntries);
 bool visitDomainTest(TransLogClient & tls, Session * s1, const vespalib::string & name);
 void createAndFillDomain(const vespalib::string & dir, const vespalib::string & name, Encoding encoding, size_t preExistingDomains);
@@ -392,15 +392,12 @@ fillDomainTest(Session * s1, size_t numPackets, size_t numEntries, size_t entryS
 
 
 uint32_t
-countFiles(const vespalib::string &dir)
+countFiles(const std::string& dir)
 {
     uint32_t res = 0;
-    FastOS_DirectoryScan dirScan(dir.c_str());
-    while (dirScan.ReadNext()) {
-        const char *ename = dirScan.GetName();
-        if (strcmp(ename, ".") == 0 ||
-            strcmp(ename, "..") == 0)
-            continue;
+    std::filesystem::directory_iterator dir_scan(dir);
+    for (auto& entry : dir_scan) {
+        (void) entry;
         ++res;
     }
     return res;