dlt: Adaptation for QNX build system with SDP 7.x (#609)

* switch to CMAKE_INSTALL_SYSCONFDIR support cmake --install command's --prefix option and CMAKE_INSTALL_PREFIX variable Signed-off-by: Marcin Sochacki <[email protected]> * add WITH_DLT_INSTALLED_TESTS CMake Option When ON, unit test binaries and all relevant files will be installed along with the application binaries. This allows for unit test execution of the cross-compiled code. Signed-off-by: Marcin Sochacki <[email protected]> * add qnx folder with QNX makefiles, fix compilation issues Signed-off-by: Marcin Sochacki <[email protected]> * disable building unit tests + correct typo Signed-off-by: Marcin Sochacki <[email protected]> --------- Signed-off-by: Marcin Sochacki <[email protected]>
COVESA · May 2, 2024 · 723e90e · 723e90e
1 parent efd8c16
commit 723e90e
Show file tree

Hide file tree

Showing 17 changed files with 208 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,6 +49,8 @@ if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "Build type not defined. Using default build type 'RelWithDebInfo'.")
 endif()
 
+include(CMakeDependentOption)
+
 # Set of indiviual options
 option(BUILD_SHARED_LIBS "Set to OFF to build static libraries"                                                      ON)
 option(WITH_SYSTEMD "Set to ON to create unit files and systemd check on dlt-daemon startup"                         OFF)
@@ -83,6 +85,7 @@ option(WITH_DLT_SYSTEM "Set to ON to build src/system binaries"
 option(WITH_DLT_DBUS "Set to ON to build src/dbus binaries"                                                          OFF)
 option(WITH_DLT_TESTS "Set to ON to build src/test binaries"                                                         ON)
 option(WITH_DLT_UNIT_TESTS "Set to ON to build gtest framework and tests/binaries"                                   OFF)
+cmake_dependent_option(WITH_DLT_INSTALLED_TESTS "Set to ON to install tests/binaries"                                OFF WITH_DLT_UNIT_TESTS OFF)
 option(WITH_DLT_COVERAGE "Set to ON to generate coverage report for dlt-daemon source code"                          OFF)
 option(BUILD_GMOCK "Set to ON to enable gmock build"                                                                 OFF)
 option(WITH_GIT_SUBMODULE "Set to ON to update submodules during build"                                              OFF)
@@ -268,9 +271,9 @@ if(WITH_DLT_CXX11_EXT AND WITH_DLT_PKGCONFIG)
     install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-c++.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel)
 endif()
 
-set(CONFIGURATION_FILES_DIR ${CMAKE_INSTALL_FULL_SYSCONFDIR})
+set(CONFIGURATION_FILES_DIR ${CMAKE_INSTALL_SYSCONFDIR})
 
-add_definitions(-DCONFIGURATION_FILES_DIR="${CONFIGURATION_FILES_DIR}")
+add_definitions(-DCONFIGURATION_FILES_DIR="${CMAKE_INSTALL_PREFIX}/${CONFIGURATION_FILES_DIR}")
 
 add_subdirectory(cmake)
 
@@ -437,6 +440,9 @@ message(STATUS "WITH_DLT_FILETRANSFER = ${WITH_DLT_FILETRANSFER}")
 message(STATUS "WITH_DLT_DBUS = ${WITH_DLT_DBUS}")
 message(STATUS "WITH_DLT_TESTS = ${WITH_DLT_TESTS}")
 message(STATUS "WITH_DLT_UNIT_TESTS = ${WITH_DLT_UNIT_TESTS}")
+if(WITH_DLT_UNIT_TESTS)
+    message(STATUS "WITH_DLT_INSTALLED_TESTS = ${WITH_DLT_INSTALLED_TESTS}")
+endif(WITH_DLT_UNIT_TESTS)
 if(GTEST_FOUND)
     message(STATUS "GTEST_VERSION = ${GTEST_VERSION}")
 endif()

