summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Popek <jiri.popek@gmail.com>2019-02-02 23:03:37 +0100
committerChristoph Lipka <clipka@users.noreply.github.com>2019-02-02 23:03:37 +0100
commit892325dbc0983a18d5d16a10faefc0e982bf9660 (patch)
treeafa2fd901f9d78e1f22410b6c3f47cdf3d3b0a12
parent034ad4fcab798fb746823cd75d1e55535327a0c5 (diff)
downloadDLT-daemon-892325dbc0983a18d5d16a10faefc0e982bf9660.tar.gz
Travis CI: build with systemd enabled (#97)
* Travis CI: build with systemd enabled * fix the 'sd_booted' linker issue
-rw-r--r--.travis.yml5
-rw-r--r--tests/CMakeLists.txt4
2 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 198c42d..82f9c3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: c
compiler: gcc
-script: cmake -DWITH_DLTTEST=on -DWITH_TEST_SCRIPTS=on -DWITH_DLT_UNIT_TEST=on CMakeLists.txt && make && ./src/tests/dlt-test-user
+script: cmake -DWITH_DLT_TESTS=ON -DWITH_TESTSCRIPTS=ON -DWITH_DLT_UNIT_TESTS=ON -DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON CMakeLists.txt && make && ./src/tests/dlt-test-user
addons:
apt:
@@ -11,3 +11,6 @@ addons:
- cmake
- libdbus-1-dev
- build-essential
+ - systemd
+ - libsystemd-daemon-dev
+ - libsystemd-journal-dev
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 50cca4f..56a21b7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -20,6 +20,10 @@ endif()
set(DLT_LIBRARIES ${LIBRARIES} dlt)
set(DLT_DAEMON_LIBRARIES ${LIBRARIES} dlt_daemon)
+if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG)
+ set(DLT_DAEMON_LIBRARIES ${DLT_DAEMON_LIBRARIES} systemd)
+endif()
+
add_executable(gtest_dlt_common gtest_dlt_common.cpp)
add_executable(gtest_dlt_user gtest_dlt_user.cpp)
add_executable(gtest_dlt_daemon_common gtest_dlt_daemon_common.cpp ../src/daemon/dlt_daemon_common.c)