diff options
Diffstat (limited to 'vespamalloc/src')
-rw-r--r-- | vespamalloc/src/tests/allocfree/allocfree.cpp | 9 | ||||
-rw-r--r-- | vespamalloc/src/tests/allocfree/creatingmanythreads.cpp | 3 | ||||
-rw-r--r-- | vespamalloc/src/tests/allocfree/linklist.cpp | 6 | ||||
-rw-r--r-- | vespamalloc/src/tests/allocfree/realloc.cpp | 5 | ||||
-rw-r--r-- | vespamalloc/src/tests/doubledelete/expectsignal.cpp | 4 | ||||
-rw-r--r-- | vespamalloc/src/tests/overwrite/expectsignal.cpp | 4 | ||||
-rw-r--r-- | vespamalloc/src/tests/overwrite/overwrite.cpp | 4 | ||||
-rw-r--r-- | vespamalloc/src/tests/test.cpp | 2 |
8 files changed, 9 insertions, 28 deletions
diff --git a/vespamalloc/src/tests/allocfree/allocfree.cpp b/vespamalloc/src/tests/allocfree/allocfree.cpp index f1ecb74754b..7e81aaa9c1d 100644 --- a/vespamalloc/src/tests/allocfree/allocfree.cpp +++ b/vespamalloc/src/tests/allocfree/allocfree.cpp @@ -1,16 +1,15 @@ // 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/vespalib/testkit/testapp.h> #include "producerconsumer.h" +#include <vespa/vespalib/testkit/testapp.h> #include <map> +#include <vespa/log/log.h> +LOG_SETUP("allocfree_test"); + using vespalib::Consumer; using vespalib::Producer; using vespalib::ProducerConsumer; -LOG_SETUP("allocfree_test"); - TEST_SETUP(Test); //----------------------------------------------------------------------------- diff --git a/vespamalloc/src/tests/allocfree/creatingmanythreads.cpp b/vespamalloc/src/tests/allocfree/creatingmanythreads.cpp index 53de3f274cc..86da05311c6 100644 --- a/vespamalloc/src/tests/allocfree/creatingmanythreads.cpp +++ b/vespamalloc/src/tests/allocfree/creatingmanythreads.cpp @@ -1,8 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/log/log.h> LOG_SETUP("creatingmanythreads_test"); TEST_SETUP(Test); diff --git a/vespamalloc/src/tests/allocfree/linklist.cpp b/vespamalloc/src/tests/allocfree/linklist.cpp index 8e33b684f3a..9642c987899 100644 --- a/vespamalloc/src/tests/allocfree/linklist.cpp +++ b/vespamalloc/src/tests/allocfree/linklist.cpp @@ -1,17 +1,15 @@ // 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/vespalib/testkit/testapp.h> #include "producerconsumer.h" +#include <vespa/vespalib/testkit/testapp.h> #include <vespamalloc/malloc/allocchunk.h> #include <vespamalloc/util/callstack.h> #include <vespa/log/log.h> +LOG_SETUP("linklist_test"); using vespalib::Consumer; using vespalib::Producer; using vespalib::ProducerConsumer; -LOG_SETUP("linklist_test"); - TEST_SETUP(Test); //----------------------------------------------------------------------------- diff --git a/vespamalloc/src/tests/allocfree/realloc.cpp b/vespamalloc/src/tests/allocfree/realloc.cpp index 8cfd50d0132..efaf89f7e1b 100644 --- a/vespamalloc/src/tests/allocfree/realloc.cpp +++ b/vespamalloc/src/tests/allocfree/realloc.cpp @@ -1,9 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -#include <vespa/fastos/fastos.h> -#include <vespa/vespalib/testkit/testapp.h> -LOG_SETUP("realloc_test"); +#include <vespa/vespalib/testkit/testapp.h> TEST_SETUP(Test); diff --git a/vespamalloc/src/tests/doubledelete/expectsignal.cpp b/vespamalloc/src/tests/doubledelete/expectsignal.cpp index 0b2d5e154c4..f1fb6eb5694 100644 --- a/vespamalloc/src/tests/doubledelete/expectsignal.cpp +++ b/vespamalloc/src/tests/doubledelete/expectsignal.cpp @@ -1,11 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/slaveproc.h> -LOG_SETUP("expectsignal_test"); - using namespace vespalib; class Test : public TestApp diff --git a/vespamalloc/src/tests/overwrite/expectsignal.cpp b/vespamalloc/src/tests/overwrite/expectsignal.cpp index 0b2d5e154c4..f1fb6eb5694 100644 --- a/vespamalloc/src/tests/overwrite/expectsignal.cpp +++ b/vespamalloc/src/tests/overwrite/expectsignal.cpp @@ -1,11 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/slaveproc.h> -LOG_SETUP("expectsignal_test"); - using namespace vespalib; class Test : public TestApp diff --git a/vespamalloc/src/tests/overwrite/overwrite.cpp b/vespamalloc/src/tests/overwrite/overwrite.cpp index d7057444505..8c35fe841fe 100644 --- a/vespamalloc/src/tests/overwrite/overwrite.cpp +++ b/vespamalloc/src/tests/overwrite/overwrite.cpp @@ -1,10 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -#include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/testapp.h> -LOG_SETUP("overwrite_test"); - using namespace vespalib; class Test : public TestApp diff --git a/vespamalloc/src/tests/test.cpp b/vespamalloc/src/tests/test.cpp index 24acb3368d8..d6208fdc240 100644 --- a/vespamalloc/src/tests/test.cpp +++ b/vespamalloc/src/tests/test.cpp @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdio.h> #include <stdlib.h> -#include <vespa/fastos/fastos.h> +#include <vespa/fastos/thread.h> namespace vespamalloc { void info(); |