[Telepathy-commits] [telepathy-mission-control/master] Override .manager, .client search path using XDG_DATA_HOME, XDG_DATA_DIRS

[Simon McVittie]

MC now searches for connection manager cached info using telepathy-glib,
which does not respect the old MC-specific hooks to divert the search path
into different directories.

To implement this, the support files in test/twisted need to be moved
into a telepathy subdirectory.
---
 test/twisted/Makefile.am                       |    3 +++
 test/twisted/clients/README                    |    4 ----
 test/twisted/managers/README                   |    4 ----
 test/twisted/managers/fakecm.manager           |    7 -------
 test/twisted/telepathy/clients/README          |    4 ++++
 test/twisted/telepathy/managers/README         |    4 ++++
 test/twisted/telepathy/managers/fakecm.manager |    7 +++++++
 test/twisted/tools/exec-with-log.sh.in         |    9 +++++++--
 8 files changed, 25 insertions(+), 17 deletions(-)
 delete mode 100644 test/twisted/clients/README
 delete mode 100644 test/twisted/managers/README
 delete mode 100644 test/twisted/managers/fakecm.manager
 create mode 100644 test/twisted/telepathy/clients/README
 create mode 100644 test/twisted/telepathy/managers/README
 create mode 100644 test/twisted/telepathy/managers/fakecm.manager

diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index ecf4fb8..d002005 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -28,6 +28,9 @@ check-twisted:
 
 EXTRA_DIST = \
 	$(TWISTED_BASIC_TESTS) \
+	telepathy/clients/README \
+	telepathy/managers/fakecm.manager \
+	telepathy/managers/README \
         fakeclient.py \
         fakecm.py \
 	mctest.py \
diff --git a/test/twisted/clients/README b/test/twisted/clients/README
deleted file mode 100644
index 7b725bf..0000000
--- a/test/twisted/clients/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains .clients files used by Mission Control when it is run
-by twisted test. $MC_CLIENTS_DIR is set to this directory in the twisted
-environment.
-
diff --git a/test/twisted/managers/README b/test/twisted/managers/README
deleted file mode 100644
index d77437c..0000000
--- a/test/twisted/managers/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains .manager files used by Mission Control when it is run
-by twisted test. $MC_MANAGER_DIR is set to this directory in the twisted
-environment.
-
diff --git a/test/twisted/managers/fakecm.manager b/test/twisted/managers/fakecm.manager
deleted file mode 100644
index 60a45cf..0000000
--- a/test/twisted/managers/fakecm.manager
+++ /dev/null
@@ -1,7 +0,0 @@
-[ConnectionManager]
-BusName=com.example.FakeCM
-ObjectPath=/com/example/FakeCM/ConnectionManager
-
-[Protocol fakeprotocol]
-param-nickname=s
-
diff --git a/test/twisted/telepathy/clients/README b/test/twisted/telepathy/clients/README
new file mode 100644
index 0000000..7b725bf
--- /dev/null
+++ b/test/twisted/telepathy/clients/README
@@ -0,0 +1,4 @@
+This directory contains .clients files used by Mission Control when it is run
+by twisted test. $MC_CLIENTS_DIR is set to this directory in the twisted
+environment.
+
diff --git a/test/twisted/telepathy/managers/README b/test/twisted/telepathy/managers/README
new file mode 100644
index 0000000..d77437c
--- /dev/null
+++ b/test/twisted/telepathy/managers/README
@@ -0,0 +1,4 @@
+This directory contains .manager files used by Mission Control when it is run
+by twisted test. $MC_MANAGER_DIR is set to this directory in the twisted
+environment.
+
diff --git a/test/twisted/telepathy/managers/fakecm.manager b/test/twisted/telepathy/managers/fakecm.manager
new file mode 100644
index 0000000..60a45cf
--- /dev/null
+++ b/test/twisted/telepathy/managers/fakecm.manager
@@ -0,0 +1,7 @@
+[ConnectionManager]
+BusName=com.example.FakeCM
+ObjectPath=/com/example/FakeCM/ConnectionManager
+
+[Protocol fakeprotocol]
+param-nickname=s
+
diff --git a/test/twisted/tools/exec-with-log.sh.in b/test/twisted/tools/exec-with-log.sh.in
index 0a44622..e7c55a2 100644
--- a/test/twisted/tools/exec-with-log.sh.in
+++ b/test/twisted/tools/exec-with-log.sh.in
@@ -5,9 +5,14 @@ cd "@abs_top_builddir@/test/twisted/tools"
 # Run Mission Control in a private environment
 export MC_DEBUG=2
 export MC_CHANDLERS_DIR="@abs_top_builddir@/test/twisted/chandlers"
-export MC_CLIENTS_DIR="@abs_top_builddir@/test/twisted/clients"
-export MC_MANAGER_DIR="@abs_top_builddir@/test/twisted/managers"
 export MC_ACCOUNT_DIR="@abs_top_builddir@/test/twisted/accounts"
+
+export XDG_DATA_HOME="@abs_top_builddir@/test/twisted"
+export XDG_DATA_DIRS="@abs_top_srcdir@/test/twisted"
+# FIXME: these two are probably superseded by XDG_DATA_*?
+export MC_CLIENTS_DIR="@abs_top_builddir@/test/twisted/telepathy/clients"
+export MC_MANAGER_DIR="@abs_top_builddir@/test/twisted/telepathy/managers"
+
 #export MC_PROFILE_DIR=
 
 ulimit -c unlimited
-- 
1.5.6.5