Start eds source-registry and addressbook-factory ourselves.

diff --git a/tests/tools/eds.sh b/tests/tools/eds.sh
index e80a93f..e0fc45e 100644 (file)
--- a/tests/tools/eds.sh
+++ b/tests/tools/eds.sh
@@ -10,6 +10,7 @@
 # notice and this notice are preserved.
 
 eds_tmpdir=$(mktemp -d)
+libexec=$(pkg-config --variable=libexecdir evolution-data-server-1.2)
 
 cur_dir=`dirname $0`
 
@@ -22,6 +23,11 @@ eds_init_settings () {
     cp $cur_dir/other.source $XDG_CONFIG_HOME/evolution/sources/
 }
 
+eds_start () {
+    $libexec/evolution-source-registry > /dev/null &
+    $libexec/evolution-addressbook-factory --wait-for-client > /dev/null &
+}
+
 # This should be called on INT TERM and EXIT
 eds_stop () {
     rm -rf $eds_tmpdir

diff --git a/tests/tools/with-session-bus-eds.sh b/tests/tools/with-session-bus-eds.sh
index e525346..ed0244d 100755 (executable)
--- a/tests/tools/with-session-bus-eds.sh
+++ b/tests/tools/with-session-bus-eds.sh
@@ -38,6 +38,7 @@ eds_init_settings
 dbus_init 0
 
 dbus_start
+eds_start
 
 e=0
 "$@" || e=$?