Remove CppUnit dependencies in modules

Move test config helpers out of cppunit submodule.

2 files changed, 1 insertions, 29 deletions

diff --git a/storageapi/src/tests/CMakeLists.txt b/storageapi/src/tests/CMakeLists.txt
index ddc43c70004..8b820adb467 100644
--- a/storageapi/src/tests/CMakeLists.txt
+++ b/storageapi/src/tests/CMakeLists.txt
@@ -1,13 +1,12 @@
 # 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 gtest.
-# NOTE: All new test classes should be added here.
 vespa_add_executable(storageapi_gtest_runner_app TEST
     SOURCES
     gtest_runner.cpp
     DEPENDS
     storageapi_testbuckets
     storageapi_testmbusprot
+    storageapi_testmessageapi
     storageapi
     gtest
 )
@@ -17,17 +16,3 @@ vespa_add_test(
     COMMAND storageapi_gtest_runner_app
 )
 
-# Runner for unit tests written in CppUnit (DEPRECATED).
-vespa_add_executable(storageapi_testrunner_app TEST
-    SOURCES
-    testrunner.cpp
-    DEPENDS
-    storageapi_testmessageapi
-    storageapi
-    vdstestlib
-)
-
-vespa_add_test(
-    NAME storageapi_testrunner_app
-    COMMAND storageapi_testrunner_app
-)
diff --git a/storageapi/src/tests/testrunner.cpp b/storageapi/src/tests/testrunner.cpp
deleted file mode 100644
index f21df6bdb86..00000000000
--- a/storageapi/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("storageapicppunittestrunner");
-
-int
-main(int argc, const char *argv[])
-{
-    vdstestlib::CppUnitTestRunner testRunner;
-    return testRunner.run(argc, argv);
-}