Convert StorageConfig to a general class

1 files changed, 12 insertions, 4 deletions

diff --git a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp
index d9de3b10..d1663c52 100644
--- a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp
+++ b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp
@@ -20,13 +20,21 @@
 
 [[nodiscard]] static auto CreateConfig() -> StorageConfig {
     auto cache_dir = FileSystemManager::GetCurrentDirectory() / "cache";
-    auto storage_config = StorageConfig::Instance();
     if (not FileSystemManager::RemoveDirectory(cache_dir, true) or
-        not FileSystemManager::CreateDirectoryExclusive(cache_dir) or
-        not storage_config.SetBuildRoot(cache_dir)) {
+        not FileSystemManager::CreateDirectoryExclusive(cache_dir)) {
+        Logger::Log(LogLevel::Error,
+                    "failed to create a test-local cache dir {}",
+                    cache_dir.string());
         std::exit(EXIT_FAILURE);
     }
-    return storage_config;
+
+    StorageConfig::Builder builder;
+    auto config = builder.SetBuildRoot(cache_dir).Build();
+    if (not config) {
+        Logger::Log(LogLevel::Error, config.error());
+        std::exit(EXIT_FAILURE);
+    }
+    return *std::move(config);
 }
 
 TEST_CASE("Remote: Output created and contents are correct",