diff options
| -rw-r--r-- | syz-ci/jobs_test.go | 4 | ||||
| -rw-r--r-- | tools/syz-linter/linter.go | 11 | ||||
| -rw-r--r-- | tools/syz-reporter/reporter.go | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/syz-ci/jobs_test.go b/syz-ci/jobs_test.go index 3d8e50201..b80f2d9f4 100644 --- a/syz-ci/jobs_test.go +++ b/syz-ci/jobs_test.go @@ -5,7 +5,7 @@ package main import ( "errors" - "reflect" + "fmt" "testing" "github.com/google/syzkaller/pkg/instance" @@ -105,7 +105,7 @@ func TestAggregateTestResults(t *testing.T) { } for i, test := range tests { rep, err := aggregateTestResults(test.results) - if !reflect.DeepEqual(err, test.err) { + if fmt.Sprint(err) != fmt.Sprint(test.err) { t.Errorf("test #%v: got err: %q, want: %q", i, err, test.err) } got := "" diff --git a/tools/syz-linter/linter.go b/tools/syz-linter/linter.go index a19bfa3f4..d69ca0a2a 100644 --- a/tools/syz-linter/linter.go +++ b/tools/syz-linter/linter.go @@ -25,6 +25,11 @@ import ( "unicode" "golang.org/x/tools/go/analysis" + "golang.org/x/tools/go/analysis/passes/atomicalign" + "golang.org/x/tools/go/analysis/passes/copylock" + "golang.org/x/tools/go/analysis/passes/deepequalerrors" + "golang.org/x/tools/go/analysis/passes/nilness" + "golang.org/x/tools/go/analysis/passes/structtag" ) var AnalyzerPlugin analyzerPlugin @@ -38,6 +43,12 @@ func main() { func (*analyzerPlugin) GetAnalyzers() []*analysis.Analyzer { return []*analysis.Analyzer{ SyzAnalyzer, + // Some standard analyzers that are not enabled in vet. + atomicalign.Analyzer, + copylock.Analyzer, + deepequalerrors.Analyzer, + nilness.Analyzer, + structtag.Analyzer, } } diff --git a/tools/syz-reporter/reporter.go b/tools/syz-reporter/reporter.go index 5657d2eb9..948809ea7 100644 --- a/tools/syz-reporter/reporter.go +++ b/tools/syz-reporter/reporter.go @@ -131,10 +131,6 @@ func readCrash(workdir, dir string) *UICrashType { return nil } desc := string(trimNewLines(descBytes)) - if err != nil { - return nil - } - descFile.Close() files, err := osutil.ListDir(filepath.Join(crashdir, dir)) |