Remove most use of vespalib::rmdir in searchlib.

4 files changed, 16 insertions, 16 deletions

diff --git a/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp b/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp
index 570f1a6ea03..a9f3f91c57e 100644
--- a/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp
+++ b/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp
@@ -6,7 +6,7 @@
 #include <vespa/searchlib/diskindex/fieldwriter.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchcommon/common/schema.h>
-#include <vespa/vespalib/io/fileutil.h>
+#include <filesystem>
 
 #include <vespa/log/log.h>
 LOG_SETUP("bitvector_test");
@@ -50,7 +50,7 @@ FieldWriterWrapper::open(const std::string &path,
                         const TuneFileSeqWrite &tuneFileWrite,
                         const common::FileHeaderContext &fileHeaderContext)
 {
-    vespalib::mkdir(path, false);
+    std::filesystem::create_directory(std::filesystem::path(path));
     return _writer.open(path, 64, 10000, false, false, schema, indexId, FieldLengthInfo(), tuneFileWrite, fileHeaderContext);
 }
 
@@ -105,7 +105,7 @@ Test::requireThatDictionaryHandlesNoEntries(bool directio, bool readmmap)
     if (readmmap)
         tuneFileRead.setWantMemoryMap();
     FieldWriterWrapper fww(5, 2);
-    vespalib::mkdir("dump", false);
+    std::filesystem::create_directory(std::filesystem::path("dump"));
     EXPECT_TRUE(fww.open("dump/1/", _schema, _indexId, tuneFileWrite,
                          fileHeaderContext));
     fww.newWord("1").add(1);
diff --git a/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp b/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp
index 6152d965e32..2e8617b4dcb 100644
--- a/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp
+++ b/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp
@@ -14,7 +14,7 @@
 #include <vespa/searchlib/queryeval/fake_requestcontext.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/test/fakedata/fpfactory.h>
-#include <vespa/vespalib/io/fileutil.h>
+#include <filesystem>
 #include <iostream>
 #include <set>
 
@@ -316,7 +316,7 @@ Test::Main()
         DummyFileHeaderContext::setCreator(_argv[0]);
     }
 
-    vespalib::mkdir("index", false);
+    std::filesystem::create_directory(std::filesystem::path("index"));
     TEST_DO(openIndex("index/1fedewe", false, false, true, true, true));
     TEST_DO(requireThatLookupIsWorking(true, true, true));
     TEST_DO(openIndex("index/1fede", false, false, true, true, false));
diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
index 47725d7306d..3424343b2fe 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
+++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
@@ -13,7 +13,6 @@
 #include <vespa/searchlib/index/schemautil.h>
 #include <vespa/searchlib/test/fakedata/fakeword.h>
 #include <vespa/searchlib/test/fakedata/fakewordset.h>
-#include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/rand48.h>
 #include <vespa/vespalib/util/size_literals.h>
@@ -22,6 +21,7 @@
 #include <vespa/fastos/file.h>
 #include <vespa/vespalib/util/signalhandler.h>
 #include <unistd.h>
+#include <filesystem>
 #include <vespa/log/log.h>
 LOG_SETUP("fieldwriter_test");
 
@@ -702,7 +702,7 @@ FieldWriterTest::main(int argc, char **argv)
     _wordSet.setupParams(false, false);
     _wordSet.setupWords(_rnd, _numDocs, _commonDocFreq, _numWordsPerClass);
 
-    vespalib::mkdir("index", false);
+    std::filesystem::create_directory(std::filesystem::path("index"));
     testFieldWriterVariants(_wordSet, _numDocs, _verbose);
 
     _wordSet2.setupParams(false, false);
@@ -711,7 +711,7 @@ FieldWriterTest::main(int argc, char **argv)
     _wordSet2.addDocIdBias(docIdBias);  // Large skip numbers
     testFieldWriterVariantsWithHighLids(_wordSet2, _numDocs + docIdBias,
                                         _verbose);
-    vespalib::rmdir("index", true);
+    std::filesystem::remove_all(std::filesystem::path("index"));
     return 0;
 }
 
diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
index 37fac07a8d4..6e60d14b8ff 100644
--- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
+++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
@@ -19,12 +19,12 @@
 #include <vespa/vespalib/btree/btreenode.hpp>
 #include <vespa/vespalib/btree/btreenodeallocator.hpp>
 #include <vespa/vespalib/btree/btreeroot.hpp>
-#include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/util/gate.h>
 #include <vespa/vespalib/util/destructor_callbacks.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/vespalib/gtest/gtest.h>
+#include <filesystem>
 
 #include <vespa/log/log.h>
 LOG_SETUP("fusion_test");
@@ -542,9 +542,9 @@ namespace {
 
 void clean_field_length_testdirs()
 {
-    vespalib::rmdir("fldump2", true);
-    vespalib::rmdir("fldump3", true);
-    vespalib::rmdir("fldump4", true);
+    std::filesystem::remove_all(std::filesystem::path("fldump2"));
+    std::filesystem::remove_all(std::filesystem::path("fldump3"));
+    std::filesystem::remove_all(std::filesystem::path("fldump4"));
 }
 
 }
@@ -593,8 +593,8 @@ namespace {
 
 void clean_stopped_fusion_testdirs()
 {
-    vespalib::rmdir("stopdump2", true);
-    vespalib::rmdir("stopdump3", true);
+    std::filesystem::remove_all(std::filesystem::path("stopdump2"));
+    std::filesystem::remove_all(std::filesystem::path("stopdump3"));
 }
 
 class MyFlushToken : public FlushToken
@@ -631,11 +631,11 @@ TEST_F(FusionTest, require_that_fusion_can_be_stopped)
     make_simple_index("stopdump2", MockFieldLengthInspector());
     ASSERT_TRUE(try_merge_simple_indexes("stopdump3", {"stopdump2"}, flush_token));
     EXPECT_EQ(48, flush_token->get_checks());
-    vespalib::rmdir("stopdump3", true);
+    std::filesystem::remove_all(std::filesystem::path("stopdump3"));
     flush_token = std::make_shared<MyFlushToken>(1);
     ASSERT_FALSE(try_merge_simple_indexes("stopdump3", {"stopdump2"}, flush_token));
     EXPECT_EQ(8, flush_token->get_checks());
-    vespalib::rmdir("stopdump3", true);
+    std::filesystem::remove_all(std::filesystem::path("stopdump3"));
     flush_token = std::make_shared<MyFlushToken>(47);
     ASSERT_FALSE(try_merge_simple_indexes("stopdump3", {"stopdump2"}, flush_token));
     EXPECT_LE(48, flush_token->get_checks());