summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-31 10:12:58 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-31 10:32:19 +0100
commitcfb9ed72526648ed19db974a1fae6fd7339df433 (patch)
treecb62fce0537cab2a539df288709609e6d384f404
parentc79d2f8f80c2d11bdc1e203dd5e61f8927ec7c09 (diff)
move manager files to telepathy-1
-rw-r--r--tests/twisted/Makefile.am6
-rw-r--r--tests/twisted/run-test.sh.in2
-rw-r--r--tests/twisted/telepathy-1/managers/README (renamed from tests/twisted/telepathy/managers/README)0
-rw-r--r--tests/twisted/telepathy-1/managers/fakecm.manager (renamed from tests/twisted/telepathy/managers/fakecm.manager)0
-rw-r--r--tests/twisted/telepathy-1/managers/onewitheverything.manager (renamed from tests/twisted/telepathy/managers/onewitheverything.manager)0
5 files changed, 4 insertions, 4 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index e74f5ade..7f1651f8 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -107,9 +107,9 @@ TWISTED_OTHER_FILES = \
telepathy-1/clients/README \
telepathy-1/clients/AbiWord.client \
telepathy-1/clients/Logger.client \
- telepathy/managers/fakecm.manager \
- telepathy/managers/onewitheverything.manager \
- telepathy/managers/README \
+ telepathy-1/managers/fakecm.manager \
+ telepathy-1/managers/onewitheverything.manager \
+ telepathy-1/managers/README \
$(NULL)
# This deliberately doesn't include the TWISTED_SPECIAL_BUILD_TESTS
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 756628b6..8b06c712 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -73,7 +73,7 @@ export XDG_CONFIG_DIRS
MC_CLIENTS_DIR="${test_src}/twisted/telepathy-1/clients"
export MC_CLIENTS_DIR
-MC_MANAGER_DIR="${test_src}/twisted/telepathy/managers"
+MC_MANAGER_DIR="${test_src}/twisted/telepathy-1/managers"
export MC_MANAGER_DIR
if [ -n "$1" ] ; then
diff --git a/tests/twisted/telepathy/managers/README b/tests/twisted/telepathy-1/managers/README
index d77437cb..d77437cb 100644
--- a/tests/twisted/telepathy/managers/README
+++ b/tests/twisted/telepathy-1/managers/README
diff --git a/tests/twisted/telepathy/managers/fakecm.manager b/tests/twisted/telepathy-1/managers/fakecm.manager
index e0e63d5d..e0e63d5d 100644
--- a/tests/twisted/telepathy/managers/fakecm.manager
+++ b/tests/twisted/telepathy-1/managers/fakecm.manager
diff --git a/tests/twisted/telepathy/managers/onewitheverything.manager b/tests/twisted/telepathy-1/managers/onewitheverything.manager
index 222daddb..222daddb 100644
--- a/tests/twisted/telepathy/managers/onewitheverything.manager
+++ b/tests/twisted/telepathy-1/managers/onewitheverything.manager