Revert "Balder/enforce override 2"

4 files changed, 17 insertions, 9 deletions

diff --git a/vdstestlib/src/tests/cppunit/testrunner.cpp b/vdstestlib/src/tests/cppunit/testrunner.cpp
index c25bee698d5..1ba7be7790e 100644
--- a/vdstestlib/src/tests/cppunit/testrunner.cpp
+++ b/vdstestlib/src/tests/cppunit/testrunner.cpp
@@ -1,8 +1,9 @@
 // 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/cppunittestrunner.h>
 
-int main(int argc, const char *argv[])
+int main(int argc, 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 73f6f3cc600..e00815241f0 100644
--- a/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp
+++ b/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp
@@ -1,10 +1,15 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/vespalib/util/exceptions.h>
+#include <vespa/fastos/fastos.h>
 #include <vespa/vdstestlib/cppunit/dirconfig.h>
+
 #include <fstream>
 #include <iostream>
+#include <vespa/log/log.h>
+#include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/util/exceptions.h>
+
+LOG_SETUP("dirconfig_test");
 
 using namespace vdstestlib;
 
diff --git a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp
index fb692bd8e8f..7af156bbc2a 100644
--- a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp
+++ b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp
@@ -1,9 +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/vdstestlib/cppunit/cppunittestrunner.h>
 
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/TestSuite.h>
 #include <cppunit/TextTestProgressListener.h>
 #include <vespa/log/log.h>
 #include <iostream>
@@ -20,7 +22,7 @@ namespace {
         std::vector<std::string> _wanted;
         bool _includeStressTests;
 
-        WantedTestList(int argc, const char *argv[],
+        WantedTestList(int argc, const char * const * argv,
                        bool includeStressTests)
             : _wanted(),
               _includeStressTests(includeStressTests)
@@ -64,7 +66,7 @@ namespace {
             return (s[s.size() - 1] == '$');
         }
 
-        bool include(const std::string& name) const override {
+        virtual bool include(const std::string& name) const override {
             if ((name.find("stress") != std::string::npos ||
                  name.find("Stress") != std::string::npos)
                 && !_includeStressTests)
@@ -88,11 +90,11 @@ namespace {
 
     struct LogHook : public CppUnit::TextTestProgressListener::TestStartHook {
         std::string lastTest;
-        void startedTest(const std::string& testName) override {
+        virtual void startedTest(const std::string& testName) override {
             LOG(info, "Starting test: %s", testName.c_str());
             lastTest = testName;
         }
-        void stoppedTest() override {
+        virtual void stoppedTest() override {
             LOG(info, "Stopped test: %s", lastTest.c_str());
         }
     };
@@ -110,7 +112,7 @@ CppUnitTestRunner::CppUnitTestRunner()
 }
 
 int
-CppUnitTestRunner::run(int argc, const char *argv[])
+CppUnitTestRunner::run(int argc, const char * const * argv)
 {
     CppUnit::TextUi::TestRunner runner;
     CppUnit::TestFactoryRegistry& registry(
diff --git a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h
index 204cfff0cb8..e8ee1700927 100644
--- a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h
+++ b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h
@@ -50,7 +50,7 @@ public:
     CppUnitTestRunner();
 
     void listTests(const CppUnit::TestSuite *tests);
-    int run(int argc, const char * argv[]);
+    int run(int argc, const char * const * argv);
 
 };