Introduce and export hotfix version component

The cmake variable PROJECT_VERSION_HOTFIX contains the hotfix version
component. 0 means no hotfix, 1 means the first hotfix, 2 the second,
and so on.

CMakeLists.txt

@@ -220,6 +220,9 @@ if(PROJECT_PACKAGE_DEPENDENCIES)
       get_filename_component(prefix ${msgpack_include}/.. ABSOLUTE)
     elseif(${dep} STREQUAL OFI)
       get_filename_component(prefix ${${dep}_INCLUDE_DIRS}/.. ABSOLUTE)
+    elseif(${dep} STREQUAL nanomsg)
+      get_target_property(nn_include nanomsg INTERFACE_INCLUDE_DIRECTORIES)
+      get_filename_component(prefix ${nn_include}/.. ABSOLUTE)
     elseif(${dep} STREQUAL Doxygen)
       get_target_property(doxygen_bin Doxygen::doxygen INTERFACE_LOCATION)
       get_filename_component(prefix ${doxygen_bin} DIRECTORY)

README.md

@@ -1,5 +1,5 @@
 <!-- {#mainpage} -->
-# FairMQ [![license](https://alfa-ci.gsi.de/shields/badge/license-LGPL--3.0-orange.svg)](COPYRIGHT) [![build status](https://alfa-ci.gsi.de/buildStatus/icon?job=FairRootGroup/FairMQ/master)](https://alfa-ci.gsi.de/blue/organizations/jenkins/FairRootGroup%2FFairMQ/branches) [![test coverage master branch](https://codecov.io/gh/FairRootGroup/FairMQ/branch/master/graph/badge.svg)](https://codecov.io/gh/FairRootGroup/FairMQ/branch/master)
+# FairMQ [![license](https://alfa-ci.gsi.de/shields/badge/license-LGPL--3.0-orange.svg)](COPYRIGHT) [![build status](https://alfa-ci.gsi.de/buildStatus/icon?job=FairRootGroup/FairMQ/master)](https://alfa-ci.gsi.de/blue/organizations/jenkins/FairRootGroup%2FFairMQ/branches) [![test coverage master branch](https://codecov.io/gh/FairRootGroup/FairMQ/branch/master/graph/badge.svg)](https://codecov.io/gh/FairRootGroup/FairMQ/branch/master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/6b648d95d68d4c4eae833b84f84d299c)](https://www.codacy.com/app/dennisklein/FairMQ?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=FairRootGroup/FairMQ&amp;utm_campaign=Badge_Grade)
 
 C++ Message Queuing Library and Framework
 

cmake/FairMQConfig.cmake.in

@@ -23,6 +23,7 @@ set_and_check(@PROJECT_NAME@_CMAKEMODDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT
 set(@PROJECT_NAME@_CXX_STANDARD_REQUIRED @CMAKE_CXX_STANDARD_REQUIRED@)
 set(@PROJECT_NAME@_CXX_STANDARD @CMAKE_CXX_STANDARD@)
 set(@PROJECT_NAME@_CXX_EXTENSIONS @CMAKE_CXX_EXTENSIONS@)
+set(@PROJECT_NAME@_VERSION_HOTFIX @PROJECT_VERSION_HOTFIX@)
 
 ### Import cmake modules
 set(CMAKE_MODULE_PATH ${@PROJECT_NAME@_CMAKEMODDIR} ${CMAKE_MODULE_PATH})

cmake/FairMQLib.cmake

@@ -123,8 +123,14 @@ macro(set_fairmq_defaults)
   endif()
   set(CMAKE_CXX_EXTENSIONS OFF)
 
+  if(NOT BUILD_SHARED_LIBS)
+    set(BUILD_SHARED_LIBS ON CACHE BOOL "Whether to build shared libraries or static archives")
+  endif()
+
   # Set -fPIC as default for all library types
-  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+  if(NOT CMAKE_POSITION_INDEPENDENT_CODE)
+    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+  endif()
 
   # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
   set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -174,6 +180,12 @@ macro(set_fairmq_defaults)
     # Rationale in https://github.com/ninja-build/ninja/issues/814
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
   endif()
+
+  if(NOT PROJECT_VERSION_TWEAK)
+    set(PROJECT_VERSION_HOTFIX 0)
+  else()
+    set(PROJECT_VERSION_HOTFIX ${PROJECT_VERSION_TWEAK})
+  endif()
 endmacro()
 
 function(join VALUES GLUE OUTPUT)

fairmq/CMakeLists.txt

@@ -38,146 +38,144 @@ endif()
 # libFairMQ header files #
 ##########################
 set(FAIRMQ_PUBLIC_HEADER_FILES
-    DeviceRunner.h
+  DeviceRunner.h
-    EventManager.h
+  EventManager.h
-    FairMQChannel.h
+  FairMQChannel.h
-    FairMQDevice.h
+  FairMQDevice.h
-    FairMQLogger.h
+  FairMQLogger.h
-    FairMQMessage.h
+  FairMQMessage.h
-    FairMQParts.h
+  FairMQParts.h
-    FairMQPoller.h
+  FairMQPoller.h
-    FairMQUnmanagedRegion.h
+  FairMQUnmanagedRegion.h
-    FairMQSocket.h
+  FairMQSocket.h
-    FairMQStateMachine.h
+  FairMQStateMachine.h
-    FairMQTransportFactory.h
+  FairMQTransportFactory.h
-    Tools.h
+  Tools.h
-    Transports.h
+  Transports.h
-    options/FairMQProgOptions.h
+  options/FairMQProgOptions.h
-    options/FairProgOptions.h
+  options/FairProgOptions.h
-    Plugin.h
+  Plugin.h
-    PluginManager.h
+  PluginManager.h
-    PluginServices.h
+  PluginServices.h
-    runFairMQDevice.h
+  runFairMQDevice.h
-    tools/CppSTL.h
+  tools/CppSTL.h
-    tools/Network.h
+  tools/Network.h
-    tools/Process.h
+  tools/Process.h
-    tools/RateLimit.h
+  tools/RateLimit.h
-    tools/Strings.h
+  tools/Strings.h
-    tools/Unique.h
+  tools/Unique.h
-    tools/Version.h
+  tools/Version.h
 )
 
 set(FAIRMQ_PRIVATE_HEADER_FILES
-    devices/FairMQBenchmarkSampler.h
+  devices/FairMQBenchmarkSampler.h
-    devices/FairMQMerger.h
+  devices/FairMQMerger.h
-    devices/FairMQMultiplier.h
+  devices/FairMQMultiplier.h
-    devices/FairMQProxy.h
+  devices/FairMQProxy.h
-    devices/FairMQSink.h
+  devices/FairMQSink.h
-    devices/FairMQSplitter.h
+  devices/FairMQSplitter.h
-    options/FairMQParser.h
+  options/FairMQParser.h
-    options/FairMQSuboptParser.h
+  options/FairMQSuboptParser.h
-    options/FairProgOptionsHelper.h
+  options/FairProgOptionsHelper.h
-    plugins/Builtin.h
+  plugins/Builtin.h
-    plugins/Control.h
+  plugins/Control.h
-    StateMachine.h
+  StateMachine.h
-    shmem/FairMQMessageSHM.h
+  shmem/FairMQMessageSHM.h
-    shmem/FairMQPollerSHM.h
+  shmem/FairMQPollerSHM.h
-    shmem/FairMQUnmanagedRegionSHM.h
+  shmem/FairMQUnmanagedRegionSHM.h
-    shmem/FairMQSocketSHM.h
+  shmem/FairMQSocketSHM.h
-    shmem/FairMQTransportFactorySHM.h
+  shmem/FairMQTransportFactorySHM.h
-    shmem/Common.h
+  shmem/Common.h
-    shmem/Manager.h
+  shmem/Manager.h
-    shmem/Monitor.h
+  shmem/Region.h
-    shmem/Region.h
+  zeromq/FairMQMessageZMQ.h
-    zeromq/FairMQMessageZMQ.h
+  zeromq/FairMQPollerZMQ.h
-    zeromq/FairMQPollerZMQ.h
+  zeromq/FairMQUnmanagedRegionZMQ.h
-    zeromq/FairMQUnmanagedRegionZMQ.h
+  zeromq/FairMQSocketZMQ.h
-    zeromq/FairMQSocketZMQ.h
+  zeromq/FairMQTransportFactoryZMQ.h
-    zeromq/FairMQTransportFactoryZMQ.h
 )
 
 if(BUILD_NANOMSG_TRANSPORT)
   set(FAIRMQ_PRIVATE_HEADER_FILES ${FAIRMQ_PRIVATE_HEADER_FILES}
-        nanomsg/FairMQMessageNN.h
+    nanomsg/FairMQMessageNN.h
-        nanomsg/FairMQPollerNN.h
+    nanomsg/FairMQPollerNN.h
-        nanomsg/FairMQUnmanagedRegionNN.h
+    nanomsg/FairMQUnmanagedRegionNN.h
-        nanomsg/FairMQSocketNN.h
+    nanomsg/FairMQSocketNN.h
-        nanomsg/FairMQTransportFactoryNN.h
+    nanomsg/FairMQTransportFactoryNN.h
-    )
+  )
 endif()
 
 if(BUILD_OFI_TRANSPORT)
   set(FAIRMQ_PRIVATE_HEADER_FILES ${FAIRMQ_PRIVATE_HEADER_FILES}
-        ofi/Context.h
+    ofi/Context.h
-        ofi/Message.h
+    ofi/Message.h
-        ofi/Poller.h
+    ofi/Poller.h
-        ofi/Socket.h
+    ofi/Socket.h
-        ofi/TransportFactory.h
+    ofi/TransportFactory.h
-    )
+  )
 endif()
 
 ##########################
 # libFairMQ source files #
 ##########################
 set(FAIRMQ_SOURCE_FILES
-    DeviceRunner.cxx
+  DeviceRunner.cxx
-    FairMQChannel.cxx
+  FairMQChannel.cxx
-    FairMQDevice.cxx
+  FairMQDevice.cxx
-    FairMQLogger.cxx
+  FairMQLogger.cxx
-    FairMQMessage.cxx
+  FairMQMessage.cxx
-    FairMQPoller.cxx
+  FairMQPoller.cxx
-    FairMQSocket.cxx
+  FairMQSocket.cxx
-    FairMQStateMachine.cxx
+  FairMQStateMachine.cxx
-    FairMQTransportFactory.cxx
+  FairMQTransportFactory.cxx
-    devices/FairMQBenchmarkSampler.cxx
+  devices/FairMQBenchmarkSampler.cxx
-    devices/FairMQMerger.cxx
+  devices/FairMQMerger.cxx
-    devices/FairMQMultiplier.cxx
+  devices/FairMQMultiplier.cxx
-    devices/FairMQProxy.cxx
+  devices/FairMQProxy.cxx
-    devices/FairMQSplitter.cxx
+  devices/FairMQSplitter.cxx
-    options/FairMQParser.cxx
+  options/FairMQParser.cxx
-    options/FairMQProgOptions.cxx
+  options/FairMQProgOptions.cxx
-    options/FairMQSuboptParser.cxx
+  options/FairMQSuboptParser.cxx
-    Plugin.cxx
+  Plugin.cxx
-    PluginManager.cxx
+  PluginManager.cxx
-    PluginServices.cxx
+  PluginServices.cxx
-    plugins/Control.cxx
+  plugins/Control.cxx
-    StateMachine.cxx
+  StateMachine.cxx
-    shmem/FairMQMessageSHM.cxx
+  shmem/FairMQMessageSHM.cxx
-    shmem/FairMQPollerSHM.cxx
+  shmem/FairMQPollerSHM.cxx
-    shmem/FairMQUnmanagedRegionSHM.cxx
+  shmem/FairMQUnmanagedRegionSHM.cxx
-    shmem/FairMQSocketSHM.cxx
+  shmem/FairMQSocketSHM.cxx
-    shmem/FairMQTransportFactorySHM.cxx
+  shmem/FairMQTransportFactorySHM.cxx
-    shmem/Manager.cxx
+  shmem/Manager.cxx
-    shmem/Monitor.cxx
+  shmem/Region.cxx
-    shmem/Region.cxx
+  tools/Network.cxx
-    tools/Network.cxx
+  tools/Process.cxx
-    tools/Process.cxx
+  tools/Unique.cxx
-    tools/Unique.cxx
+  zeromq/FairMQMessageZMQ.cxx
-    zeromq/FairMQMessageZMQ.cxx
+  zeromq/FairMQPollerZMQ.cxx
-    zeromq/FairMQPollerZMQ.cxx
+  zeromq/FairMQUnmanagedRegionZMQ.cxx
-    zeromq/FairMQUnmanagedRegionZMQ.cxx
+  zeromq/FairMQSocketZMQ.cxx
-    zeromq/FairMQSocketZMQ.cxx
+  zeromq/FairMQTransportFactoryZMQ.cxx
-    zeromq/FairMQTransportFactoryZMQ.cxx
 )
 
 if(BUILD_NANOMSG_TRANSPORT)
