[telepathy-mission-control/master] Move responsibility for deleting accounts.cfg from exec-with-log to Makefile

[Simon McVittie]

This means that the "combined tests" (tests run in the same MC instance)
can assume accounts.cfg to have been cleared, but the "separate tests"
are each responsible for deleting or pre-seeding it themselves.
---
 test/twisted/Makefile.am               |    1 +
 test/twisted/tools/exec-with-log.sh.in |   11 -----------
 2 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index c99d2fe..f7f0c51 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -77,6 +77,7 @@ check-twisted:
 	$(MAKE) -C tools
 	rm -f tools/core
 	rm -f tools/missioncontrol-*.log
+	rm -f accounts/accounts.cfg
 	env $(BASIC_TESTS_ENVIRONMENT) $(WITH_SESSION_BUS) $(MAKE) check-TESTS \
 		TESTS='$$(TWISTED_BASIC_TESTS)' \
 		TESTS_ENVIRONMENT='$$(COMBINED_TESTS_ENVIRONMENT)'
diff --git a/test/twisted/tools/exec-with-log.sh.in b/test/twisted/tools/exec-with-log.sh.in
index 143ecf8..cb4c9fd 100644
--- a/test/twisted/tools/exec-with-log.sh.in
+++ b/test/twisted/tools/exec-with-log.sh.in
@@ -30,17 +30,6 @@ elif test -n "$MISSIONCONTROL_TEST_REFDBG"; then
         fi
 fi
 
-# Delete previous Mission Control accounts
-if [ -f "@abs_top_builddir@/test/twisted/accounts/accounts.cfg" ] ; then
-        echo "Delete @abs_top_builddir@/test/twisted/accounts/accounts.cfg"
-        rm -f -- "@abs_top_builddir@/test/twisted/accounts/accounts.cfg"
-fi
-if [ -e "@abs_top_builddir@/test/twisted/accounts/accounts.cfg" ] ; then
-        echo "Error: accounts.cfg file exists:"
-        echo "@abs_top_builddir@/test/twisted/accounts/accounts.cfg"
-        exit 1
-fi
-
 exec @abs_top_builddir@/libtool --mode=execute \
         $MISSIONCONTROL_WRAPPER \
         @abs_top_builddir@/test/twisted/mc-debug-server
-- 
1.5.6.5