~charlesk/indicator-datetime/lp-1591246-fix-message-icons

Committer: CI Train Bot
Author(s): Charles Kerr
Date: 2016-01-29 18:53:43 UTC
mfrom: (424.1.20 15.10-lp-1505688-different-default-sounds-for-alarms-and-events)
Revision ID: ci-train-bot@canonical.com-20160129185343-059van0q2sf7cpuk

Use a different default sound for alarms and calendar events. Fixes: #1505688
Approved by: Antti Kaijanmäki, Rodney Dawes, PS Jenkins bot

files renamed:
data/com.canonical.indicator.datetime.gschema.xml.in => data/com.canonical.indicator.datetime.gschema.xml.in.in

tests/test-eds-ics-all-day-events.ics => tests/test-eds-ics-all-day-events.ics.in

tests/test-eds-ics-missing-trigger.ics => tests/test-eds-ics-missing-trigger.ics.in

tests/test-eds-ics-nonrepeating-events.ics => tests/test-eds-ics-nonrepeating-events.ics.in

tests/test-eds-ics-repeating-events.ics => tests/test-eds-ics-repeating-events.ics.in

tests/test-eds-ics-repeating-valarms.ics => tests/test-eds-ics-repeating-valarms.ics.in

added added

removed removed

function(add_eds_ics_test_by_name name)

set (TEST_NAME ${name})

configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics.in"

"${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.ics")

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_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

${CMAKE_CURRENT_BINARY_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)