-    set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES}
+  set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES}
-        nanomsg/FairMQMessageNN.cxx
+    nanomsg/FairMQMessageNN.cxx
-        nanomsg/FairMQPollerNN.cxx
+    nanomsg/FairMQPollerNN.cxx
-        nanomsg/FairMQUnmanagedRegionNN.cxx
+    nanomsg/FairMQUnmanagedRegionNN.cxx
-        nanomsg/FairMQSocketNN.cxx
+    nanomsg/FairMQSocketNN.cxx
-        nanomsg/FairMQTransportFactoryNN.cxx
+    nanomsg/FairMQTransportFactoryNN.cxx
-    )
+  )
 endif()
 
 if(BUILD_OFI_TRANSPORT)
-    set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES}
+  set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES}
-        ofi/Context.cxx
+    ofi/Context.cxx
-        ofi/Message.cxx
+    ofi/Message.cxx
-        ofi/Poller.cxx
+    ofi/Poller.cxx
-        ofi/Socket.cxx
+    ofi/Socket.cxx
-        ofi/TransportFactory.cxx
+    ofi/TransportFactory.cxx
-    )
+  )
 endif()
 
 
@@ -197,7 +195,7 @@ if(FAST_BUILD)
 else()
   set(_target FairMQ)
 endif()
