From: David Bremner <bremner@debian.org>
Date: Tue, 13 Dec 2011 19:56:47 +0000 (-0400)
Subject: test: optionally print subtest number
X-Git-Tag: 0.11_rc1~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=451c57d19aeff5420839701460691e8e20d13049;p=notmuch.git

test: optionally print subtest number

The idea is that $test_count could be used in tests to label
intermediate files. The output enabled by this patch (and --debug)
helps figure out which OUTPUT.nn file belongs to which test in case
several subtests write to OUTPUT.$test_count
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 6be93fe3..b5e346c0 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -116,6 +116,16 @@ do
 	esac
 done
 
+if test -n "$debug"; then
+    print_subtest () {
+	printf " %-4s" "[$((test_count - 1))]"
+    }
+else
+    print_subtest () {
+	true
+    }
+fi
+
 if test -n "$color"; then
 	say_color () {
 		(
@@ -132,6 +142,7 @@ if test -n "$color"; then
 		printf " "
                 printf "$@"
 		tput sgr0
+		print_subtest
 		)
 	}
 else
@@ -140,6 +151,7 @@ else
 		shift
 		printf " "
                 printf "$@"
+		print_subtest
 	}
 fi