diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1d15ed35..415411ec 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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(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/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) add_testsuite(FairMQ.Protocols SOURCES - ${CMAKE_CURRENT_BINARY_DIR}/protocols/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx protocols/_pair.cxx protocols/_poller.cxx protocols/_pub_sub.cxx @@ -56,7 +56,8 @@ add_testsuite(FairMQ.Protocols LINKS FairMQ DEPENDS testhelper_runTestDevice - INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/protocols + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/protocols ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 30 RUN_SERIAL ON @@ -65,22 +66,24 @@ add_testsuite(FairMQ.Protocols add_testsuite(FairMQ.Parts SOURCES - parts/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx parts/_iterator_interface.cxx LINKS FairMQ - INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/parts + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/parts ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 5 ) add_testsuite(FairMQ.MessageResize SOURCES - message_resize/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx message_resize/_message_resize.cxx LINKS FairMQ - INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/message_resize + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/message_resize ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 5 ${definitions} @@ -88,16 +91,17 @@ add_testsuite(FairMQ.MessageResize add_testsuite(FairMQ.Device SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx device/TestSender.h device/TestReceiver.h - device/runner.cxx device/_multiple_devices.cxx device/_device_version.cxx device/_device_config.cxx LINKS FairMQ DEPENDS testhelper_runTestDevice - INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/device + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/device ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 5 RUN_SERIAL ON @@ -137,54 +141,59 @@ add_testlib(FairMQPlugin_test_dummy2 add_testsuite(FairMQ.Plugins SOURCES - plugins/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx plugins/_plugin.cxx plugins/_plugin_manager.cxx LINKS FairMQ - INCLUDES ${CMAKE_CURRENT_BINARY_DIR} + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} DEPENDS FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 TIMEOUT 10 ) add_testsuite(FairMQ.PluginsPrelinked SOURCES - plugins/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx plugins/_plugin_manager_prelink.cxx LINKS FairMQ FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 - INCLUDES ${CMAKE_CURRENT_BINARY_DIR} + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 10 ) add_testsuite(FairMQ.PluginServices SOURCES - plugin_services/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx plugin_services/_config.cxx plugin_services/_control.cxx plugin_services/Fixture.h LINKS FairMQ - INCLUDES ${CMAKE_CURRENT_BINARY_DIR} + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 10 ) add_testsuite(FairMQ.EventManager SOURCES - event_manager/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx event_manager/_event_manager.cxx LINKS FairMQ - INCLUDES ${CMAKE_CURRENT_BINARY_DIR} + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 10 ) add_testsuite(FairMQ.StateMachine SOURCES - state_machine/runner.cxx + ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx state_machine/_state_machine.cxx LINKS FairMQ - INCLUDES ${CMAKE_CURRENT_BINARY_DIR} + INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} TIMEOUT 10 ) diff --git a/test/device/runner.cxx b/test/device/runner.cxx deleted file mode 100644 index af0cb074..00000000 --- a/test/device/runner.cxx +++ /dev/null @@ -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 - -#include -#include - -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(); -} diff --git a/test/event_manager/runner.cxx b/test/event_manager/runner.cxx deleted file mode 100644 index ebabfc9a..00000000 --- a/test/event_manager/runner.cxx +++ /dev/null @@ -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 - -#include - -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(); -} diff --git a/test/message_resize/runner.cxx b/test/message_resize/runner.cxx deleted file mode 100644 index ebabfc9a..00000000 --- a/test/message_resize/runner.cxx +++ /dev/null @@ -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 - -#include - -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(); -} diff --git a/test/parts/runner.cxx b/test/parts/runner.cxx deleted file mode 100644 index 5442845e..00000000 --- a/test/parts/runner.cxx +++ /dev/null @@ -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 - -auto main(int argc, char** argv) -> int -{ - ::testing::InitGoogleTest(&argc, argv); - ::testing::FLAGS_gtest_death_test_style = "threadsafe"; - return RUN_ALL_TESTS(); -} diff --git a/test/plugin_services/runner.cxx b/test/plugin_services/runner.cxx deleted file mode 100644 index 52f1be09..00000000 --- a/test/plugin_services/runner.cxx +++ /dev/null @@ -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 - -#include - -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(); -} diff --git a/test/plugins/runner.cxx b/test/plugins/runner.cxx deleted file mode 100644 index 52f1be09..00000000 --- a/test/plugins/runner.cxx +++ /dev/null @@ -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 - -#include - -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(); -} diff --git a/test/protocols/runner.cxx.in b/test/runner.cxx.in similarity index 92% rename from test/protocols/runner.cxx.in rename to test/runner.cxx.in index d9b7b109..d47a1125 100644 --- a/test/protocols/runner.cxx.in +++ b/test/runner.cxx.in @@ -6,13 +6,12 @@ * copied verbatim in the file "LICENSE" * ********************************************************************************/ -#include "runner.h" +#include #include #include #include -#include namespace fair { @@ -30,7 +29,7 @@ string mqConfig = "@MQ_CONFIG@"; } /* namespace mq */ } /* namespace fair */ -auto main(int argc, char** argv) -> int +int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); ::testing::FLAGS_gtest_death_test_style = "threadsafe"; diff --git a/test/protocols/runner.h b/test/runner.h similarity index 100% rename from test/protocols/runner.h rename to test/runner.h diff --git a/test/state_machine/runner.cxx b/test/state_machine/runner.cxx deleted file mode 100644 index ebabfc9a..00000000 --- a/test/state_machine/runner.cxx +++ /dev/null @@ -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 - -#include - -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(); -}