diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-06-24 12:51:24 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-06-24 12:51:24 +0000 |
| commit | 519cb05c9023374033bf1bc37891480081880d56 (patch) | |
| tree | 56ceff89fbb6953f85f5f38a2ef212f85434f0d8 /tests/CMakeLists.txt | |
| parent | 7468f3f28c25c994549fd925f60b9fc13b8837fd (diff) | |
| parent | 8bd6bf4dbb9072a33d3f5d91cbffd1fd8172fcf3 (diff) | |
| download | ayatana-indicator-datetime-519cb05c9023374033bf1bc37891480081880d56.tar.gz ayatana-indicator-datetime-519cb05c9023374033bf1bc37891480081880d56.tar.bz2 ayatana-indicator-datetime-519cb05c9023374033bf1bc37891480081880d56.zip | |
Speedups/cleanups to the EDS regression tests
Approved by: Pete Woods, PS Jenkins bot
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 123aa9a..f3ee612 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,15 +77,11 @@ 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) |