diff options
author | Iain Lane <iain.lane@canonical.com> | 2015-07-20 17:31:28 +0100 |
---|---|---|
committer | Iain Lane <iain.lane@canonical.com> | 2015-07-20 17:31:28 +0100 |
commit | a0335176ab4104b7e0fbb5ecc19ca42dea0a3900 (patch) | |
tree | bc0272aec332841b5d6c7f94928a3d5434254a73 /tests/CMakeLists.txt | |
parent | 813f10d40c13d1780411c08b5fd72aea81072194 (diff) | |
parent | 074bee9fbc895b436639010e91a6d1e1ecbee6cb (diff) | |
download | ayatana-indicator-datetime-a0335176ab4104b7e0fbb5ecc19ca42dea0a3900.tar.gz ayatana-indicator-datetime-a0335176ab4104b7e0fbb5ecc19ca42dea0a3900.tar.bz2 ayatana-indicator-datetime-a0335176ab4104b7e0fbb5ecc19ca42dea0a3900.zip |
merge trunk, no need to give dbus names any more
Diffstat (limited to 'tests/CMakeLists.txt')
-rw-r--r-- | tests/CMakeLists.txt | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1332529..f3ee612 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -70,32 +70,24 @@ target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${SERVICE_DEP ## find_program(DBUS_RUNNER dbus-test-runner) -find_program(EVOLUTION_CALENDAR_FACTORY evolution-calendar-factory PATHS /usr/lib/evolution/) -find_program(EVOLUTION_SOURCE_REGISTRY evolution-source-registry PATHS /usr/lib/evolution/) -find_program(GVFSD gvfsd PATHS /usr/lib/gvfs/) -OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry") -if(NOT EVOLUTION_SOURCE_SERVICE_NAME) - set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4") -endif() -function(add_eds_test_by_name name) +function(add_eds_ics_test_by_name name) set (TEST_NAME ${name}) add_executable(${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled) target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) add_test (${TEST_NAME} - ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-test.sh + ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-ics-test.sh ${DBUS_RUNNER} # arg1: dbus-test-runner exec ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} # arg2: test executable path ${TEST_NAME} # arg3: test name - ${EVOLUTION_CALENDAR_FACTORY} # arg4: evolution-calendar-factory exec - ${EVOLUTION_SOURCE_SERVICE_NAME} # arg5: dbus name for source registry - ${EVOLUTION_SOURCE_REGISTRY} # arg6: evolution-source-registry exec - ${GVFSD} # arg7: gvfsd exec - ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}-config-files) # arg8: canned config files + ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files # arg4: base directory for config file template + ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics) # arg5: the ical file for this test endfunction() -add_eds_test_by_name(test-eds-valarms) - - +add_eds_ics_test_by_name(test-eds-ics-all-day-events) +add_eds_ics_test_by_name(test-eds-ics-repeating-events) +add_eds_ics_test_by_name(test-eds-ics-nonrepeating-events) +add_eds_ics_test_by_name(test-eds-ics-repeating-valarms) +add_eds_ics_test_by_name(test-eds-ics-missing-trigger) # disabling the timezone unit tests because they require |