Avoid pulling in the config library all the time.

5 files changed, 6 insertions, 18 deletions

diff --git a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp
index 99c355a909e..1a7c43db600 100644
--- a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp
+++ b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp
@@ -1,12 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for dummypersistence.
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/document/base/documentid.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vdslib/state/clusterstate.h>
+#include <vespa/config-stor-distribution.h>
 
 
 using namespace storage::spi;
diff --git a/persistence/src/tests/proxy/providerproxy_test.cpp b/persistence/src/tests/proxy/providerproxy_test.cpp
index ab21750c28f..514d9516c65 100644
--- a/persistence/src/tests/proxy/providerproxy_test.cpp
+++ b/persistence/src/tests/proxy/providerproxy_test.cpp
@@ -1,10 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for providerproxy.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("providerproxy_test");
-
 #include "dummy_provider_factory.h"
 #include "mockprovider.h"
 #include <vespa/document/bucket/bucketid.h>
@@ -23,6 +19,7 @@ LOG_SETUP("providerproxy_test");
 #include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/vdslib/distribution/distribution.h>
+#include <vespa/config-stor-distribution.h>
 
 using document::BucketId;
 using document::DataType;
diff --git a/persistence/src/tests/proxy/providerstub_test.cpp b/persistence/src/tests/proxy/providerstub_test.cpp
index 3d66cc6d77c..db218ef81b8 100644
--- a/persistence/src/tests/proxy/providerstub_test.cpp
+++ b/persistence/src/tests/proxy/providerstub_test.cpp
@@ -1,10 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for providerstub.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("providerstub_test");
-
 #include <vespa/document/datatype/datatype.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/serialization/vespadocumentserializer.h>
@@ -18,6 +14,7 @@ LOG_SETUP("providerstub_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vdslib/state/clusterstate.h>
+#include <vespa/config-stor-distribution.h>
 
 using document::BucketId;
 using document::ByteBuffer;
diff --git a/persistence/src/tests/spi/clusterstatetest.cpp b/persistence/src/tests/spi/clusterstatetest.cpp
index 87e2a8de163..aac2e0a0e17 100644
--- a/persistence/src/tests/spi/clusterstatetest.cpp
+++ b/persistence/src/tests/spi/clusterstatetest.cpp
@@ -1,14 +1,11 @@
 // 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/log/log.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/persistence/conformancetest/conformancetest.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vdslib/state/clusterstate.h>
-
-LOG_SETUP(".test.dummyimpl");
+#include <vespa/config-stor-distribution.h>
 
 namespace storage {
 namespace spi {
@@ -159,7 +156,7 @@ namespace {
 lib::Distribution::DistributionConfig getCfg(uint16_t redundancy,
                                              uint16_t readyCopies)
 {
-    lib::Distribution::DistributionConfig config(
+    lib::Distribution::DistributionConfigBuilder config(
             lib::Distribution::getDefaultDistributionConfig(redundancy, 100));
     config.readyCopies = readyCopies;
     return config;
diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
index 0fadb300173..861b0afc100 100644
--- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
+++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
@@ -1,8 +1,6 @@
 // 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/document/base/testdocman.h>
-#include <vespa/log/log.h>
 #include <vespa/persistence/conformancetest/conformancetest.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/document/fieldset/fieldsets.h>
@@ -13,8 +11,7 @@
 #include <vespa/vdslib/state/nodestate.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/vdslib/distribution/distribution.h>
-
-LOG_SETUP(".test.conformance");
+#include <vespa/config-stor-distribution.h>
 
 using document::BucketId;