diff options
Diffstat (limited to 'tests/twisted/tools')
| -rw-r--r-- | tests/twisted/tools/Makefile.am | 71 | ||||
| -rwxr-xr-x | tests/twisted/tools/run-mc.sh.in | 5 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in | 3 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-installed/Client.Logger.service.in | 3 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-installed/MissionControl5.service.in | 3 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-installed/tmp-session-bus.conf.in (renamed from tests/twisted/tools/tmp-session-bus.conf.in) | 2 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in (renamed from tests/twisted/tools/Client.AbiWord.service.in) | 0 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in (renamed from tests/twisted/tools/Client.Logger.service.in) | 0 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in (renamed from tests/twisted/tools/MissionControl5.service.in) | 0 | ||||
| -rw-r--r-- | tests/twisted/tools/servicedir-uninstalled/tmp-session-bus.conf.in | 30 |
10 files changed, 106 insertions, 11 deletions
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am index 463a5b81..ffe04eff 100644 --- a/tests/twisted/tools/Makefile.am +++ b/tests/twisted/tools/Makefile.am @@ -1,38 +1,89 @@ +if ENABLE_INSTALLED_TESTS +twistedtestsdir = @mctestsdir@/twisted/tools +nobase_nodist_twistedtests_SCRIPTS = \ + run-mc.sh \ + fake-startup.sh \ + $(NULL) +nobase_dist_twistedtests_SCRIPTS = \ + with-session-bus.sh \ + $(NULL) +nobase_nodist_twistedtests_DATA = \ + $(installed_conf_files) \ + $(installed_service_files) \ + $(NULL) +endif + exec-with-log.sh: exec-with-log.sh.in Makefile $(AM_V_GEN)sed -e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \ -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \ $< > $@ $(AM_V_at)chmod +x $@ -%.conf: %.conf.in +run-mc.sh: run-mc.sh.in Makefile + $(AM_V_GEN)sed \ + -e "s|[@]mctestsdir[@]|@mctestsdir@|g" \ + -e "s|[@]libexecdir[@]|$(libexecdir)|g" \ + $< > $@ + @chmod +x $@ + +servicedir-uninstalled/%.conf: servicedir-uninstalled/%.conf.in Makefile + $(AM_V_at)$(mkdir_p) servicedir-uninstalled $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ +servicedir-installed/%.conf: servicedir-installed/%.conf.in Makefile + $(AM_V_at)$(mkdir_p) servicedir-installed + $(AM_V_GEN)sed -e "s|[@]mctestsdir[@]|@mctestsdir@|g" $< > $@ + # We don't use the full filename for the .in because > 99 character filenames # in tarballs are non-portable (and automake 1.8 doesn't let us build # non-archaic tarballs) -org.freedesktop.Telepathy.%.service: %.service.in +servicedir-uninstalled/org.freedesktop.Telepathy.%.service: servicedir-uninstalled/%.service.in Makefile + $(AM_V_at)$(mkdir_p) servicedir-uninstalled $(AM_V_GEN)sed \ -e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \ -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \ $< > $@ +servicedir-installed/org.freedesktop.Telepathy.%.service: servicedir-installed/%.service.in Makefile + $(AM_V_at)$(mkdir_p) servicedir-installed + $(AM_V_GEN)sed \ + -e "s|[@]mctestsdir[@]|@mctestsdir@|g" \ + $< > $@ + # D-Bus service file for testing -service_in_files = MissionControl5.service.in Client.AbiWord.service.in Client.Logger.service.in -service_files = $(patsubst %.in,org.freedesktop.Telepathy.%, $(service_in_files)) +uninstalled_service_in_files = \ + 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/MissionControl5.service.in \ + servicedir-installed/Client.AbiWord.service.in \ + servicedir-installed/Client.Logger.service.in +installed_service_files = $(patsubst servicedir-installed/%.in,servicedir-installed/org.freedesktop.Telepathy.%, $(installed_service_in_files)) # D-Bus config file for testing -conf_in_files = tmp-session-bus.conf.in -conf_files = $(conf_in_files:.conf.in=.conf) +uninstalled_conf_in_files = servicedir-uninstalled/tmp-session-bus.conf.in +uninstalled_conf_files = $(uninstalled_conf_in_files:.conf.in=.conf) +installed_conf_in_files = servicedir-installed/tmp-session-bus.conf.in +installed_conf_files = $(installed_conf_in_files:.conf.in=.conf) -BUILT_SOURCES = $(service_files) $(conf_files) exec-with-log.sh +BUILT_SOURCES = \ + $(uninstalled_service_files) $(uninstalled_conf_files) \ + $(installed_service_files) $(installed_conf_files) \ + exec-with-log.sh EXTRA_DIST = \ - $(service_in_files) \ - $(conf_in_files) \ + $(uninstalled_service_in_files) \ + $(uninstalled_conf_in_files) \ + $(installed_service_in_files) \ + $(installed_conf_in_files) \ exec-with-log.sh.in \ fake-startup.sh \ valgrind.supp \ - with-session-bus.sh + with-session-bus.sh \ + run-mc.sh.in \ + $(NULL) CLEANFILES = \ $(BUILT_SOURCES) \ diff --git a/tests/twisted/tools/run-mc.sh.in b/tests/twisted/tools/run-mc.sh.in new file mode 100755 index 00000000..458a4611 --- /dev/null +++ b/tests/twisted/tools/run-mc.sh.in @@ -0,0 +1,5 @@ +#!/bin/sh + +ulimit -c unlimited + +@libexecdir@/mission-control-5 diff --git a/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in b/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in new file mode 100644 index 00000000..219461ee --- /dev/null +++ b/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.Telepathy.Client.AbiWord +Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.AbiWord diff --git a/tests/twisted/tools/servicedir-installed/Client.Logger.service.in b/tests/twisted/tools/servicedir-installed/Client.Logger.service.in new file mode 100644 index 00000000..67f07942 --- /dev/null +++ b/tests/twisted/tools/servicedir-installed/Client.Logger.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.Telepathy.Client.Logger +Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.Logger diff --git a/tests/twisted/tools/servicedir-installed/MissionControl5.service.in b/tests/twisted/tools/servicedir-installed/MissionControl5.service.in new file mode 100644 index 00000000..db016b11 --- /dev/null +++ b/tests/twisted/tools/servicedir-installed/MissionControl5.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.Telepathy.MissionControl5 +Exec=@mctestsdir@/twisted/tools/run-mc.sh diff --git a/tests/twisted/tools/tmp-session-bus.conf.in b/tests/twisted/tools/servicedir-installed/tmp-session-bus.conf.in index 84d8d656..d3a71d82 100644 --- a/tests/twisted/tools/tmp-session-bus.conf.in +++ b/tests/twisted/tools/servicedir-installed/tmp-session-bus.conf.in @@ -10,7 +10,7 @@ <listen>unix:tmpdir=/tmp</listen> - <servicedir>@abs_top_builddir@/tests/twisted/tools</servicedir> + <servicedir>@mctestsdir@/twisted/tools/servicedir-installed</servicedir> <policy context="default"> <!-- Allow everything to be sent --> diff --git a/tests/twisted/tools/Client.AbiWord.service.in b/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in index 300bd5b0..300bd5b0 100644 --- a/tests/twisted/tools/Client.AbiWord.service.in +++ b/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in diff --git a/tests/twisted/tools/Client.Logger.service.in b/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in index 9fd4bfb1..9fd4bfb1 100644 --- a/tests/twisted/tools/Client.Logger.service.in +++ b/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in diff --git a/tests/twisted/tools/MissionControl5.service.in b/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in index e8f41c41..e8f41c41 100644 --- a/tests/twisted/tools/MissionControl5.service.in +++ b/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in diff --git a/tests/twisted/tools/servicedir-uninstalled/tmp-session-bus.conf.in b/tests/twisted/tools/servicedir-uninstalled/tmp-session-bus.conf.in new file mode 100644 index 00000000..404484f2 --- /dev/null +++ b/tests/twisted/tools/servicedir-uninstalled/tmp-session-bus.conf.in @@ -0,0 +1,30 @@ +<!-- This configuration file controls the per-user-login-session message bus. + Add a session-local.conf and edit that rather than changing this + file directly. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, don't change this --> + <type>session</type> + + <listen>unix:tmpdir=/tmp</listen> + + <servicedir>@abs_top_builddir@/tests/twisted/tools/servicedir-uninstalled</servicedir> + + <policy context="default"> + <!-- Allow everything to be sent --> + <allow send_destination="*" eavesdrop="true"/> + <!-- Allow everything to be received --> + <allow eavesdrop="true"/> + <!-- Allow anyone to own anything --> + <allow own="*"/> + </policy> + + <!-- This is included last so local configuration can override what's + in this standard file --> + + + + +</busconfig> |