diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2017-04-24 12:10:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 12:10:42 +0200 |
| commit | 9ff4bdb407ed8d855a3f86a17c99906ff738177b (patch) | |
| tree | fc2b050224d7dde92d57e1f9cac12c1e5aaf6b90 /vdslib | |
| parent | 32ae190acc9ac5081049e1c7008d1602c68cf821 (diff) | |
Revert "Balder/enforce override 2"
Diffstat (limited to 'vdslib')
| -rw-r--r-- | vdslib/src/tests/bucketdistribution/bucketdistributiontest.cpp | 6 | ||||
| -rw-r--r-- | vdslib/src/tests/testrunner.cpp | 5 | ||||
| -rw-r--r-- | vdslib/src/tests/thread/taskschedulertest.cpp | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/vdslib/src/tests/bucketdistribution/bucketdistributiontest.cpp b/vdslib/src/tests/bucketdistribution/bucketdistributiontest.cpp index 89879ef9d7a..589d7b66e96 100644 --- a/vdslib/src/tests/bucketdistribution/bucketdistributiontest.cpp +++ b/vdslib/src/tests/bucketdistribution/bucketdistributiontest.cpp @@ -1,4 +1,7 @@ // 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> +LOG_SETUP(".bucketdistributiontest"); #include <cppunit/extensions/HelperMacros.h> #include <vespa/vdslib/bucketdistribution.h> @@ -7,6 +10,8 @@ using namespace vdslib; class BucketDistributionTest : public CppUnit::TestFixture { public: + void setUp() override { } + void tearDown() override { } void testDistribution(); void testNumBucketBits(); @@ -24,6 +29,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BucketDistributionTest); void BucketDistributionTest::testDistribution() { + LOG(info, "testDistribution"); const uint32_t expected4[] = { 10, 11, 9, 6, 4, 8, 14, 1, 13, 2, 12, 3, 5, 7, 15, 0 }; assertDistribution(16, 4, expected4); diff --git a/vdslib/src/tests/testrunner.cpp b/vdslib/src/tests/testrunner.cpp index 0c5dcd1d00a..fef61af9a17 100644 --- a/vdslib/src/tests/testrunner.cpp +++ b/vdslib/src/tests/testrunner.cpp @@ -1,12 +1,13 @@ // 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/cppunittestrunner.h> -#include <vespa/log/log.h> LOG_SETUP("vdslibcppunittestrunner"); int -main(int argc, const char *argv[]) +main(int argc, char **argv) { vdstestlib::CppUnitTestRunner testRunner; return testRunner.run(argc, argv); diff --git a/vdslib/src/tests/thread/taskschedulertest.cpp b/vdslib/src/tests/thread/taskschedulertest.cpp index a48f9d20214..22529a9f37a 100644 --- a/vdslib/src/tests/thread/taskschedulertest.cpp +++ b/vdslib/src/tests/thread/taskschedulertest.cpp @@ -1,5 +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/vdslib/thread/taskscheduler.h> #include <vespa/vdstestlib/cppunit/macros.h> |