diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2025-09-26 15:24:20 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-10-01 14:41:08 +0000 |
| commit | 12039a0e63377e86fa1b5adc3d327d6e07f23a32 (patch) | |
| tree | 0d622daed4041159362850994ab81d8ce351cbff /syz-ci | |
| parent | db09e5b2322f6dbd902a69405c2142617c6b8715 (diff) | |
pkg/osutil: make VerboseError nest other errors
After this change it fits more naturally into the Go's error
functionality.
Diffstat (limited to 'syz-ci')
| -rw-r--r-- | syz-ci/manager.go | 2 | ||||
| -rw-r--r-- | syz-ci/updater.go | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/syz-ci/manager.go b/syz-ci/manager.go index ab1e0820b..4f68f2ca4 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -401,7 +401,7 @@ func (mgr *Manager) build(kernelCommit *vcs.Commit) error { rep.Output = kernelError.Output rep.Recipients = kernelError.Recipients case errors.As(err, &verboseError): - rep.Report = []byte(verboseError.Title) + rep.Report = []byte(verboseError.Error()) rep.Output = verboseError.Output case errors.As(err, &build.InfraError{}): return err diff --git a/syz-ci/updater.go b/syz-ci/updater.go index 0eb901825..80e5b4db5 100644 --- a/syz-ci/updater.go +++ b/syz-ci/updater.go @@ -257,7 +257,7 @@ func (upd *SyzUpdater) build(commit *vcs.Commit) error { cmd.Dir = upd.syzkallerDir cmd.Env = append([]string{"GOPATH=" + upd.gopathDir}, os.Environ()...) if _, err := osutil.Run(time.Hour, cmd); err != nil { - return osutil.PrependContext("make host failed", err) + return fmt.Errorf("make host failed: %w", err) } for target := range upd.targets { parts := strings.Split(target, "/") @@ -271,7 +271,7 @@ func (upd *SyzUpdater) build(commit *vcs.Commit) error { "TARGETARCH="+parts[2], ) if _, err := osutil.Run(time.Hour, cmd); err != nil { - return osutil.PrependContext("make target failed", err) + return fmt.Errorf("make target failed: %w", err) } } cmd = osutil.Command("go", "test", "-short", "./...") @@ -281,7 +281,7 @@ func (upd *SyzUpdater) build(commit *vcs.Commit) error { "SYZ_DISABLE_SANDBOXING=yes", }, os.Environ()...) if _, err := osutil.Run(time.Hour, cmd); err != nil { - return osutil.PrependContext("testing failed", err) + return fmt.Errorf("testing failed: %w", err) } tagFile := filepath.Join(upd.syzkallerDir, "tag") if err := osutil.WriteFile(tagFile, []byte(commit.Hash)); err != nil { @@ -294,14 +294,11 @@ func (upd *SyzUpdater) build(commit *vcs.Commit) error { } func (upd *SyzUpdater) uploadBuildError(commit *vcs.Commit, buildErr error) { - var title string var output []byte var verbose *osutil.VerboseError + title := buildErr.Error() if errors.As(buildErr, &verbose) { - title = verbose.Title output = verbose.Output - } else { - title = buildErr.Error() } title = "syzkaller: " + title for _, mgrcfg := range upd.cfg.Managers { |