Skip to content

Commit f1ad02b

Browse files
jstemmerjstemmer
committed
junit: Use the standard duration formatting for benchmark durations
Benchmark durations were originally formatted with higher precision because they contained just the NsPerOp field. Now that we're approximating the total duration they are more accurate and don't need as many decimals.
1 parent 1d905e0 commit f1ad02b

14 files changed

+31
-37
lines changed

‎junit/junit.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ func createTestcaseForBenchmark(pkgName string, bm gtr.Benchmark) Testcase {
235235
tc := Testcase{
236236
Classname: pkgName,
237237
Name: bm.Name,
238-
Time: formatBenchmarkTime(bm.ApproximateDuration()),
238+
Time: formatDuration(bm.ApproximateDuration()),
239239
}
240240

241241
if bm.Result == gtr.Fail {
@@ -258,12 +258,6 @@ func formatDuration(d time.Duration) string {
258258
return fmt.Sprintf("%.3f", d.Seconds())
259259
}
260260

261-
// formatBenchmarkTime returns the JUnit string representation of the given
262-
// benchmark time.
263-
func formatBenchmarkTime(d time.Duration) string {
264-
return fmt.Sprintf("%.9f", d.Seconds())
265-
}
266-
267261
// formatOutput combines the lines from the given output into a single string.
268262
func formatOutput(output []string, indent int) string {
269263
return strings.Join(output, "\n")

‎junit/junit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestCreateFromReport(t *testing.T) {
3636
Testcases: []Testcase{
3737
{
3838
Name: "BenchmarkFail",
39-
Time: "0.000000000",
39+
Time: "0.000",
4040
Failure: &Result{Message: "Failed"},
4141
},
4242
},

‎testdata/022-report.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<testcase name="TestOne" classname="package/bench" time="0.000">
88
<system-out><![CDATA[ bench_test.go:9: test log]]></system-out>
99
</testcase>
10-
<testcase name="BenchmarkOne" classname="package/bench" time="0.264200000">
10+
<testcase name="BenchmarkOne" classname="package/bench" time="0.264">
1111
<system-out><![CDATA[ bench_test.go:13: benchmark log (1)
1212
bench_test.go:13: benchmark log (100)
1313
bench_test.go:13: benchmark log (10000)
1414
bench_test.go:13: benchmark log (1000000)
1515
bench_test.go:13: benchmark log (100000000)
1616
bench_test.go:13: benchmark log (1000000000)]]></system-out>
1717
</testcase>
18-
<testcase name="BenchmarkTwo" classname="package/bench" time="1.313804304"></testcase>
18+
<testcase name="BenchmarkTwo" classname="package/bench" time="1.314"></testcase>
1919
<system-out><![CDATA[goos: linux
2020
goarch: amd64
2121
pkg: package/bench]]></system-out>

‎testdata/023-report.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="BenchmarkIpsHistoryInsert" classname="package/one" time="1.577040000"></testcase>
8-
<testcase name="BenchmarkIpsHistoryLookup" classname="package/one" time="1.520800000"></testcase>
7+
<testcase name="BenchmarkIpsHistoryInsert" classname="package/one" time="1.577"></testcase>
8+
<testcase name="BenchmarkIpsHistoryLookup" classname="package/one" time="1.521"></testcase>
99
<system-out><![CDATA[goos: darwin
1010
goarch: amd64
1111
pkg: code.internal/state]]></system-out>

‎testdata/024-report.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="BenchmarkOne" classname="package/bench" time="0.264000000"></testcase>
8-
<testcase name="BenchmarkTwo" classname="package/bench" time="1.316969295"></testcase>
7+
<testcase name="BenchmarkOne" classname="package/bench" time="0.264"></testcase>
8+
<testcase name="BenchmarkTwo" classname="package/bench" time="1.317"></testcase>
99
<system-out><![CDATA[goos: linux
1010
goarch: amd64
1111
pkg: package/bench

‎testdata/025-report.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="BenchmarkNew" classname="pkg/count" time="8.820000000"></testcase>
8-
<testcase name="BenchmarkFew" classname="pkg/count" time="2.555000000"></testcase>
7+
<testcase name="BenchmarkNew" classname="pkg/count" time="8.820"></testcase>
8+
<testcase name="BenchmarkFew" classname="pkg/count" time="2.555"></testcase>
99
</testsuite>
1010
</testsuites>

‎testdata/026-report.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="BenchmarkParse" classname="mycode/common" time="1.591000000"></testcase>
8-
<testcase name="BenchmarkNewTask" classname="mycode/common" time="1.173000000"></testcase>
7+
<testcase name="BenchmarkParse" classname="mycode/common" time="1.591"></testcase>
8+
<testcase name="BenchmarkNewTask" classname="mycode/common" time="1.173"></testcase>
99
<system-out><![CDATA[pkg: mycode/common]]></system-out>
1010
</testsuite>
1111
<testsuite name="mycode/benchmarks/channels" tests="4" failures="0" errors="0" id="1" hostname="hostname" time="47.084" timestamp="2022-01-01T00:00:00Z">
1212
<properties>
1313
<property name="go.version" value="1.0"></property>
1414
</properties>
15-
<testcase name="BenchmarkFanout/Channel/10" classname="mycode/benchmarks/channels" time="2.336500000"></testcase>
16-
<testcase name="BenchmarkFanout/Channel/100" classname="mycode/benchmarks/channels" time="1.248250000"></testcase>
17-
<testcase name="BenchmarkFanout/Channel/1000" classname="mycode/benchmarks/channels" time="1.956720000"></testcase>
18-
<testcase name="BenchmarkFanout/Channel/10000" classname="mycode/benchmarks/channels" time="1.205100000"></testcase>
15+
<testcase name="BenchmarkFanout/Channel/10" classname="mycode/benchmarks/channels" time="2.337"></testcase>
16+
<testcase name="BenchmarkFanout/Channel/100" classname="mycode/benchmarks/channels" time="1.248"></testcase>
17+
<testcase name="BenchmarkFanout/Channel/1000" classname="mycode/benchmarks/channels" time="1.957"></testcase>
18+
<testcase name="BenchmarkFanout/Channel/10000" classname="mycode/benchmarks/channels" time="1.205"></testcase>
1919
<system-out><![CDATA[pkg: mycode/benchmarks/channels]]></system-out>
2020
</testsuite>
2121
</testsuites>

‎testdata/027-report.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="BenchmarkItsy" classname="really/small" time="1.371000000"></testcase>
8-
<testcase name="BenchmarkTeeny" classname="really/small" time="2.120000000"></testcase>
9-
<testcase name="BenchmarkWeeny" classname="really/small" time="0.520000000"></testcase>
7+
<testcase name="BenchmarkItsy" classname="really/small" time="1.371"></testcase>
8+
<testcase name="BenchmarkTeeny" classname="really/small" time="2.120"></testcase>
9+
<testcase name="BenchmarkWeeny" classname="really/small" time="0.520"></testcase>
1010
<system-out><![CDATA[goos: darwin
1111
goarch: amd64
1212
pkg: really/small]]></system-out>

‎testdata/028-report.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="BenchmarkRing" classname="single/cpu" time="1.484000000"></testcase>
7+
<testcase name="BenchmarkRing" classname="single/cpu" time="1.484"></testcase>
88
<system-out><![CDATA[pkg: single/cpu]]></system-out>
99
</testsuite>
1010
</testsuites>

‎testdata/029-report.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="BenchmarkRingaround" classname="sixteen/cpu" time="1.357100000"></testcase>
7+
<testcase name="BenchmarkRingaround" classname="sixteen/cpu" time="1.357"></testcase>
88
<system-out><![CDATA[pkg: sixteen/cpu]]></system-out>
99
</testsuite>
1010
</testsuites>

0 commit comments

Comments
 (0)