From 940f38c1d236deec56b628d5586fdd6a5c33f5b6 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Tue, 27 Aug 2024 20:26:56 +0200 Subject: tools/syz-covermerger: don't print merge result for dashapi client There is no need to print this data if we submit result to dashapi. It currently pollutes the logs. --- tools/syz-covermerger/syz_covermerger.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/syz-covermerger/syz_covermerger.go b/tools/syz-covermerger/syz_covermerger.go index a5f8689ab..064bff41d 100644 --- a/tools/syz-covermerger/syz_covermerger.go +++ b/tools/syz-covermerger/syz_covermerger.go @@ -83,7 +83,6 @@ func main() { if errMerge != nil { panic(errMerge) } - printMergeResult(mergeResult) coverage, _, _ := mergeResultsToCoverage(mergeResult) if *flagToDashAPI != "" { @@ -99,6 +98,8 @@ func main() { log.Fatalf("failed to saveCoverage: %v", err) } } + printOnlyTotal := *flagToDashAPI != "" + printMergeResult(mergeResult, printOnlyTotal) } func saveCoverage(dashboard, clientName string, d *dashapi.MergedCoverage) error { @@ -111,12 +112,14 @@ func saveCoverage(dashboard, clientName string, d *dashapi.MergedCoverage) error }) } -func printMergeResult(mergeResult map[string]*covermerger.MergeResult) { +func printMergeResult(mergeResult map[string]*covermerger.MergeResult, totalOnly bool) { coverage, totalInstrumentedLines, totalCoveredLines := mergeResultsToCoverage(mergeResult) - keys := maps.Keys(coverage) - sort.Strings(keys) - for _, fileName := range keys { - printCoverage(fileName, coverage[fileName].Instrumented, coverage[fileName].Covered) + if !totalOnly { + keys := maps.Keys(coverage) + sort.Strings(keys) + for _, fileName := range keys { + printCoverage(fileName, coverage[fileName].Instrumented, coverage[fileName].Covered) + } } printCoverage("total", totalInstrumentedLines, totalCoveredLines) } -- cgit mrf-deployment