diff --git a/qnx/.gitignore b/qnx/.gitignore
@@ -0,0 +1,5 @@
+# QNX Build Files
+build/nto-aarch64-le/*
+build/nto-x86_64-o/*
+!build/nto-aarch64-le/Makefile
+!build/nto-x86_64-o/Makefile
diff --git a/qnx/README.md b/qnx/README.md
@@ -0,0 +1,20 @@
+# Compile the port for QNX
+
+**NOTE**: QNX ports are only supported from a Linux host operating system
+
+- Setup your QNX SDP environment
+- From the project root folder, type:
+```
+git submodule update --init
+make -C qnx/build install JLEVEL=4 [INSTALL_ROOT_nto=PATH_TO_YOUR_STAGING_AREA USE_INSTALL_ROOT=true]
+```
+
+There are several CMAKE variables set for the QNX build as recommended by the dlt-daemon project maintainers:
+* WITH_DLT_QNX_SYSTEM=ON
+* WITH_DLT_CXX11_EXT=ON
+* DLT_IPC=UNIX_SOCKET
+* WITH_DLT_ADAPTOR=ON
+* WITH_DLT_USE_IPv6=OFF
+* WITH_LIB_SHORT_VERSION=ON
+
+If you want to customize dlt-daemon features via CMAKE variables, you have to edit *qnx\build\common.mk* file and modify **CMAKE_ARGS** variable.
diff --git a/qnx/build/Makefile b/qnx/build/Makefile
@@ -0,0 +1,8 @@
+LIST=OS CPU VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
diff --git a/qnx/build/common.mk b/qnx/build/common.mk
@@ -0,0 +1,98 @@
+ifndef QCONFIG
+QCONFIG=qconfig.mk
+endif
+include $(QCONFIG)
+
+include $(MKFILES_ROOT)/qmacros.mk
+
+NAME=dlt-daemon
+
+DIST_BASE=$(PRODUCT_ROOT)/../
+
+#$(INSTALL_ROOT_$(OS)) is pointing to $QNX_TARGET
+#by default, unless it was manually re-routed to
+#a staging area by setting both INSTALL_ROOT_nto
+#and USE_INSTALL_ROOT
+INSTALL_ROOT ?= $(INSTALL_ROOT_$(OS))
+
+#A prefix path to use **on the target**. This is
+#different from INSTALL_ROOT, which refers to a
+#installation destination **on the host machine**.
+#This prefix path may be exposed to the source code,
+#the linker, or package discovery config files (.pc,
+#CMake config modules, etc.). Default is /usr/local
+PREFIX ?= /usr/local
+
+#choose Release or Debug
+CMAKE_BUILD_TYPE ?= Release
+
+#override 'all' target to bypass the default QNX build system
+ALL_DEPENDENCIES = dlt-daemon_all
+.PHONY: dlt-daemon_all install check clean
+
+CFLAGS += $(FLAGS)
+LDFLAGS += -Wl,--build-id=md5 -Wl,--allow-shlib-undefined
+
+include $(MKFILES_ROOT)/qtargets.mk
+
+#Search paths for all of CMake's find_* functions --
+#headers, libraries, etc.
+#
+#$(QNX_TARGET): for architecture-agnostic files shipped with SDP (e.g. headers)
+#$(QNX_TARGET)/$(CPUVARDIR): for architecture-specific files in SDP
+#$(INSTALL_ROOT)/$(CPUVARDIR): any packages that may have been installed in the staging area
+CMAKE_FIND_ROOT_PATH := $(QNX_TARGET);$(QNX_TARGET)/$(CPUVARDIR);$(INSTALL_ROOT)/$(CPUVARDIR)
+
+#Path to CMake modules; These are CMake files installed by other packages
+#for downstreams to discover them automatically. We support discovering
+#CMake-based packages from inside SDP or in the staging area.
+#Note that CMake modules can automatically detect the prefix they are
+#installed in.
+CMAKE_MODULE_PATH := $(QNX_TARGET)/$(CPUVARDIR)/$(PREFIX)/lib/cmake;$(INSTALL_ROOT)/$(CPUVARDIR)/$(PREFIX)/lib/cmake
+
+#Headers from INSTALL_ROOT need to be made available by default
+#because CMake and pkg-config do not necessary add it automatically
+#if the include path is "default"
+CFLAGS += -I$(INSTALL_ROOT)/$(CPUVARDIR)/$(PREFIX)/include
+
+
+CMAKE_ARGS = -DCMAKE_TOOLCHAIN_FILE=$(PROJECT_ROOT)/qnx.nto.toolchain.cmake \
+             -DCMAKE_SYSTEM_PROCESSOR=$(CPUVARDIR) \
+             -DCMAKE_C_FLAGS="$(CFLAGS)" \
+             -DCMAKE_CXX_FLAGS="$(CFLAGS)" \
+             -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+             -DCMAKE_CXX_COMPILER_TARGET=gcc_nto$(CPUVARDIR) \
+             -DCMAKE_C_COMPILER_TARGET=gcc_nto$(CPUVARDIR) \
+             -DCMAKE_INSTALL_PREFIX="$(PREFIX)" \
+             -DCMAKE_STAGING_PREFIX="$(INSTALL_ROOT)/$(CPUVARDIR)/$(PREFIX)" \
+             -DCMAKE_MODULE_PATH="$(CMAKE_MODULE_PATH)" \
+             -DCMAKE_FIND_ROOT_PATH="$(CMAKE_FIND_ROOT_PATH)" \
+             -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
+             -DWITH_DLT_INSTALLED_TESTS=OFF \
+             -DWITH_DLT_UNIT_TESTS=OFF \
+             -DWITH_EXTENDED_FILTERING=ON \
+             -DWITH_DLT_QNX_SYSTEM=ON \
+             -DWITH_DLT_CXX11_EXT=ON \
+             -DDLT_IPC=UNIX_SOCKET \
+             -DWITH_DLT_ADAPTOR=ON \
+             -DWITH_DLT_USE_IPv6=OFF \
+             -DWITH_LIB_SHORT_VERSION=ON
+
+MAKE_ARGS ?= -j $(firstword $(JLEVEL) 1)
+
+ifndef NO_TARGET_OVERRIDE
+dlt-daemon_all:
+	@mkdir -p build
+	cd build && cmake $(CMAKE_ARGS) $(DIST_BASE)
+	@cd build && make VERBOSE=1 all $(MAKE_ARGS)
+
+install check: dlt-daemon_all
+	@echo Installing...
+	@cd build && make VERBOSE=1 install $(MAKE_ARGS)
+	@echo Done.
+
+clean iclean spotless:
+	rm -rf build
+
+uninstall:
+endif
diff --git a/qnx/build/nto-aarch64-le/Makefile b/qnx/build/nto-aarch64-le/Makefile
@@ -0,0 +1 @@
+include ../common.mk
diff --git a/qnx/build/nto-x86_64-o/Makefile b/qnx/build/nto-x86_64-o/Makefile
@@ -0,0 +1 @@
+include ../common.mk
diff --git a/qnx/build/qnx.nto.toolchain.cmake b/qnx/build/qnx.nto.toolchain.cmake
@@ -0,0 +1,5 @@
+set(QNX TRUE)
+set(CMAKE_SYSTEM_NAME QNX)
+set(CMAKE_C_COMPILER qcc)
+set(CMAKE_CXX_COMPILER q++)
+set(CMAKE_CXX_STANDARD 14)
diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c
@@ -848,8 +848,12 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter, const char *filename, int
 
         char app_id[DLT_ID_SIZE];
         char context_id[DLT_ID_SIZE];
+
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wstringop-truncation"
         strncpy(app_id, s_app_id, DLT_ID_SIZE);
         strncpy(context_id, s_context_id, DLT_ID_SIZE);
+        #pragma GCC diagnostic pop
 
         dlt_filter_add(filter, app_id, context_id, log_level, payload_min, payload_max, verbose);
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -6,6 +6,11 @@ configure_file(${PROJECT_SOURCE_DIR}/tests/testfilter.txt ${CMAKE_CURRENT_BINARY
 configure_file(${PROJECT_SOURCE_DIR}/tests/testfile_filetransfer.txt ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
 configure_file(${PROJECT_SOURCE_DIR}/tests/test_dlt.conf ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
 
+if(WITH_DLT_INSTALLED_TESTS)
+    set(DLT_TEST_DIR ${CMAKE_INSTALL_BINDIR}/dlt_tests)
+    install(FILES testfile.dlt testfilter.txt testfile_filetransfer.txt DESTINATION ${DLT_TEST_DIR})
+endif(WITH_DLT_INSTALLED_TESTS)
+
 if("${GTEST_BOTH_LIBRARIES}" STREQUAL "")
     set(GTEST_LIBS gtest gtest_main)
     set(GTEST_LIBS ${GTEST_LIBS} CACHE STRING "Gtest libraries")
@@ -15,6 +20,8 @@ endif()
 
 if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux|CYGWIN")
     set(LIBRARIES "")
+elseif("${CMAKE_SYSTEM_NAME}" MATCHES "QNX")
+    set(LIBRARIES regex)
 else()
     set(LIBRARIES socket)
 endif()
@@ -65,6 +72,12 @@ foreach(target IN LISTS TARGET_LIST)
     endif()
     add_executable(${target} ${target_SRCS})
     target_link_libraries(${target} ${DLT_LIBRARIES})
+    if(WITH_DLT_INSTALLED_TESTS)
+        install(TARGETS ${target} RUNTIME DESTINATION ${DLT_TEST_DIR})
+        if(EXISTS ${PROJECT_SOURCE_DIR}/tests/${target}.sh)
+            install(PROGRAMS ${target}.sh DESTINATION ${DLT_TEST_DIR})
+        endif()
+    endif(WITH_DLT_INSTALLED_TESTS)
     if(EXISTS ${PROJECT_SOURCE_DIR}/tests/${target}.sh)
         configure_file(${PROJECT_SOURCE_DIR}/tests/${target}.sh ${PROJECT_BINARY_DIR}/tests COPYONLY)
         set(CMD_SEQ_SETUP "sh $<TARGET_FILE:${target}>.sh")
@@ -96,6 +109,12 @@ foreach(target IN LISTS TARGET_LIST)
     set(target_SRCS ${target})
     add_executable(${target} ${target_SRCS} ${systemd_SRCS})
     target_link_libraries(${target} ${DLT_DAEMON_LIBRARIES} ${ZLIB_LIBRARY})
+    if(WITH_DLT_INSTALLED_TESTS)
+        install(TARGETS ${target} RUNTIME DESTINATION ${DLT_TEST_DIR})
+        if(EXISTS ${PROJECT_SOURCE_DIR}/tests/${target}.sh)
+            install(PROGRAMS ${target}.sh DESTINATION ${DLT_TEST_DIR})
+        endif()
+    endif(WITH_DLT_INSTALLED_TESTS)
     if(EXISTS ${PROJECT_SOURCE_DIR}/tests/${target}.sh)
         configure_file(${PROJECT_SOURCE_DIR}/tests/${target}.sh ${PROJECT_BINARY_DIR}/tests COPYONLY)
         set(CMD_SEQ_SETUP "sh $<TARGET_FILE:${target}>.sh")
@@ -120,6 +139,10 @@ if(WITH_EXTENDED_FILTERING)
     configure_file(${PROJECT_SOURCE_DIR}/tests/testfilter.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
     add_executable(gtest_dlt_json_filter gtest_dlt_json_filter.cpp)
     target_link_libraries(gtest_dlt_json_filter ${DLT_CONTROL_LIBRARIES})
+    if(WITH_DLT_INSTALLED_TESTS)
+        install(FILES testfile_extended.dlt testfilter.json DESTINATION ${DLT_TEST_DIR})
+        install(TARGETS gtest_dlt_json_filter RUNTIME DESTINATION ${DLT_TEST_DIR})
+    endif(WITH_DLT_INSTALLED_TESTS)
     add_test(NAME gtest_dlt_json_filter COMMAND gtest_dlt_json_filter)
     set_tests_properties(${target} PROPERTIES TIMEOUT "${seconds}")
 endif()

diff --git a/tests/components/logd-converter/CMakeLists.txt b/tests/components/logd-converter/CMakeLists.txt
@@ -12,6 +12,11 @@ set(gtest_dlt_logd_converter_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gtest_dlt_logd_conv
 add_executable(gtest_dlt_logd_converter ${dlt_logd_converter_SRC} ${gtest_dlt_logd_converter_SRC})
 target_link_libraries(gtest_dlt_logd_converter ${DLT_LIBRARIES})
 
+if(WITH_DLT_INSTALLED_TESTS)
+    install(TARGETS gtest_dlt_logd_converter RUNTIME DESTINATION ${DLT_TEST_DIR}/components/logd-converter)
+    install(FILES dlt-logd-converter.conf dlt-logdctxt.json abnormal-dlt-logd-converter.conf DESTINATION ${DLT_TEST_DIR}/components/logd-converter)
+endif(WITH_DLT_INSTALLED_TESTS)
+
 add_test(NAME gtest_dlt_logd_converter
         COMMAND /bin/sh -e -c "\
                 $<TARGET_FILE:dlt-daemon> &

diff --git a/tests/components/logstorage/disable_network/CMakeLists.txt b/tests/components/logstorage/disable_network/CMakeLists.txt
@@ -6,6 +6,11 @@ target_link_libraries(${NAME} PRIVATE dlt)
 
 set(APPID "DSNW")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dlt.conf)
+if(WITH_DLT_INSTALLED_TESTS)
+    install(TARGETS ${NAME} RUNTIME DESTINATION ${DLT_TEST_DIR}/components/logstorage/disable_network)
+    install(FILES dlt.conf.in DESTINATION ${DLT_TEST_DIR}/components/logstorage/disable_network RENAME dlt.conf)
+    install(FILES dlt_logstorage.conf DESTINATION ${DLT_TEST_DIR}/components/logstorage/disable_network)
+endif(WITH_DLT_INSTALLED_TESTS)
 
 add_test(NAME ${NAME} COMMAND /bin/sh -e -c "\
 if [ ${CMAKE_CURRENT_SOURCE_DIR} != ${CMAKE_CURRENT_BINARY_DIR} ];

diff --git a/tests/components/logstorage/logstorage_filepath/CMakeLists.txt b/tests/components/logstorage/logstorage_filepath/CMakeLists.txt
@@ -6,6 +6,11 @@ target_link_libraries(${NAME} PRIVATE dlt)
 
 set(CTXNUM 2)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dlt.conf)
+if(WITH_DLT_INSTALLED_TESTS)
+    install(TARGETS ${NAME} RUNTIME DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_filepath)
+    install(FILES dlt.conf.in DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_filepath RENAME dlt.conf)
+    install(FILES dlt_logstorage.conf DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_filepath)
+endif(WITH_DLT_INSTALLED_TESTS)
 
 add_test(NAME ${NAME} COMMAND /bin/sh -e -c "\
 if [ ${CMAKE_CURRENT_SOURCE_DIR} != ${CMAKE_CURRENT_BINARY_DIR} ];

diff --git a/tests/components/logstorage/logstorage_fsync/CMakeLists.txt b/tests/components/logstorage/logstorage_fsync/CMakeLists.txt
@@ -14,6 +14,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dlt_logstorage.conf ${CMAKE_CURRENT_B
 
 set(APPID "FSNC")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dlt.conf)
+if(WITH_DLT_INSTALLED_TESTS)
+    install(TARGETS ${NAME} RUNTIME DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_fsync)
+    install(FILES dlt.conf.in DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_fsync RENAME dlt.conf)
+    install(FILES dlt_logstorage.conf DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_fsync)
+endif(WITH_DLT_INSTALLED_TESTS)
 
 add_test(NAME ${NAME} COMMAND /bin/sh -e -c "\
 rm -f ${CMAKE_CURRENT_BINARY_DIR}/${APPID}*.dlt

diff --git a/tests/components/logstorage/logstorage_max_cache_size/CMakeLists.txt b/tests/components/logstorage/logstorage_max_cache_size/CMakeLists.txt
@@ -4,6 +4,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf.in ${CMAKE_CURRENT_BINARY_DI
 add_executable(${NAME} ${NAME}.cpp)
 target_include_directories(${NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include/)
 target_link_libraries(${NAME} PRIVATE dlt)
+if(WITH_DLT_INSTALLED_TESTS)
+    install(TARGETS ${NAME} RUNTIME DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_max_cache_size)
+    install(FILES dlt.conf.in DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_max_cache_size RENAME dlt.conf)
+    install(FILES dlt_logstorage.conf DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_max_cache_size)
+endif(WITH_DLT_INSTALLED_TESTS)
 
 add_test(NAME ${NAME} COMMAND /bin/sh -e -c "
 if [ ${CMAKE_CURRENT_SOURCE_DIR} != ${CMAKE_CURRENT_BINARY_DIR} ];

diff --git a/tests/components/logstorage/logstorage_multi_file/CMakeLists.txt b/tests/components/logstorage/logstorage_multi_file/CMakeLists.txt
@@ -6,6 +6,11 @@ target_link_libraries(${NAME} PRIVATE dlt)
 
 set(CTXNUM 12)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dlt.conf)
+if(WITH_DLT_INSTALLED_TESTS)
+    install(TARGETS ${NAME} RUNTIME DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_multi_file)
+    install(FILES dlt.conf.in DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_multi_file RENAME dlt.conf)
+    install(FILES dlt_logstorage.conf DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_multi_file)
+endif(WITH_DLT_INSTALLED_TESTS)
 
 add_test(NAME ${NAME} COMMAND /bin/sh -e -c "\
 if [ ${CMAKE_CURRENT_SOURCE_DIR} != ${CMAKE_CURRENT_BINARY_DIR} ];

diff --git a/tests/components/logstorage/logstorage_one_file/CMakeLists.txt b/tests/components/logstorage/logstorage_one_file/CMakeLists.txt
@@ -7,6 +7,11 @@ target_link_libraries(${NAME} PRIVATE dlt)
 
 set(CTXNUM 12)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dlt.conf)
+if(WITH_DLT_INSTALLED_TESTS)
+    install(TARGETS ${NAME} RUNTIME DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_one_file)
+    install(FILES dlt.conf.in DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_one_file RENAME dlt.conf)
+    install(FILES dlt_logstorage.conf DESTINATION ${DLT_TEST_DIR}/components/logstorage/logstorage_one_file)
+endif(WITH_DLT_INSTALLED_TESTS)
 
 add_test(NAME ${NAME} COMMAND /bin/sh -e -c "\
 if [ ${CMAKE_CURRENT_SOURCE_DIR} != ${CMAKE_CURRENT_BINARY_DIR} ];