Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set C++17 when building OFI transport

Browse Source 
Improve ctest definitions
This commit is contained in:
Dennis Klein
2018-11-07 21:04:01 +01:00
committed by Dennis Klein
parent c8b7059ff7
commit 35dd9578aa
5 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/CMakeLists.txt
View File

@@ -65,7 +65,7 @@ add_testsuite(FairMQ.Protocols
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/protocols
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 30
TIMEOUT 5
RUN_SERIAL ON
${definitions}
)
@@ -111,8 +111,8 @@ add_testsuite(FairMQ.Device
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/device
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 15
RUN_SERIAL ON
TIMEOUT 5
# RUN_SERIAL ON
)
set(VERSION_MAJOR 1)
@@ -157,7 +157,7 @@ add_testsuite(FairMQ.Plugins
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS FairMQPlugin_test_dummy FairMQPlugin_test_dummy2
TIMEOUT 10
TIMEOUT 5
)
add_testsuite(FairMQ.PluginsPrelinked
@@ -168,7 +168,7 @@ add_testsuite(FairMQ.PluginsPrelinked
LINKS FairMQ FairMQPlugin_test_dummy FairMQPlugin_test_dummy2
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
TIMEOUT 5
)
add_testsuite(FairMQ.PluginServices
@@ -181,7 +181,7 @@ add_testsuite(FairMQ.PluginServices
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
TIMEOUT 5
)
add_testsuite(FairMQ.EventManager
@@ -192,7 +192,7 @@ add_testsuite(FairMQ.EventManager
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
TIMEOUT 5
)
# add_testsuite(FairMQ.StateMachine
@@ -200,10 +200,10 @@ add_testsuite(FairMQ.EventManager
# ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
# state_machine/_state_machine.cxx
# LINKS FairMQ
# INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
# ${CMAKE_CURRENT_BINARY_DIR}
# TIMEOUT 10
# LINKS FairMQ
# INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
# ${CMAKE_CURRENT_BINARY_DIR}
# TIMEOUT 5
# )
add_testsuite(FairMQ.Tools
@@ -214,7 +214,7 @@ add_testsuite(FairMQ.Tools
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
TIMEOUT 5
)
add_testsuite(FairMQ.Channel
@@ -225,7 +225,7 @@ add_testsuite(FairMQ.Channel
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
TIMEOUT 5
)
add_testsuite(FairMQ.Transport
@@ -237,7 +237,7 @@ add_testsuite(FairMQ.Transport
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
TIMEOUT 5
${definitions}
)
@@ -249,17 +249,20 @@ add_testsuite(FairMQ.Poller
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
TIMEOUT 5
RUN_SERIAL ON
${definitions}
)
add_testsuite(FairMQ.MemoryResources
SOURCES
memory_resources/runner.cxx
${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
memory_resources/_memory_resources.cxx
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5
${definitions}
)

2
test/memory_resources/_memory_resources.cxx
View File

@@ -87,7 +87,7 @@ TEST(MemoryResources, allocator_test)
v.emplace_back(1);
v.emplace_back(2);
v.emplace_back(3);
EXPECT_TRUE((byte*)&(*v.end()) - (byte*)&(*v.begin()) == 3 * sizeof(testData));
EXPECT_TRUE((fair::mq::byte*)&(*v.end()) - (fair::mq::byte*)&(*v.begin()) == 3 * sizeof(testData));
EXPECT_TRUE(testData::nallocated == 3);
}
EXPECT_TRUE(testData::nallocated == 0);