[telepathy-mission-control/master] Disable tests that rely on a special MC build when running installcheck

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Jun 29 09:33:21 PDT 2009


The auto-away and create-lowmem tests poke the MC system flags via an
ad-hoc D-Bus interface that only exists in the debug build of MC, so they
can't be run on "the real MC".
---
 test/twisted/Makefile.am |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index 80cb9a5..0c5e78b 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -3,7 +3,6 @@ TWISTED_TESTS =
 TWISTED_BASIC_TESTS = \
 	account-manager/account-basics.py \
 	account-manager/bad-cm.py \
-	account-manager/auto-away.py \
 	account-manager/avatar.py \
 	account-manager/create-auto-connect.py \
 	account-manager/create-with-properties.py \
@@ -28,7 +27,6 @@ TWISTED_BASIC_TESTS = \
 	dispatcher/capture-bundle.py \
 	dispatcher/connect-for-request.py \
 	dispatcher/create-handler-fails.py \
-	dispatcher/create-lowmem.py \
 	dispatcher/create-no-preferred-handler.py \
 	dispatcher/create-text.py \
 	dispatcher/dispatch-activatable.py \
@@ -48,6 +46,14 @@ TWISTED_BASIC_TESTS += \
 	dispatcher/dispatch-rejected-by-plugin.py
 endif
 
+# Tests that aren't to be run if we're running the real (installed) MC,
+# because they rely on special behaviour of mc-debug-server
+TWISTED_SPECIAL_BUILD_TESTS = \
+	account-manager/auto-away.py \
+	dispatcher/create-lowmem.py
+
+TWISTED_BASIC_TESTS += $(TWISTED_SPECIAL_BUILD_TESTS)
+
 TWISTED_SEPARATE_TESTS = \
 	account-manager/auto-connect.py \
 	account-manager/avatar-persist.py \
@@ -120,7 +126,9 @@ if HAVE_SERVER
 
 installcheck-local: installcheck-twisted
 installcheck-twisted:
-	$(MAKE) check-twisted MC_EXECUTABLE=@libexecdir@/mission-control-5
+	$(MAKE) check-twisted \
+		TWISTED_SPECIAL_BUILD_TESTS= \
+		MC_EXECUTABLE=@libexecdir@/mission-control-5
 
 endif # HAVE_SERVER
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list