Remove CppUnit dependencies in modules

Move test config helpers out of cppunit submodule.

5 files changed, 1 insertions, 53 deletions

diff --git a/vdstestlib/src/tests/cppunit/.gitignore b/vdstestlib/src/tests/cppunit/.gitignore
deleted file mode 100644
index ec991c2f0cd..00000000000
--- a/vdstestlib/src/tests/cppunit/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.depend
-Makefile
-testrunner
-vdstestlib_testrunner_app
diff --git a/vdstestlib/src/tests/cppunit/CMakeLists.txt b/vdstestlib/src/tests/cppunit/CMakeLists.txt
deleted file mode 100644
index 1b8e857fe30..00000000000
--- a/vdstestlib/src/tests/cppunit/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vdstestlib_testrunner_app TEST
-    SOURCES
-    testrunner.cpp
-    cppunittest.cpp
-    DEPENDS
-    vdstestlib
-)
-
-vespa_add_test(
-    NAME vdstestlib_testrunner_app
-    NO_VALGRIND
-    COMMAND vdstestlib_testrunner_app
-)
diff --git a/vdstestlib/src/tests/cppunit/cppunittest.cpp b/vdstestlib/src/tests/cppunit/cppunittest.cpp
deleted file mode 100644
index bf8b38e696e..00000000000
--- a/vdstestlib/src/tests/cppunit/cppunittest.cpp
+++ /dev/null
@@ -1,24 +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/macros.h>
-
-namespace vespalib {
-
-struct CppunitTest : public CppUnit::TestFixture {
-
-    void testSomething();
-
-    CPPUNIT_TEST_SUITE(CppunitTest);
-    CPPUNIT_TEST(testSomething);
-    CPPUNIT_TEST_SUITE_END();
-
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(CppunitTest);
-
-void
-CppunitTest::testSomething()
-{
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("hmm", "foo", "foo");
-}
-
-} // vespalib
diff --git a/vdstestlib/src/tests/cppunit/testrunner.cpp b/vdstestlib/src/tests/cppunit/testrunner.cpp
deleted file mode 100644
index 3b686d132bb..00000000000
--- a/vdstestlib/src/tests/cppunit/testrunner.cpp
+++ /dev/null
@@ -1,10 +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>
-
-int main(int argc, const char *argv[])
-{
-    vdstestlib::CppUnitTestRunner testRunner;
-    return testRunner.run(argc, argv);
-}
-
diff --git a/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp b/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp
index 9d8e5c47143..f985150e497 100644
--- a/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp
+++ b/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp
@@ -2,7 +2,7 @@
 
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/exceptions.h>
-#include <vespa/vdstestlib/cppunit/dirconfig.h>
+#include <vespa/vdstestlib/config/dirconfig.h>
 #include <fstream>
 #include <iostream>