Use same runner.cxx/.h for all tests

This commit is contained in:
Alexey Rybalchenko 2018-09-13 17:12:35 +02:00 committed by Dennis Klein
parent f6c1f5dc0f
commit 5397cef9d1
10 changed files with 30 additions and 153 deletions

View File

@ -39,12 +39,12 @@ set(MQ_CONFIG "${CMAKE_BINARY_DIR}/test/testsuite_FairMQ.IOPatterns_config.json"
set(RUN_TEST_DEVICE "${CMAKE_BINARY_DIR}/test/testhelper_runTestDevice") set(RUN_TEST_DEVICE "${CMAKE_BINARY_DIR}/test/testhelper_runTestDevice")
set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq) set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protocols/config.json.in ${MQ_CONFIG}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protocols/config.json.in ${MQ_CONFIG})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protocols/runner.cxx.in ${CMAKE_CURRENT_BINARY_DIR}/protocols/runner.cxx) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/runner.cxx.in ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestEnvironment.h.in ${CMAKE_CURRENT_BINARY_DIR}/TestEnvironment.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestEnvironment.h.in ${CMAKE_CURRENT_BINARY_DIR}/TestEnvironment.h)
add_testsuite(FairMQ.Protocols add_testsuite(FairMQ.Protocols
SOURCES SOURCES
${CMAKE_CURRENT_BINARY_DIR}/protocols/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
protocols/_pair.cxx protocols/_pair.cxx
protocols/_poller.cxx protocols/_poller.cxx
protocols/_pub_sub.cxx protocols/_pub_sub.cxx
@ -56,7 +56,8 @@ add_testsuite(FairMQ.Protocols
LINKS FairMQ LINKS FairMQ
DEPENDS testhelper_runTestDevice DEPENDS testhelper_runTestDevice
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/protocols INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/protocols
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 30 TIMEOUT 30
RUN_SERIAL ON RUN_SERIAL ON
@ -65,22 +66,24 @@ add_testsuite(FairMQ.Protocols
add_testsuite(FairMQ.Parts add_testsuite(FairMQ.Parts
SOURCES SOURCES
parts/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
parts/_iterator_interface.cxx parts/_iterator_interface.cxx
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/parts INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/parts
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 5
) )
add_testsuite(FairMQ.MessageResize add_testsuite(FairMQ.MessageResize
SOURCES SOURCES
message_resize/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
message_resize/_message_resize.cxx message_resize/_message_resize.cxx
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/message_resize INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/message_resize
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 5
${definitions} ${definitions}
@ -88,16 +91,17 @@ add_testsuite(FairMQ.MessageResize
add_testsuite(FairMQ.Device add_testsuite(FairMQ.Device
SOURCES SOURCES
${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
device/TestSender.h device/TestSender.h
device/TestReceiver.h device/TestReceiver.h
device/runner.cxx
device/_multiple_devices.cxx device/_multiple_devices.cxx
device/_device_version.cxx device/_device_version.cxx
device/_device_config.cxx device/_device_config.cxx
LINKS FairMQ LINKS FairMQ
DEPENDS testhelper_runTestDevice DEPENDS testhelper_runTestDevice
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/device INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/device
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 5
RUN_SERIAL ON RUN_SERIAL ON
@ -137,54 +141,59 @@ add_testlib(FairMQPlugin_test_dummy2
add_testsuite(FairMQ.Plugins add_testsuite(FairMQ.Plugins
SOURCES SOURCES
plugins/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
plugins/_plugin.cxx plugins/_plugin.cxx
plugins/_plugin_manager.cxx plugins/_plugin_manager.cxx
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_BINARY_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 DEPENDS FairMQPlugin_test_dummy FairMQPlugin_test_dummy2
TIMEOUT 10 TIMEOUT 10
) )
add_testsuite(FairMQ.PluginsPrelinked add_testsuite(FairMQ.PluginsPrelinked
SOURCES SOURCES
plugins/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
plugins/_plugin_manager_prelink.cxx plugins/_plugin_manager_prelink.cxx
LINKS FairMQ FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 LINKS FairMQ FairMQPlugin_test_dummy FairMQPlugin_test_dummy2
INCLUDES ${CMAKE_CURRENT_BINARY_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10 TIMEOUT 10
) )
add_testsuite(FairMQ.PluginServices add_testsuite(FairMQ.PluginServices
SOURCES SOURCES
plugin_services/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
plugin_services/_config.cxx plugin_services/_config.cxx
plugin_services/_control.cxx plugin_services/_control.cxx
plugin_services/Fixture.h plugin_services/Fixture.h
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_BINARY_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10 TIMEOUT 10
) )
add_testsuite(FairMQ.EventManager add_testsuite(FairMQ.EventManager
SOURCES SOURCES
event_manager/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
event_manager/_event_manager.cxx event_manager/_event_manager.cxx
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_BINARY_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10 TIMEOUT 10
) )
add_testsuite(FairMQ.StateMachine add_testsuite(FairMQ.StateMachine
SOURCES SOURCES
state_machine/runner.cxx ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
state_machine/_state_machine.cxx state_machine/_state_machine.cxx
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_BINARY_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 10 TIMEOUT 10
) )

View File

@ -1,20 +0,0 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <TestEnvironment.h>
#include <gtest/gtest.h>
#include <stdlib.h>
auto main(int argc, char** argv) -> int
{
::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
setenv("FAIRMQ_PATH", FAIRMQ_TEST_ENVIRONMENT, 0);
return RUN_ALL_TESTS();
}

View File

@ -1,19 +0,0 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <TestEnvironment.h>
#include <gtest/gtest.h>
auto main(int argc, char** argv) -> int
{
::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
setenv("FAIRMQ_PATH", FAIRMQ_TEST_ENVIRONMENT, 0);
return RUN_ALL_TESTS();
}

View File

@ -1,19 +0,0 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <TestEnvironment.h>
#include <gtest/gtest.h>
auto main(int argc, char** argv) -> int
{
::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
setenv("FAIRMQ_PATH", FAIRMQ_TEST_ENVIRONMENT, 0);
return RUN_ALL_TESTS();
}

View File

@ -1,16 +0,0 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <gtest/gtest.h>
auto main(int argc, char** argv) -> int
{
::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
return RUN_ALL_TESTS();
}

View File

@ -1,19 +0,0 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <TestEnvironment.h>
#include <gtest/gtest.h>
int main(int argc, char** argv)
{
::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
setenv("FAIRMQ_PATH", FAIRMQ_TEST_ENVIRONMENT, 0);
return RUN_ALL_TESTS();
}

View File

@ -1,19 +0,0 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <TestEnvironment.h>
#include <gtest/gtest.h>
int main(int argc, char** argv)
{
::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
setenv("FAIRMQ_PATH", FAIRMQ_TEST_ENVIRONMENT, 0);
return RUN_ALL_TESTS();
}

View File

@ -6,13 +6,12 @@
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "runner.h" #include <runner.h>
#include <TestEnvironment.h> #include <TestEnvironment.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <string> #include <string>
#include <iostream>
namespace fair namespace fair
{ {
@ -30,7 +29,7 @@ string mqConfig = "@MQ_CONFIG@";
} /* namespace mq */ } /* namespace mq */
} /* namespace fair */ } /* namespace fair */
auto main(int argc, char** argv) -> int int main(int argc, char** argv)
{ {
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";

View File

@ -1,19 +0,0 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <TestEnvironment.h>
#include <gtest/gtest.h>
auto main(int argc, char** argv) -> int
{
::testing::InitGoogleTest(&argc, argv);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
setenv("FAIRMQ_PATH", FAIRMQ_TEST_ENVIRONMENT, 0);
return RUN_ALL_TESTS();
}