diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-02 20:57:50 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-02 20:57:50 +0000 |
| commit | b650cbbd7935327649c2b08e82e66f7d05418ef6 (patch) | |
| tree | 2759dbfbba12802d74e7f55ec0e8e599fcf153b6 | |
| parent | fce96792a770cf00dea6ff232b158555e7476e65 (diff) | |
Include the correct files the correct place.
| -rw-r--r-- | storage/src/tests/common/testhelper.cpp | 10 | ||||
| -rw-r--r-- | vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp | 2 |
2 files changed, 5 insertions, 7 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"); diff --git a/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp b/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp index fbcf15d23c0..f6f81b7f2c4 100644 --- a/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp +++ b/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/vdstestlib/cppunit/dirconfig.h> #include <fstream> @@ -9,6 +8,7 @@ #include <atomic> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/exceptions.h> +#include <boost/lexical_cast.hpp> LOG_SETUP(".dirconfig"); |