[telepathy-mission-control/master] test/twisted: save one log per MC run

[Simon McVittie]

If MC crashes and is reactivated, this lets us see why the first crash
happened.
---
 .gitignore                             |    2 +-
 test/twisted/Makefile.am               |    1 +
 test/twisted/tools/exec-with-log.sh.in |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 153d8ee..de50ed0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,7 @@ test/twisted/with-session-bus-*.dbus-monitor-logs
 test/twisted/accounts/accounts.cfg
 /test/twisted/mc-debug-server
 test/twisted/tools/exec-with-log.sh
-test/twisted/tools/missioncontrol-testing.log
+test/twisted/tools/missioncontrol-*.log
 test/twisted/tools/org.freedesktop.Telepathy.MissionControl.service
 test/twisted/tools/tmp-session-bus.conf
 util/mc-account-convert
diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index 7f74d21..f9413b2 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -52,6 +52,7 @@ check-local: check-twisted
 check-twisted:
 	$(MAKE) -C tools
 	rm -f tools/core
+	rm -f tools/missioncontrol-*.log
 	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 afd808f..447fe1f 100644
--- a/test/twisted/tools/exec-with-log.sh.in
+++ b/test/twisted/tools/exec-with-log.sh.in
@@ -19,7 +19,7 @@ export G_DEBUG=fatal_criticals
 #export MC_PROFILE_DIR=
 
 ulimit -c unlimited
-exec > missioncontrol-testing.log 2>&1
+exec > missioncontrol-$$.log 2>&1
 
 if test -n "$MISSIONCONTROL_TEST_VALGRIND"; then
 	export G_DEBUG=gc-friendly
-- 
1.5.6.5