[Telepathy-commits] [telepathy-salut/master] Rename variables so it's more in line with how gabble work

Sjoerd Simons sjoerd.simons at collabora.co.uk
Thu Sep 4 04:34:59 PDT 2008


---
 tests/twisted/Makefile.am |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 5f1c860..a3549dd 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -1,21 +1,23 @@
 TWISTED_TESTS =
 
+TWISTED_BASIC_TESTS =
+
 TWISTED_AVAHI_TESTS = \
 	avahi/test-register.py \
-	avahi/test-aliases.py
+	avahi/test-aliases.py \
+	avahi/test-text-channel.py
 
 TESTS =
-TESTS_TO_RUN =
 
 TESTS_ENVIRONMENT = \
 	PYTHONPATH=@abs_top_srcdir@/tests/twisted:@abs_top_builddir@/tests/twisted
 
 if WANT_TWISTED_TESTS
-  TESTS_TO_RUN += $(TWISTED_TESTS)
+  TWISTED_TESTS += $(TWISTED_BASIC_TESTS)
 endif
 
 if WANT_TWISTED_AVAHI_TESTS
-  TESTS_TO_RUN += $(TWISTED_AVAHI_TESTS)
+  TWISTED_TESTS += $(TWISTED_AVAHI_TESTS)
 endif
 
 check-local: check-coding-style check-twisted
@@ -24,7 +26,7 @@ check-twisted:
 	$(MAKE) -C tools
 	rm -f tools/core
 	sh $(srcdir)/tools/with-session-bus.sh --config-file=tools/tmp-session-bus.conf -- $(MAKE) check-TESTS \
-		TESTS="$(TESTS_TO_RUN)" \
+		TESTS="$(TWISTED_TESTS)" \
 		TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(TEST_PYTHON)"
 	@if test -e tools/core; then\
 		echo "Core dump exists: tools/core";\
@@ -32,8 +34,8 @@ check-twisted:
 	fi
 
 EXTRA_DIST = \
-	$(AVAHI_TWISTED_TESTS) \
-	$(TWISTED_TESTS) \
+	$(TWISTED_AVAHI_TESTS) \
+	$(TWISTED_BASIC_TESTS) \
 	saluttest.py \
 	servicetest.py
 
-- 
1.5.6.3




More information about the Telepathy-commits mailing list