-add_library(${_target} SHARED
+add_library(${_target}
   ${FAIRMQ_SOURCE_FILES}
   ${FAIRMQ_PUBLIC_HEADER_FILES} # for IDE integration
   ${FAIRMQ_PRIVATE_HEADER_FILES} # for IDE integration
@@ -211,12 +209,12 @@ endif()
 # include directories #
 #######################
 target_include_directories(${_target}
-    PUBLIC # consumers inherit public include directories
+  PUBLIC # consumers inherit public include directories
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
-    $<INSTALL_INTERFACE:include/fairmq>
+  $<INSTALL_INTERFACE:include/fairmq>
-    $<INSTALL_INTERFACE:include>
+  $<INSTALL_INTERFACE:include>
 )
 
 ##################
@@ -234,25 +232,26 @@ if(optional_deps)
 endif()
 
 target_link_libraries(${_target}
-    INTERFACE # only consumers link against interface dependencies
+  INTERFACE # only consumers link against interface dependencies
 
-    PUBLIC # libFairMQ AND consumers of libFairMQ link aginst public dependencies
+  PUBLIC # libFairMQ AND consumers of libFairMQ link aginst public dependencies
-    Threads::Threads
+  Threads::Threads
-    dl
+  dl
-    Boost::boost
+  $<$<PLATFORM_ID:Linux>:rt>
-    Boost::program_options
+  Boost::boost
-    Boost::thread
+  Boost::program_options
-    Boost::system
+  Boost::thread
-    Boost::filesystem
+  Boost::system
-    Boost::regex
+  Boost::filesystem
-    Boost::date_time
+  Boost::regex
-    Boost::signals
+  Boost::date_time
-    FairLogger::FairLogger
+  Boost::signals
+  FairLogger::FairLogger
 
-    PRIVATE # only libFairMQ links against private dependencies
+  PRIVATE # only libFairMQ links against private dependencies
-    libzmq
+  libzmq
-    ${NANOMSG_DEPS}
+  ${NANOMSG_DEPS}
-    ${OFI_DEPS}
+  ${OFI_DEPS}
 )
 set_target_properties(${_target} PROPERTIES
   VERSION ${PROJECT_GIT_VERSION}
@@ -299,8 +298,17 @@ target_link_libraries(fairmq-splitter FairMQ)
 add_executable(runConfigExample options/runConfigEx.cxx)
 target_link_libraries(runConfigExample FairMQ)
 
-add_executable(fairmq-shmmonitor shmem/runMonitor.cxx)
+add_executable(fairmq-shmmonitor shmem/Monitor.cxx shmem/Monitor.h shmem/runMonitor.cxx)
-target_link_libraries(fairmq-shmmonitor FairMQ)
+target_link_libraries(fairmq-shmmonitor PUBLIC
+  Threads::Threads
+  $<$<PLATFORM_ID:Linux>:rt>
+  Boost::boost
+  Boost::date_time
+  Boost::program_options
+)
+target_include_directories(fairmq-shmmonitor PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+)
 
 add_executable(fairmq-uuid-gen run/runUuidGenerator.cxx)
 target_link_libraries(fairmq-uuid-gen FairMQ)
@@ -310,27 +318,28 @@ target_link_libraries(fairmq-uuid-gen FairMQ)
 # install #
 ###########
 install(
-    TARGETS
+  TARGETS
-    FairMQ
+  FairMQ
-    fairmq-bsampler
+  fairmq-bsampler
-    fairmq-merger
+  fairmq-merger
-    fairmq-multiplier
+  fairmq-multiplier
-    fairmq-proxy
+  fairmq-proxy
-    fairmq-sink
+  fairmq-sink
-    fairmq-splitter
+  fairmq-splitter
-    fairmq-shmmonitor
+  fairmq-shmmonitor
-    fairmq-uuid-gen
+  fairmq-uuid-gen
 
-    EXPORT ${PROJECT_EXPORT_SET}
+  EXPORT ${PROJECT_EXPORT_SET}
-    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
+  RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${PROJECT_INSTALL_LIBDIR}
 )
 
 # preserve relative path and prepend fairmq
 foreach(HEADER ${FAIRMQ_PUBLIC_HEADER_FILES})
-    get_filename_component(_path ${HEADER} DIRECTORY)
+  get_filename_component(_path ${HEADER} DIRECTORY)
-    file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination)
+  file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination)
-    install(FILES ${HEADER}
+  install(FILES ${HEADER}
-        DESTINATION ${_destination}
+    DESTINATION ${_destination}
-    )
+  )
 endforeach()

fairmq/DeviceRunner.cxx

@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -7,16 +7,19 @@
  ********************************************************************************/
 
 #include "DeviceRunner.h"
-#include <fairmq/Tools.h>
+
 #include <exception>
+#include <fairmq/Tools.h>
+#include <fairmq/Version.h>
 
 using namespace fair::mq;
 
-DeviceRunner::DeviceRunner(int argc, char* const argv[])
+DeviceRunner::DeviceRunner(int argc, char* const argv[], bool printLogo)
     : fRawCmdLineArgs(tools::ToStrVector(argc, argv, false))
     , fConfig()
     , fDevice(nullptr)
     , fPluginManager(fRawCmdLineArgs)
+    , fPrintLogo(printLogo)
     , fEvents()
 {}
 
@@ -33,26 +36,34 @@ auto DeviceRunner::Run() -> int
     fEvents.Emit<hooks::SetCustomCmdLineOptions>(*this);
     ////////////////////////
 
-    fPluginManager.ForEachPluginProgOptions([&](boost::program_options::options_description options){
+    fPluginManager.ForEachPluginProgOptions(
-        fConfig.AddToCmdLineOptions(options);
+        [&](boost::program_options::options_description options) {
-    });
+            fConfig.AddToCmdLineOptions(options);
+        });
     fConfig.AddToCmdLineOptions(fPluginManager.ProgramOptions());
 
     ////// CALL HOOK ///////
     fEvents.Emit<hooks::ModifyRawCmdLineArgs>(*this);
     ////////////////////////
 
-    if (fConfig.ParseAll(fRawCmdLineArgs, true))
+    if (fConfig.ParseAll(fRawCmdLineArgs, true)) {
-    {
         return 0;
     }
 
+    if (fPrintLogo) {
+        LOG(info) << std::endl
+                  << "      ______      _    _______  _________ " << std::endl
+                  << "     / ____/___ _(_)_______   |/  /_  __ \\    version " << FAIRMQ_GIT_VERSION << std::endl
+                  << "    / /_  / __ `/ / ___/__  /|_/ /_  / / /    build " << FAIRMQ_BUILD_TYPE << std::endl
+                  << "   / __/ / /_/ / / /    _  /  / / / /_/ /     " << FAIRMQ_REPO_URL << std::endl
+                  << "  /_/    \\__,_/_/_/     /_/  /_/  \\___\\_\\     " << FAIRMQ_LICENSE << "  © " << FAIRMQ_COPYRIGHT << std::endl;
+    }
+
     ////// CALL HOOK ///////
     fEvents.Emit<hooks::InstantiateDevice>(*this);
     ////////////////////////
 
-    if (!fDevice)
+    if (!fDevice) {
-    {
         LOG(error) << "getDevice(): no valid device provided. Exiting.";
         return 1;
     }
@@ -61,16 +72,14 @@ auto DeviceRunner::Run() -> int
 
     // Handle --print-channels
     fDevice->RegisterChannelEndpoints();
-    if (fConfig.Count("print-channels"))
+    if (fConfig.Count("print-channels")) {
-    {
         fDevice->PrintRegisteredChannels();
         fDevice->ChangeState(FairMQDevice::END);
         return 0;
     }
 
     // Handle --version
-    if (fConfig.Count("version"))
+    if (fConfig.Count("version")) {
-    {
         std::cout << "User device version: " << fDevice->GetVersion() << std::endl;
         std::cout << "FAIRMQ_INTERFACE_VERSION: " << FAIRMQ_INTERFACE_VERSION << std::endl;
         fDevice->ChangeState(FairMQDevice::END);
@@ -99,18 +108,15 @@ auto DeviceRunner::Run() -> int
 
 auto DeviceRunner::RunWithExceptionHandlers() -> int
 {
-    try
+    try {
-    {
         return Run();
-    }
+    } catch (std::exception& e) {
-    catch (std::exception& e)
+        LOG(error) << "Unhandled exception reached the top of main: " << e.what()
-    {
+                   << ", application will now exit";
-        LOG(error) << "Unhandled exception reached the top of main: " << e.what() << ", application will now exit";
         return 1;
-    }
+    } catch (...) {
-    catch (...)
+        LOG(error) << "Non-exception instance being thrown. Please make sure you use "
-    {
+                      "std::runtime_exception() instead. Application will now exit.";
-        LOG(error) << "Non-exception instance being thrown. Please make sure you use std::runtime_exception() instead. Application will now exit.";
         return 1;
     }
 }

fairmq/DeviceRunner.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -20,10 +20,8 @@
 #include <string>
 #include <vector>
 
-namespace fair
+namespace fair {
-{
+namespace mq {
-namespace mq
-{
 
 /**
  * @class DeviceRunner DeviceRunner.h <fairmq/DeviceRunner.h>
@@ -31,7 +29,8 @@ namespace mq
  *
  * Runs a single FairMQ device with config and plugin support.
  *
- * For customization user hooks are executed at various steps during device launch/shutdown in the following sequence:
+ * For customization user hooks are executed at various steps during device launch/shutdown in the
+ * following sequence:
  *
  *         LoadPlugins
  *              |
@@ -44,34 +43,41 @@ namespace mq
  *              v
  *      InstatiateDevice
  *
- * Each hook has access to all members of the DeviceRunner and really only differs by the point in time it is called.
+ * Each hook has access to all members of the DeviceRunner and really only differs by the point in
+ * time it is called.
  *
  * For an example usage of this class see the fairmq/runFairMQDevice.h header.
  */
 class DeviceRunner
 {
   public:
-    DeviceRunner(int argc, char* const argv[]);
+    DeviceRunner(int argc, char* const argv[], bool printLogo = true);
 
     auto Run() -> int;
     auto RunWithExceptionHandlers() -> int;
 
     template<typename H>
-    auto AddHook(std::function<void(DeviceRunner&)> hook) -> void { fEvents.Subscribe<H>("runner", hook); }
+    auto AddHook(std::function<void(DeviceRunner&)> hook) -> void
+    {
+        fEvents.Subscribe<H>("runner", hook);
+    }
     template<typename H>
-    auto RemoveHook() -> void { fEvents.Unsubscribe<H>("runner"); }
+    auto RemoveHook() -> void
+    {
+        fEvents.Unsubscribe<H>("runner");
+    }
 
     std::vector<std::string> fRawCmdLineArgs;
     FairMQProgOptions fConfig;
     std::unique_ptr<FairMQDevice> fDevice;
     PluginManager fPluginManager;
+    const bool fPrintLogo;
 
   private:
     EventManager fEvents;
 };
 
-namespace hooks
+namespace hooks {
-{
 struct LoadPlugins : Event<DeviceRunner&> {};
 struct SetCustomCmdLineOptions : Event<DeviceRunner&> {};
 struct ModifyRawCmdLineArgs : Event<DeviceRunner&> {};

fairmq/FairMQDevice.cxx

@@ -72,6 +72,9 @@ FairMQDevice::FairMQDevice(FairMQProgOptions* config, const fair::mq::tools::Ver
     , fVersion(version)
     , fRate(0.)
     , fRawCmdLineArgs()
+    , fInterrupted(false)
+    , fInterruptedCV()
+    , fInterruptedMtx()
 {
 }
 
@@ -491,6 +494,10 @@ void FairMQDevice::RunWrapper()
     thread rateLogger(&FairMQDevice::LogSocketRates, this);
 
     // notify transports to resume transfers
+    {
+        lock_guard<mutex> guard(fInterruptedMtx);
+        fInterrupted = false;
+    }
     for (auto& t : fTransports)
     {
         t.second->Resume();
@@ -909,6 +916,7 @@ void FairMQDevice::LogSocketRates()
 
             t0 = t1;
             this_thread::sleep_for(chrono::milliseconds(1000));
+            // WaitFor(chrono::milliseconds(1000)); TODO: enable this when nanomsg linger is fixed
         }
     }
 }
@@ -919,6 +927,11 @@ void FairMQDevice::Unblock()
     {
         t.second->Interrupt();
     }
+    {
+        lock_guard<mutex> guard(fInterruptedMtx);
+        fInterrupted = true;
+    }
+    fInterruptedCV.notify_all();
 }
 
 void FairMQDevice::ResetTaskWrapper()

fairmq/FairMQDevice.h

@@ -25,6 +25,7 @@
 #include <memory> // unique_ptr
 #include <algorithm> // std::sort()
 #include <string>
+#include <chrono>
 #include <iostream>
 #include <unordered_map>
 #include <functional>
@@ -433,6 +434,16 @@ class FairMQDevice : public FairMQStateMachine
 
     void RunStateMachine() { ProcessWork(); };
 
+    /// Wait for the supplied amount of time or for interruption.
+    /// If interrupted, returns false, otherwise true.
+    /// @param duration wait duration
+    template<class Rep, class Period>
+    bool WaitFor(std::chrono::duration<Rep, Period> const& duration)
+    {
+        std::unique_lock<std::mutex> lock(fInterruptedMtx);
+        return !fInterruptedCV.wait_for(lock, duration, [&] { return fInterrupted.load(); }); // return true if no interruption happened
+    }
+
   protected:
     std::shared_ptr<FairMQTransportFactory> fTransportFactory; ///< Default transport factory
     std::unordered_map<fair::mq::Transport, std::shared_ptr<FairMQTransportFactory>> fTransports; ///< Container for transports
@@ -551,6 +562,10 @@ class FairMQDevice : public FairMQStateMachine
     const fair::mq::tools::Version fVersion;
     float fRate; ///< Rate limiting for ConditionalRun
     std::vector<std::string> fRawCmdLineArgs;
+
+    std::atomic<bool> fInterrupted;
+    std::condition_variable fInterruptedCV;
+    std::mutex fInterruptedMtx;
 };
 
 #endif /* FAIRMQDEVICE_H_ */

fairmq/Version.h.in

@@ -9,11 +9,19 @@
 #ifndef FAIR_MQ_VERSION_H
 
 #define FAIRMQ_VERSION "@PROJECT_VERSION@"
-#define FAIRMQ_VERSION_DEC (@PROJECT_VERSION_MAJOR@ * 10000) + (@PROJECT_VERSION_MINOR@ * 100) + @PROJECT_VERSION_PATCH@
+#define FAIRMQ_VERSION_DEC (@PROJECT_VERSION_MAJOR@ * 100000) \
+                           + (@PROJECT_VERSION_MINOR@ * 1000) \
+                           + (@PROJECT_VERSION_PATCH@ * 10) \
+                           + @PROJECT_VERSION_HOTFIX@
 #define FAIRMQ_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
 #define FAIRMQ_VERSION_MINOR @PROJECT_VERSION_MINOR@
 #define FAIRMQ_VERSION_PATCH @PROJECT_VERSION_PATCH@
+#define FAIRMQ_VERSION_HOTFIX @PROJECT_VERSION_HOTFIX@
 #define FAIRMQ_GIT_VERSION "@PROJECT_GIT_VERSION@"
 #define FAIRMQ_GIT_DATE "@PROJECT_GIT_DATE@"
+#define FAIRMQ_REPO_URL "https://github.com/FairRootGroup/FairMQ"
+#define FAIRMQ_LICENSE "LGPL-3.0"
+#define FAIRMQ_COPYRIGHT "2012-2018 GSI"
+#define FAIRMQ_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
 
 #endif // FAIR_MQ_VERSION_H

fairmq/plugins/Control.cxx

@@ -12,12 +12,13 @@
 #include <poll.h> // for the interactive mode
 #include <csignal> // catching system signals
 #include <functional>
+#include <atomic>
 
 using namespace std;
 
 namespace
 {
-    volatile sig_atomic_t gSignalStatus = 0;
+    std::atomic<sig_atomic_t> gSignalStatus(0);
 
     extern "C" auto signal_handler(int signal) -> void
     {

fairmq/plugins/Control.h

@@ -10,6 +10,7 @@
 #define FAIR_MQ_PLUGINS_CONTROL
 
 #include <fairmq/Plugin.h>
+#include <fairmq/Version.h>
 
 #include <condition_variable>
 #include <mutex>
@@ -57,13 +58,16 @@ class Control : public Plugin
 auto ControlPluginProgramOptions() -> Plugin::ProgOptions;
 
 REGISTER_FAIRMQ_PLUGIN(
-    Control,                                     // Class name
+    Control,   // Class name
-    control,                                     // Plugin name (string, lower case chars only)
+    control,   // Plugin name (string, lower case chars only)
-    (Plugin::Version{1,0,1}),                    // Version
+    (Plugin::Version{FAIRMQ_VERSION_MAJOR,
-    "FairRootGroup <fairroot@gsi.de>",           // Maintainer
+                     FAIRMQ_VERSION_MINOR,
-    "https://github.com/FairRootGroup/FairRoot", // Homepage
+                     FAIRMQ_VERSION_PATCH}),       // Version
-    ControlPluginProgramOptions                  // Free function which declares custom program options for the plugin
+    "FairRootGroup <fairroot@gsi.de>",             // Maintainer
-                                                 // signature: () -> boost::optional<boost::program_options::options_description>
+    "https://github.com/FairRootGroup/FairRoot",   // Homepage
+    ControlPluginProgramOptions   // Free function which declares custom program options for the
+                                  // plugin signature: () ->
+                                  // boost::optional<boost::program_options::options_description>
 )
 
 } /* namespace plugins */

test/CMakeLists.txt

@@ -26,6 +26,7 @@ add_testhelper(runTestDevice
     helper/devices/TestReq.cxx
     helper/devices/TestSub.cxx
     helper/devices/TestTransferTimeout.cxx
+    helper/devices/TestWaitFor.cxx
 
     LINKS FairMQ
 )
@@ -38,23 +39,22 @@ 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
     protocols/_push_pull.cxx
     protocols/_req_rep.cxx
-    protocols/_transfer_timeout.cxx
     protocols/_push_pull_multipart.cxx
 
     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
@@ -63,22 +63,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}
@@ -86,15 +88,18 @@ 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
+    device/_waitfor.cxx
 
     LINKS FairMQ
-    INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/device
+    DEPENDS testhelper_runTestDevice
+    INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
+             ${CMAKE_CURRENT_SOURCE_DIR}/device
              ${CMAKE_CURRENT_BINARY_DIR}
     TIMEOUT 5
     RUN_SERIAL ON
@@ -134,54 +139,81 @@ 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
+)
+
+add_testsuite(FairMQ.Transport
+    SOURCES
+    ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
+    transport/_transfer_timeout.cxx
+
+    LINKS FairMQ
+    INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
+             ${CMAKE_CURRENT_BINARY_DIR}
+    TIMEOUT 10
+)
+
+add_testsuite(FairMQ.Poller
+    SOURCES
+    ${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
+    poller/_poller.cxx
+
+    LINKS FairMQ
+    INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
+             ${CMAKE_CURRENT_BINARY_DIR}
     TIMEOUT 10
 )

test/device/_waitfor.cxx

@@ -0,0 +1,74 @@
+/********************************************************************************
+ * Copyright (C) 2014-2018 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 "runner.h"
+
+#include <gtest/gtest.h>
+#include <boost/process.hpp>
+
+#include <sys/types.h>
+#include <signal.h>
+
+#include <string>
+#include <thread>
+#include <chrono>
+#include <iostream>
+#include <future> // std::async, std::future
+
+namespace
+{
+
+using namespace std;
+using namespace fair::mq::test;
+
+void RunWaitFor()
+{
+    std::mutex mtx;
+    std::condition_variable cv;
+
+    int pid = 0;
+    int exit_code = 0;
+
+    thread deviceThread([&]() {
+        stringstream cmd;
+        cmd << runTestDevice << " --id waitfor_" << " --control static " << " --severity nolog";
+
+        boost::process::ipstream stdout;
+        boost::process::child c(cmd.str(), boost::process::std_out > stdout);
+        string line;
+        getline(stdout, line);
+
+        {
+            std::lock_guard<std::mutex> lock(mtx);
+            pid = c.id();
+        }
+        cv.notify_one();
+
+        c.wait();
+
+        exit_code = c.exit_code();
+    });
+
+    {
+        std::unique_lock<std::mutex> lock(mtx);
+        cv.wait(lock, [&pid]{ return pid != 0; });
+    }
+
+    kill(pid, SIGINT);
+
+    deviceThread.join();
+
+    exit(exit_code);
+}
+
+TEST(Device, WaitFor)
+{
+    EXPECT_EXIT(RunWaitFor(), ::testing::ExitedWithCode(0), "");
+}
+
+} // namespace

test/event_manager/runner.cxx

@@ -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();
-}

test/helper/devices/TestWaitFor.cxx

@@ -1,20 +1,33 @@
 /********************************************************************************
- *    Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2015-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 <FairMQDevice.h>
+#include <FairMQLogger.h>
 
-#include <gtest/gtest.h>
+#include <iostream>
-#include <stdlib.h>
 
-auto main(int argc, char** argv) -> int
+namespace fair
 {
-    ::testing::InitGoogleTest(&argc, argv);
+namespace mq
-    ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+{
-    setenv("FAIRMQ_PATH", FAIRMQ_TEST_ENVIRONMENT, 0);
+namespace test
-    return RUN_ALL_TESTS();
+{
-}
+
+class TestWaitFor : public FairMQDevice
+{
+  public:
+    void Run()
+    {
+        std::cout << "hello" << std::endl;
+        WaitFor(std::chrono::seconds(60));
+    }
+};
+
+} // namespace test
+} // namespace mq
+} // namespace fair

test/helper/runTestDevice.cxx

@@ -17,9 +17,12 @@
 #include "devices/TestReq.cxx"
 #include "devices/TestSub.cxx"
 #include "devices/TestTransferTimeout.cxx"
+#include "devices/TestWaitFor.cxx"
+
+#include <runFairMQDevice.h>
+
 #include <boost/program_options.hpp>
 #include <iostream>
-#include <runFairMQDevice.h>
 #include <string>
 
 namespace bpo = boost::program_options;
@@ -80,6 +83,10 @@ auto getDevice(const FairMQProgOptions& config) -> FairMQDevicePtr
     {
         return new PairRight;
     }
+    else if (0 == id.find("waitfor_"))
+    {
+        return new TestWaitFor;
+    }
     else
     {
         cerr << "Don't know id '" << id << "'" << endl;

test/message_resize/runner.cxx

@@ -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();
-}

test/parts/runner.cxx

@@ -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();
-}

test/plugin_services/runner.cxx

@@ -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();
-}

test/plugins/runner.cxx

@@ -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();
-}

test/runner.cxx.in

@@ -6,13 +6,12 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
-#include "runner.h"
+#include <runner.h>
 #include <TestEnvironment.h>
 
 #include <gtest/gtest.h>
 
 #include <string>
-#include <iostream>
 
 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";

test/state_machine/runner.cxx

@@ -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();
-}