syz-ci: improve test result aggregation

If there is a crash with a report, prefer it to crashes without report.
google · May 10, 2019 · 7143d0b · 7143d0b
1 parent 364acbc
commit 7143d0b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go
@@ -497,6 +497,7 @@ func aggregateTestResults(results []error) (*report.Report, error) {
 	// If all instances failed to boot, then we report one of these errors.
 	anySuccess := false
 	var anyErr, testErr error
+	var rep *report.Report
 	for _, res := range results {
 		if res == nil {
 			anySuccess = true
@@ -513,9 +514,14 @@ func aggregateTestResults(results []error) (*report.Report, error) {
 				testErr = fmt.Errorf("%v\n\n%s", err.Title, err.Output)
 			}
 		case *instance.CrashError:
-			return err.Report, nil
+			if rep == nil || (len(rep.Report) == 0 && len(err.Report.Report) != 0) {
+				rep = err.Report
+			}
 		}
 	}
+	if rep != nil {
+		return rep, nil
+	}
 	if anySuccess {
 		return nil, nil
 	}

diff --git a/syz-ci/jobs_test.go b/syz-ci/jobs_test.go
@@ -90,6 +90,18 @@ func TestAggregateTestResults(t *testing.T) {
 			title: "",
 			err:   errors.New("infra error3"),
 		},
+		{
+			results: []error{
+				&instance.CrashError{Report: &report.Report{Title: "title1"}},
+				&instance.CrashError{Report: &report.Report{
+					Title:  "title2",
+					Report: []byte("report"),
+				}},
+				&instance.CrashError{Report: &report.Report{Title: "title3"}},
+			},
+			title: "title2",
+			err:   nil,
+		},
 	}
 	for i, test := range tests {
 		rep, err := aggregateTestResults(test.results)