aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-05-04 16:10:41 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-05-04 16:10:41 +0200
commit09c1a589f6936c8b08c76d5f822af592b3363722 (patch)
treefbda6483952997b1d30640404a3f23cfbb9a4f6c
parent0a3f7f64748886969d215741dcf23fe7bc8a99a4 (diff)
downloadayatana-indicator-session-09c1a589f6936c8b08c76d5f822af592b3363722.tar.gz
ayatana-indicator-session-09c1a589f6936c8b08c76d5f822af592b3363722.tar.bz2
ayatana-indicator-session-09c1a589f6936c8b08c76d5f822af592b3363722.zip
.travis.yml: Don't try running autotools based CI build.
-rw-r--r--.travis.yml2
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/backend-dbus/CMakeLists.txt3
3 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2efd2f4..5382638 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ install:
- ./docker-build --name ${DISTRO} --config .build.yml --install
script:
- - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts --build autotools
+ - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts
env:
# temp disable of archlinux builds, see https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/56
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2b4bdcc..4bd5a8a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,6 +3,8 @@ set_directory_properties (PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled)
set_source_files_properties (gschemas.compiled GENERATED)
+SET(COVERAGE_TEST_TARGETS "")
+
# GSettings:
# compile the schemas our tests use (ayatana-indicator-session's, lockdown, media-keys)
# into a gschemas.compiled file in this directory, and help the tests to find
@@ -53,4 +55,6 @@ add_test (test-service test-service)
add_dependencies (test-service libayatanaindicatorsessionservice backendmock gschemas-compiled)
target_link_libraries (test-service libayatanaindicatorsessionservice backendmock gtest ${SERVICE_LIBRARIES} ${GTEST_LIBS})
+SET(COVERAGE_TEST_TARGETS "${COVERAGE_TEST_TARGETS} test-service")
+
add_subdirectory (backend-dbus)
diff --git a/tests/backend-dbus/CMakeLists.txt b/tests/backend-dbus/CMakeLists.txt
index 5a218f8..83c0886 100644
--- a/tests/backend-dbus/CMakeLists.txt
+++ b/tests/backend-dbus/CMakeLists.txt
@@ -45,6 +45,7 @@ add_executable (test-actions
add_test (test-actions test-actions)
set_tests_properties (test-actions PROPERTIES COMPILE_FLAGS "${SERVICE_CFLAGS}")
target_link_libraries (test-actions desktopmock backenddbus libayatanaindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
+SET(COVERAGE_TEST_TARGETS "${COVERAGE_TEST_TARGETS} test-actions")
# test the Guest class
add_executable (test-guest
@@ -52,6 +53,7 @@ add_executable (test-guest
add_test (test-guest test-guest)
set_tests_properties (test-guest PROPERTIES COMPILE_FLAGS "${SERVICE_CFLAGS}")
target_link_libraries (test-guest desktopmock backenddbus libayatanaindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
+SET(COVERAGE_TEST_TARGETS "${COVERAGE_TEST_TARGETS} test-guest")
# test the Users class
add_executable (test-users
@@ -59,3 +61,4 @@ add_executable (test-users
add_test (test-users test-users)
set_tests_properties (test-users PROPERTIES COMPILE_FLAGS "${SERVICE_CFLAGS}")
target_link_libraries (test-users desktopmock backenddbus libayatanaindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
+SET(COVERAGE_TEST_TARGETS "${COVERAGE_TEST_TARGETS} test-users")