Include the correct files the correct place.

1 files changed, 4 insertions, 6 deletions

diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp
index 54136d00feb..214885fef7f 100644
--- a/storage/src/tests/common/testhelper.cpp
+++ b/storage/src/tests/common/testhelper.cpp
@@ -146,13 +146,11 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) {
     config->set("enable_dead_lock_detector_warnings", "false");
     config->set("max_merges_per_node", "25");
     config->set("max_merge_queue_size", "20");
-    config->set("root_folder",
-                    (storagenode ? "vdsroot" : "vdsroot.distributor"));
-    config->set("is_distributor",
-                    (storagenode ? "false" : "true"));
+    vespalib::string rootFolder = (storagenode ? "vdsroot" : "vdsroot.distributor");
+    config->set("root_folder", rootFolder);
+    config->set("is_distributor", (storagenode ? "false" : "true"));
     config = &dc.addConfig("stor-devices");
-    config->set("root_folder",
-                    (storagenode ? "vdsroot" : "vdsroot.distributor"));
+    config->set("root_folder", rootFolder);
     config = &dc.addConfig("stor-status");
     config->set("httpport", "0");
     config = &dc.addConfig("stor-visitor");