[telepathy-mission-control/master] test/twisted: set environment variables in Makefile.am instead of exec-with-log.sh

[Simon McVittie]

---
 test/twisted/Makefile.am               |   12 +++++++++++-
 test/twisted/tools/exec-with-log.sh.in |   16 ----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index f9413b2..dab1617 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -41,7 +41,16 @@ INCLUDES = \
 TESTS =
 
 TESTS_ENVIRONMENT = \
-	PYTHONPATH=@abs_top_srcdir@/test/twisted:@abs_top_builddir@/test/twisted
+	PYTHONPATH=@abs_top_srcdir@/test/twisted:@abs_top_builddir@/test/twisted \
+	MC_DEBUG=2 \
+	MC_TP_DEBUG=all \
+	MC_CHANDLERS_DIR=@abs_top_builddir@/test/twisted/chandlers \
+	MC_ACCOUNT_DIR=@abs_top_builddir@/test/twisted/accounts \
+	XDG_DATA_HOME=@abs_top_builddir@/test/twisted \
+	XDG_DATA_DIRS=@abs_top_srcdir@/test/twisted \
+	MC_CLIENTS_DIR=@abs_top_builddir@/test/twisted/telepathy/clients \
+	MC_MANAGER_DIR=@abs_top_builddir@/test/twisted/telepathy/managers \
+	G_DEBUG=fatal_criticals
 
 if WANT_TWISTED_TESTS
   TWISTED_TESTS += $(TWISTED_BASIC_TESTS)
@@ -53,6 +62,7 @@ check-twisted:
 	$(MAKE) -C tools
 	rm -f tools/core
 	rm -f tools/missioncontrol-*.log
+	env $(TESTS_ENVIRONMENT) \
 	sh $(srcdir)/tools/with-session-bus.sh --config-file=tools/tmp-session-bus.conf -- $(MAKE) check-TESTS \
 		TESTS="$(TWISTED_TESTS)" \
 		TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(TEST_PYTHON)"
diff --git a/test/twisted/tools/exec-with-log.sh.in b/test/twisted/tools/exec-with-log.sh.in
index 447fe1f..a416b25 100644
--- a/test/twisted/tools/exec-with-log.sh.in
+++ b/test/twisted/tools/exec-with-log.sh.in
@@ -2,22 +2,6 @@
 
 cd "@abs_top_builddir@/test/twisted/tools"
 
-# Run Mission Control in a private environment
-export MC_DEBUG=2
-export MC_TP_DEBUG=all
-export MC_CHANDLERS_DIR="@abs_top_builddir@/test/twisted/chandlers"
-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 G_DEBUG=fatal_criticals
-
-#export MC_PROFILE_DIR=
-
 ulimit -c unlimited
 exec > missioncontrol-$$.log 2>&1
 
-- 
1.5.6.5