.tools: Make -v output comply with TAP version 13

wking · wking · commit 650828c7b23c · 2015-09-11T21:27:15.000-07:00
Using TAP [1] makes it easy to consume the output of this tool in a variety of existing harnesses [2]. Only the verbose results are TAP compliant, mostly because folks aren't likely to care about verbosity if they're just piping the results into a TAP harness. If we end up wanting the non-verbose output to be TAP compliant, we'll have to switch to the trailing count approach explained in the "Unknown amount and failures" section of the spec [1], and we'll have to keep a running counter of failed checks (instead of the current len(DefaultRules)-based approach). [1]: http://testanything.org/tap-version-13-specification.html [2]: http://testanything.org/consumers.html Signed-off-by: W. Trevor King <wking@tremily.us>
diff --git a/.tools/validate.go b/.tools/validate.go
@@ -68,25 +68,30 @@ func main() {
 	}
 
 	results := ValidateResults{}
-	for _, commit := range c {
-		fmt.Printf(" * %s %s ... ", commit["abbreviated_commit"], commit["subject"])
+
+	if *flVerbose {
+		fmt.Println("TAP version 13")
+		fmt.Printf("1..%d\n", len(c)*len(DefaultRules))
+	}
+	for i, commit := range c {
+		fmt.Printf("# %s %s ... ", commit["abbreviated_commit"], commit["subject"])
 		vr := ValidateCommit(commit, DefaultRules)
 		results = append(results, vr...)
 		if _, fail := vr.PassFail(); fail == 0 {
 			fmt.Println("PASS")
 		} else {
 			fmt.Println("FAIL")
 		}
-		for _, r := range vr {
+		for j, r := range vr {
 			if *flVerbose {
 				if r.Pass {
 					fmt.Printf("ok")
 				} else {
 					fmt.Printf("not ok")
 				}
-				fmt.Printf(" %s\n", r.Msg)
+				fmt.Printf(" %d - %s\n", i*len(DefaultRules)+j+1, r.Msg)
 			} else if !r.Pass {
-				fmt.Printf("not ok %s\n", r.Msg)
+				fmt.Printf("not ok - %s\n", r.Msg)
 			}
 		}
 	}
