diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2015-07-10 20:35:44 +0000 |
---|---|---|
committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-07-10 20:35:44 +0000 |
commit | 71413be3863a31c33b32063b9c359b1e0e079796 (patch) | |
tree | 2dd6aca1fb4adf218244b5237a89ec6cb37d255f /tests/CMakeLists.txt | |
parent | e1205e09efa7bed564d1d1a1e8c5951c7984ea85 (diff) | |
parent | 29a6bc36dbb00ec3378d7df895bf20d7ec0767a9 (diff) | |
download | ayatana-indicator-datetime-71413be3863a31c33b32063b9c359b1e0e079796.tar.gz ayatana-indicator-datetime-71413be3863a31c33b32063b9c359b1e0e079796.tar.bz2 ayatana-indicator-datetime-71413be3863a31c33b32063b9c359b1e0e079796.zip |
Get icaltimezone structures from EDS rather than assuming the tzid will always be GTimeZone friendly. Fixes: #1473068
Approved by: Rodney Dawes, PS Jenkins bot, Charles Kerr, Antti Kaijanmäki
Diffstat (limited to 'tests/CMakeLists.txt')
-rw-r--r-- | tests/CMakeLists.txt | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 123aa9a..9d26484 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -70,13 +70,6 @@ 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.Sources3") -endif() function(add_eds_ics_test_by_name name) set (TEST_NAME ${name}) @@ -84,21 +77,19 @@ function(add_eds_ics_test_by_name name) target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) add_test (${TEST_NAME} ${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-eds-ics-config-files # arg8: base directory for config file template - ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics) # arg9: the ical file for this test + ${DBUS_RUNNER} # arg1: dbus-test-runner exec + ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} # arg2: test executable path + ${TEST_NAME} # arg3: test name + ${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_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) +add_eds_ics_test_by_name(test-eds-ics-tzids) +add_eds_ics_test_by_name(test-eds-ics-tzids-2) # disabling the timezone unit tests because they require |