Remove CppUnit dependencies in modules

Move test config helpers out of cppunit submodule.

9 files changed, 7 insertions, 44 deletions

diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index f77c11eb350..418d8dbe430 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -49,9 +49,6 @@ vespa_define_module(
     vdstestlib
     atomic
 
-    TEST_EXTERNAL_DEPENDS
-    cppunit
-
     TESTS
     src/tests
     src/tests/bucketdb
diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt
index f93ea7ef00d..e92d15c14e3 100644
--- a/storage/src/tests/CMakeLists.txt
+++ b/storage/src/tests/CMakeLists.txt
@@ -1,16 +1,3 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-# Runner for unit tests written in CppUnit (DEPRECATED).
-# NOTE: All new tests should be written in gtest. Each test sub-module has a gtest runner.
-vespa_add_executable(storage_testrunner_app TEST
-    SOURCES
-    testrunner.cpp
-    DEPENDS
-    storage_testcommon
-    storage_testhostreporter
-)
-
-vespa_add_test(
-    NAME storage_testrunner_app
-    COMMAND storage_testrunner_app
-)
+# Currently empty; test executables are in library subdirs
diff --git a/storage/src/tests/bucketdb/initializertest.cpp b/storage/src/tests/bucketdb/initializertest.cpp
index 57bb3a865d5..63f990f7cc1 100644
--- a/storage/src/tests/bucketdb/initializertest.cpp
+++ b/storage/src/tests/bucketdb/initializertest.cpp
@@ -12,8 +12,8 @@
 #include <vespa/storageapi/message/state.h>
 #include <tests/common/teststorageapp.h>
 #include <tests/common/dummystoragelink.h>
-#include <tests/common/testhelper.h> // TODO decouple from CppUnit
-#include <vespa/vdstestlib/cppunit/dirconfig.hpp> // TODO decouple from CppUnit
+#include <tests/common/testhelper.h>
+#include <vespa/vdstestlib/config/dirconfig.hpp>
 #include <vespa/vespalib/gtest/gtest.h>
 
 #include <vespa/log/log.h>
diff --git a/storage/src/tests/common/testhelper.h b/storage/src/tests/common/testhelper.h
index cc7f503e028..8c553ccce40 100644
--- a/storage/src/tests/common/testhelper.h
+++ b/storage/src/tests/common/testhelper.h
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 #include <vespa/messagebus/testlib/slobrok.h>
-#include <vespa/vdstestlib/cppunit/dirconfig.h>
+#include <vespa/vdstestlib/config/dirconfig.h>
 #include <fstream>
 #include <sstream>
 
diff --git a/storage/src/tests/gtest_runner.cpp b/storage/src/tests/gtest_runner.cpp
deleted file mode 100644
index 0eb65b00d49..00000000000
--- a/storage/src/tests/gtest_runner.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/vespalib/gtest/gtest.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP("storage_gtest_runner");
-
-GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index f6b8fc3b3f0..7db47572e22 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <tests/common/testhelper.h> // FIXME
+#include <tests/common/testhelper.h>
 #include <tests/common/dummystoragelink.h>
 #include <tests/common/teststorageapp.h>
 #include <tests/persistence/filestorage/forwardingmessagesender.h>
diff --git a/storage/src/tests/storageserver/fnet_listener_test.cpp b/storage/src/tests/storageserver/fnet_listener_test.cpp
index b9f2ca74df3..f82af1f8e5c 100644
--- a/storage/src/tests/storageserver/fnet_listener_test.cpp
+++ b/storage/src/tests/storageserver/fnet_listener_test.cpp
@@ -8,7 +8,7 @@
 #include <vespa/storageapi/message/state.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/vdstestlib/cppunit/dirconfig.hpp>
+#include <vespa/vdstestlib/config/dirconfig.hpp>
 #include <vespa/messagebus/testlib/slobrok.h>
 #include <tests/common/testhelper.h>
 #include <vespa/vespalib/gtest/gtest.h>
diff --git a/storage/src/tests/storageserver/service_layer_error_listener_test.cpp b/storage/src/tests/storageserver/service_layer_error_listener_test.cpp
index dc5324c00e3..ec38e09a673 100644
--- a/storage/src/tests/storageserver/service_layer_error_listener_test.cpp
+++ b/storage/src/tests/storageserver/service_layer_error_listener_test.cpp
@@ -3,7 +3,7 @@
 #include <vespa/storage/storageserver/service_layer_error_listener.h>
 #include <vespa/storage/storageserver/mergethrottler.h>
 #include <vespa/storageframework/defaultimplementation/component/componentregisterimpl.h>
-#include <vespa/vdstestlib/cppunit/dirconfig.h>
+#include <vespa/vdstestlib/config/dirconfig.h>
 #include <tests/common/testhelper.h>
 #include <tests/common/teststorageapp.h>
 #include <vespa/vespalib/gtest/gtest.h>
diff --git a/storage/src/tests/testrunner.cpp b/storage/src/tests/testrunner.cpp
deleted file mode 100644
index 9f871997873..00000000000
--- a/storage/src/tests/testrunner.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/vdstestlib/cppunit/cppunittestrunner.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP("storagecppunittests");
-
-int
-main(int argc, const char *argv[])
-{
-    vdstestlib::CppUnitTestRunner testRunner;
-    return testRunner.run(argc, argv);
-}