diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-03-19 15:44:26 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-03-19 15:44:26 +0000 |
| commit | 799600b9c7576f7ad22f50bf3012a289c8243c4f (patch) | |
| tree | f41ceba28cecd7e484a2014aa214eafca42614a8 | |
| parent | 72cdbb73d092de176fed47508f108fed8d4627c6 (diff) | |
Make activation for tests work like our real activation setupactivation2
5 files changed, 11 insertions, 2 deletions
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am index ffe04eff..48cb55b8 100644 --- a/tests/twisted/tools/Makefile.am +++ b/tests/twisted/tools/Makefile.am @@ -48,15 +48,18 @@ servicedir-installed/org.freedesktop.Telepathy.%.service: servicedir-installed/% $(AM_V_at)$(mkdir_p) servicedir-installed $(AM_V_GEN)sed \ -e "s|[@]mctestsdir[@]|@mctestsdir@|g" \ + -e "s|[@]bindir[@]|@bindir@|g" \ $< > $@ # D-Bus service file for testing uninstalled_service_in_files = \ + servicedir-uninstalled/AccountManager.service.in \ servicedir-uninstalled/MissionControl5.service.in \ servicedir-uninstalled/Client.AbiWord.service.in \ servicedir-uninstalled/Client.Logger.service.in uninstalled_service_files = $(patsubst servicedir-uninstalled/%.in,servicedir-uninstalled/org.freedesktop.Telepathy.%, $(uninstalled_service_in_files)) installed_service_in_files = \ + servicedir-installed/AccountManager.service.in \ servicedir-installed/MissionControl5.service.in \ servicedir-installed/Client.AbiWord.service.in \ servicedir-installed/Client.Logger.service.in diff --git a/tests/twisted/tools/servicedir-installed/AccountManager.service.in b/tests/twisted/tools/servicedir-installed/AccountManager.service.in new file mode 100644 index 00000000..7d68efe5 --- /dev/null +++ b/tests/twisted/tools/servicedir-installed/AccountManager.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.Telepathy.AccountManager +Exec=@mctestsdir@/twisted/tools/run-mc.sh diff --git a/tests/twisted/tools/servicedir-installed/MissionControl5.service.in b/tests/twisted/tools/servicedir-installed/MissionControl5.service.in index db016b11..51f4dc17 100644 --- a/tests/twisted/tools/servicedir-installed/MissionControl5.service.in +++ b/tests/twisted/tools/servicedir-installed/MissionControl5.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.MissionControl5 -Exec=@mctestsdir@/twisted/tools/run-mc.sh +Exec=@bindir@/mc-wait-for-name --activate org.freedesktop.Telepathy.AccountManager org.freedesktop.Telepathy.MissionControl5 diff --git a/tests/twisted/tools/servicedir-uninstalled/AccountManager.service.in b/tests/twisted/tools/servicedir-uninstalled/AccountManager.service.in new file mode 100644 index 00000000..d1923c3b --- /dev/null +++ b/tests/twisted/tools/servicedir-uninstalled/AccountManager.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.Telepathy.AccountManager +Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh diff --git a/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in b/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in index e8f41c41..881f21a6 100644 --- a/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in +++ b/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.MissionControl5 -Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh +Exec=@abs_top_builddir@/util/mc-wait-for-name --activate org.freedesktop.Telepathy.AccountManager org.freedesktop.Telepathy.MissionControl5 |