diff --git a/README.md b/README.md index 95d3614..c0c7f52 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ go-junit-report reads the `go test` verbose output from standard in and writes junit compatible XML to standard out. ```bash -go test -v 2>&1 | go-junit-report > report.xml +go test -v -count 5 2>&1 | go-junit-report > report.xml ``` Note that it also can parse benchmark output with `-bench` flag: @@ -40,11 +40,6 @@ Note that it also can parse benchmark output with `-bench` flag: go test -v -bench . 2>&1 | ./go-junit-report > report.xml ``` -or using the optional -count parameter: -```bash -go test -v -bench . -count 5 2>&1 | ./go-junit-report > report.xml -``` - [travis-badge]: https://travis-ci.org/jstemmer/go-junit-report.svg [travis-link]: https://travis-ci.org/jstemmer/go-junit-report [report-badge]: https://goreportcard.com/badge/github.com/jstemmer/go-junit-report diff --git a/formatter/formatter.go b/formatter/formatter.go index c55c67d..e858fcc 100644 --- a/formatter/formatter.go +++ b/formatter/formatter.go @@ -65,6 +65,7 @@ func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w // convert Report to JUnit test suites for _, pkg := range report.Packages { + pkg.Benchmarks = mergeBenchmarks(pkg.Benchmarks) ts := JUnitTestSuite{ Tests: len(pkg.Tests) + len(pkg.Benchmarks), Failures: 0, @@ -115,7 +116,7 @@ func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w } // individual benchmarks - for _, benchmark := range mergeBenchmarks(pkg.Benchmarks) { + for _, benchmark := range pkg.Benchmarks { benchmarkCase := JUnitTestCase{ Classname: classname, Name: benchmark.Name, @@ -149,38 +150,25 @@ func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w } func mergeBenchmarks(benchmarks []*parser.Benchmark) []*parser.Benchmark { - // calculate the cumulative moving average CMA for each benchmark. - // CMA(n + 1) = val(n+1) + n*CMA/(n+1) - alloc := "Allocs" - bytes := "Bytes" - dur := "Duration" - n := 1 var merged []*parser.Benchmark - averages := make(map[string] /*bench name*/ map[string] /* type */ int) - for _, b := range benchmarks { - if avg, found := averages[b.Name]; found { - // calculate CMAs - averages[b.Name][alloc] = (b.Allocs + n*averages[b.Name][alloc]) / (n + 1) - averages[b.Name][bytes] = (b.Bytes + n*avg[bytes]) / (n + 1) - averages[b.Name][dur] = (int(b.Duration.Nanoseconds()) + n*avg[dur]) / (n + 1) - - n++ - continue + benchmap := make(map[string][]*parser.Benchmark) + for _, bm := range benchmarks { + if _, ok := benchmap[bm.Name]; !ok { + merged = append(merged, &parser.Benchmark{Name: bm.Name}) } - n = 1 // reset duplicate counter - merged = append(merged, &parser.Benchmark{Name: b.Name}) - averages[b.Name] = make(map[string]int) - averages[b.Name][alloc] = b.Allocs - averages[b.Name][bytes] = b.Bytes - averages[b.Name][dur] = int(b.Duration.Nanoseconds()) + benchmap[bm.Name] = append(benchmap[bm.Name], bm) } - // fill out benchmarks - for i := range merged { - avgVals := averages[merged[i].Name] - merged[i].Allocs = avgVals[alloc] - merged[i].Bytes = avgVals[bytes] - merged[i].Duration = time.Duration(avgVals[dur]) + for _, bm := range merged { + for _, b := range benchmap[bm.Name] { + bm.Allocs += b.Allocs + bm.Bytes += b.Bytes + bm.Duration += b.Duration + } + n := len(benchmap[bm.Name]) + bm.Allocs /= n + bm.Bytes /= n + bm.Duration /= time.Duration(n) } return merged diff --git a/go-junit-report_test.go b/go-junit-report_test.go index e44a0ba..a6023ca 100644 --- a/go-junit-report_test.go +++ b/go-junit-report_test.go @@ -1107,101 +1107,40 @@ var testCases = []TestCase{ report: &parser.Report{ Packages: []parser.Package{ { - Name: "multiple/repeating", - Duration: 14211 * time.Millisecond, - Time: 14211, - Tests: []*parser.Test{ - { - Name: "TestRepeat", - Duration: 0, - Time: 0, - Result: parser.PASS, - }, - { - Name: "TestRepeat", - Duration: 0, - Time: 0, - Result: parser.PASS, - }, - { - Name: "TestRepeat", - Duration: 0, - Time: 0, - Result: parser.PASS, - }, - { - Name: "TestRepeat", - Duration: 0, - Time: 0, - Result: parser.PASS, - }, - { - Name: "TestRepeat", - Duration: 0, - Time: 0, - Result: parser.PASS, - }, - }, + Name: "mycode/common", + Duration: 7267 * time.Millisecond, + Time: 7267, Benchmarks: []*parser.Benchmark{ { - Name: "BenchmarkNew", - Duration: 350 * time.Nanosecond, - Bytes: 80, - Allocs: 3, + Name: "BenchmarkParse", + Duration: 1591 * time.Nanosecond, }, { - Name: "BenchmarkNew", - Duration: 357 * time.Nanosecond, - Bytes: 80, - Allocs: 3, + Name: "BenchmarkNewTask", + Duration: 391 * time.Nanosecond, + }, + }, + }, + { + Name: "mycode/benchmarks/channels", + Duration: 47084 * time.Millisecond, + Time: 47084, + Benchmarks: []*parser.Benchmark{ + { + Name: "BenchmarkFanout/Channel/10", + Duration: 4673 * time.Nanosecond, }, { - Name: "BenchmarkNew", - Duration: 354 * time.Nanosecond, - Bytes: 80, - Allocs: 3, + Name: "BenchmarkFanout/Channel/100", + Duration: 24965 * time.Nanosecond, }, { - Name: "BenchmarkNew", - Duration: 358 * time.Nanosecond, - Bytes: 80, - Allocs: 3, + Name: "BenchmarkFanout/Channel/1000", + Duration: 195672 * time.Nanosecond, }, { - Name: "BenchmarkNew", - Duration: 345 * time.Nanosecond, - Bytes: 80, - Allocs: 3, - }, - { - Name: "BenchmarkFew", - Duration: 100 * time.Nanosecond, - Bytes: 20, - Allocs: 1, - }, - { - Name: "BenchmarkFew", - Duration: 105 * time.Nanosecond, - Bytes: 20, - Allocs: 1, - }, - { - Name: "BenchmarkFew", - Duration: 102 * time.Nanosecond, - Bytes: 20, - Allocs: 1, - }, - { - Name: "BenchmarkFew", - Duration: 102 * time.Nanosecond, - Bytes: 20, - Allocs: 1, - }, - { - Name: "BenchmarkFew", - Duration: 102 * time.Nanosecond, - Bytes: 20, - Allocs: 1, + Name: "BenchmarkFanout/Channel/10000", + Duration: 2410200 * time.Nanosecond, }, }, }, diff --git a/parser/parser.go b/parser/parser.go index 8b79f9a..fdb2ae5 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -177,6 +177,7 @@ func Parse(r io.Reader, pkgName string) (*Report, error) { buffers[cur] = buffers[cur][0:0] tests = make([]*Test, 0) + benchmarks = make([]*Benchmark, 0) coveragePct = "" cur = "" testsTime = 0 diff --git a/testdata/25-report.xml b/testdata/25-report.xml index d5277f1..4dd4a96 100644 --- a/testdata/25-report.xml +++ b/testdata/25-report.xml @@ -1,6 +1,6 @@ - + diff --git a/testdata/26-report.xml b/testdata/26-report.xml index 24330d9..a0cd3a5 100644 --- a/testdata/26-report.xml +++ b/testdata/26-report.xml @@ -1,15 +1,19 @@ - + - - - - - - - + + + + + + + + + + + diff --git a/testdata/26-testbenchmultiple.txt b/testdata/26-testbenchmultiple.txt index 1657d2d..6c42624 100644 --- a/testdata/26-testbenchmultiple.txt +++ b/testdata/26-testbenchmultiple.txt @@ -1,23 +1,12 @@ -=== RUN TestRepeat ---- PASS: TestRepeat (0.00s) -=== RUN TestRepeat ---- PASS: TestRepeat (0.00s) -=== RUN TestRepeat ---- PASS: TestRepeat (0.00s) -=== RUN TestRepeat ---- PASS: TestRepeat (0.00s) -=== RUN TestRepeat ---- PASS: TestRepeat (0.00s) -pkg: multiple/repeating -BenchmarkNew-8 5000000 350 ns/op 80 B/op 3 allocs/op -BenchmarkNew-8 5000000 357 ns/op 80 B/op 3 allocs/op -BenchmarkNew-8 5000000 354 ns/op 80 B/op 3 allocs/op -BenchmarkNew-8 5000000 358 ns/op 80 B/op 3 allocs/op -BenchmarkNew-8 5000000 345 ns/op 80 B/op 3 allocs/op -BenchmarkFew-8 5000000 100 ns/op 20 B/op 1 allocs/op -BenchmarkFew-8 5000000 105 ns/op 20 B/op 1 allocs/op -BenchmarkFew-8 5000000 102 ns/op 20 B/op 1 allocs/op -BenchmarkFew-8 5000000 102 ns/op 20 B/op 1 allocs/op -BenchmarkFew-8 5000000 102 ns/op 20 B/op 1 allocs/op +pkg: mycode/common +BenchmarkParse-8 1000000 1591 ns/op +BenchmarkNewTask-8 3000000 391 ns/op PASS -ok multiple/repeating 14.211s \ No newline at end of file +ok mycode/common 7.267s +pkg: mycode/benchmarks/channels +BenchmarkFanout/Channel/10-8 500000 4673 ns/op +BenchmarkFanout/Channel/100-8 50000 24965 ns/op +BenchmarkFanout/Channel/1000-8 10000 195672 ns/op +BenchmarkFanout/Channel/10000-8 500 2410200 ns/op +PASS +ok mycode/benchmarks/channels 47.084s \ No newline at end of file