From 1ad62def6a550e2ac015bdf34bcf25b7a7b4b92c Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 4 Apr 2012 13:40:50 -0700
Subject: [PATCH] build: Cleanup of test summary printing

---
 mk/tests.mk              | 14 ++++++++++----
 src/etc/check-summary.py |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mk/tests.mk b/mk/tests.mk
index a18f2df89d3..7b503b2109a 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -66,11 +66,17 @@ endif
 # Main test targets
 ######################################################################
 
-check: tidy all check-stage2
-	$(S)src/etc/check-summary.py tmp/*.log
+cleantmptestlogs:
+	$(Q)rm -f tmp/*.log
 
-check-full: tidy all check-stage1 check-stage2 check-stage3
-	$(S)src/etc/check-summary.py tmp/*.log
+check: cleantmptestlogs tidy all check-stage2
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
+
+check-full: cleantmptestlogs tidy all check-stage1 check-stage2 check-stage3
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
+
+check-test: cleantmptestlogs all check-stage2-rfail
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
 
 # Run the tidy script in multiple parts to avoid huge 'echo' commands
 ifdef CFG_NOTIDY
diff --git a/src/etc/check-summary.py b/src/etc/check-summary.py
index 7c7e807f43c..7faacbfbb26 100755
--- a/src/etc/check-summary.py
+++ b/src/etc/check-summary.py
@@ -20,8 +20,9 @@ if __name__ == '__main__':
     ok = count('ok')
     failed = count('failed')
     ignored = count('ignored')
-    print "summary of %d test logs: %d passed; %d failed; %d ignored" % \
+    print "summary of %d test runs: %d passed; %d failed; %d ignored" % \
             (len(logfiles), ok, failed, ignored)
+    print ""
     if failed > 0:
         print "failed tests:"
         for f, s in summaries: