summaryrefslogtreecommitdiff
path: root/test/session.conf.in
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2012-11-22 14:35:04 +0100
committerMartin Pitt <martinpitt@gnome.org>2012-11-26 09:45:57 +0100
commit8ed2757a7e3bd396a50e866b0e8fcba83e1df510 (patch)
treee1084b31edaf063f7567c2615033288479a3aae8 /test/session.conf.in
parent8cae7af51bc7dacf6a196b95ba81a6a9886e7749 (diff)
downloadgvfs-8ed2757a7e3bd396a50e866b0e8fcba83e1df510.tar.gz
tests/run-in-tree.sh: Disable service activation for local D-BUS
This tries to spawn gnome-keyring which can potentially mess up user's real keyrings. It also causes long timeouts during D-BUS activation which make the testsuite painfully slow.
Diffstat (limited to 'test/session.conf.in')
-rw-r--r--test/session.conf.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/session.conf.in b/test/session.conf.in
index 611811f3..eaf50e8e 100644
--- a/test/session.conf.in
+++ b/test/session.conf.in
@@ -12,7 +12,10 @@
<servicedir>@testdir@</servicedir>
- <standard_session_servicedirs />
+ <!-- disabled for now; this causes gnome-keyring to be spawned, which can
+ interfere with user's real keyrings, as well as causing long delays
+ during D-BUS activation -->
+ <!-- <standard_session_servicedirs /> -->
<policy context="default">
<!-- Allow everything to be sent -->