summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Laban <david.laban@collabora.co.uk>2009-11-24 16:56:56 +0000
committerDavid Laban <david.laban@collabora.co.uk>2009-12-02 18:02:35 +0000
commitdc2141ffcbe75b676794578b50b476e7e7c89704 (patch)
tree307e10bde0337ac0fbdf2311868a0cafd5f57961 /.gitignore
parent0d39564bdd5ec4fe83dd6e92203dbe9f063c70a8 (diff)
downloadtelepathy-glib-dc2141ffcbe75b676794578b50b476e7e7c89704.tar.gz
Don't let MC5 activate itself during AM tests.
This sets up dbus to use a session.conf which doesn't include the standard services. This is the same trick that gabble's twisted tests use. I'm not really sure whether tests/dbus/dbus-1/session.conf.in is the best place to put the new file. If anyone thinks there is a better place for it, shout.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f5e676da5..f14a25008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@ missing
stamp-h1
tags
/telepathy-glib-0.7.*
+tests/dbus/dbus-1/session.conf
tests/dbus/test-*
tests/test-*
tests/tools/actual.h