Commit 0696cc7f by Tobias Fuchs

Merge branch 'embb286_namespaces' into development

Conflicts:
	containers_cpp/test/main.cc
	containers_cpp/test/queue_test-inl.h
parents a6ccbe9e 5dbaeaed
......@@ -41,22 +41,33 @@
#include <embb/base/c/memory_allocation.h>
using embb::base::test::AllocTest;
using embb::base::test::DurationTest;
using embb::base::test::TimeTest;
using embb::base::test::CounterTest;
using embb::base::test::MutexTest;
using embb::base::test::ThreadIndexTest;
using embb::base::test::CoreSetTest;
using embb::base::test::ConditionVarTest;
using embb::base::test::ThreadTest;
using embb::base::test::ThreadSpecificStorageTest;
PT_MAIN("Base C") {
embb_log_set_log_level(EMBB_LOG_LEVEL_WARNING);
unsigned int max_threads =
static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
embb_thread_set_max_count(max_threads);
PT_RUN(embb::base::test::AllocTest);
PT_RUN(embb::base::test::DurationTest);
PT_RUN(embb::base::test::TimeTest);
PT_RUN(embb::base::test::CounterTest);
PT_RUN(embb::base::test::MutexTest);
PT_RUN(embb::base::test::ThreadIndexTest);
PT_RUN(embb::base::test::CoreSetTest);
PT_RUN(embb::base::test::ConditionVarTest);
PT_RUN(embb::base::test::ThreadTest);
PT_RUN(embb::base::test::ThreadSpecificStorageTest);
PT_RUN(AllocTest);
PT_RUN(DurationTest);
PT_RUN(TimeTest);
PT_RUN(CounterTest);
PT_RUN(MutexTest);
PT_RUN(ThreadIndexTest);
PT_RUN(CoreSetTest);
PT_RUN(ConditionVarTest);
PT_RUN(ThreadTest);
PT_RUN(ThreadSpecificStorageTest);
PT_EXPECT(embb_get_bytes_allocated() == 0);
}
......@@ -37,18 +37,27 @@
#include <embb/base/c/memory_allocation.h>
using embb::base::test::CoreSetTest;
using embb::base::test::DurationTest;
using embb::base::test::ConditionVarTest;
using embb::base::test::MutexTest;
using embb::base::test::ThreadSpecificStorageTest;
using embb::base::test::AtomicTest;
using embb::base::test::MemoryAllocationTest;
using embb::base::test::ThreadTest;
PT_MAIN("Base C++") {
unsigned int max_threads =
static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
embb_thread_set_max_count(max_threads);
PT_RUN(embb::base::test::CoreSetTest);
PT_RUN(embb::base::test::DurationTest);
PT_RUN(embb::base::test::ConditionVarTest);
PT_RUN(embb::base::test::MutexTest);
PT_RUN(embb::base::test::ThreadSpecificStorageTest);
PT_RUN(embb::base::test::AtomicTest);
PT_RUN(embb::base::test::MemoryAllocationTest);
PT_RUN(embb::base::test::ThreadTest);
PT_RUN(CoreSetTest);
PT_RUN(DurationTest);
PT_RUN(ConditionVarTest);
PT_RUN(MutexTest);
PT_RUN(ThreadSpecificStorageTest);
PT_RUN(AtomicTest);
PT_RUN(MemoryAllocationTest);
PT_RUN(ThreadTest);
PT_EXPECT(embb_get_bytes_allocated() == 0);
}
......@@ -27,10 +27,10 @@
#ifndef CONTAINERS_CPP_TEST_QUEUE_TEST_H_
#define CONTAINERS_CPP_TEST_QUEUE_TEST_H_
#include <vector>
#include <utility>
#include <partest/partest.h>
#include <embb/base/duration.h>
#include <vector>
#include <utility>
namespace embb {
namespace containers {
......@@ -113,9 +113,9 @@ class QueueTest : public partest::TestCase {
public:
QueueTest();
};
} // namespace test
} // namespace containers
} // namespace embb
} // namespace test
} // namespace containers
} // namespace embb
#include "./queue_test-inl.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment