From 36d1c4540af3ef058d68092e41af05aa4a8c5eca Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 8 Mar 2018 18:48:26 +0100 Subject: all: fix gometalinter warnings Fix typos, non-canonical code, remove dead code, etc. --- pkg/kernel/kernel.go | 6 ++---- pkg/kernel/kernel_test.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'pkg/kernel') diff --git a/pkg/kernel/kernel.go b/pkg/kernel/kernel.go index 2c35bcc40..f1bdcdc83 100644 --- a/pkg/kernel/kernel.go +++ b/pkg/kernel/kernel.go @@ -48,10 +48,8 @@ func Build(dir, compiler, config string) error { } cmd.Dir = dir // Build of a large kernel can take a while on a 1 CPU VM. - if _, err := osutil.Run(3*time.Hour, cmd); err != nil { - return err - } - return nil + _, err := osutil.Run(3*time.Hour, cmd) + return err } // CreateImage creates a disk image that is suitable for syzkaller. diff --git a/pkg/kernel/kernel_test.go b/pkg/kernel/kernel_test.go index 750fa50eb..18d7936d0 100644 --- a/pkg/kernel/kernel_test.go +++ b/pkg/kernel/kernel_test.go @@ -21,7 +21,7 @@ func TestCompilerIdentity(t *testing.T) { if len(id) == 0 { t.Fatalf("identity is empty") } - if strings.Index(id, "\n") != -1 { + if strings.Contains(id, "\n") { t.Fatalf("identity contains a new line") } // We don't know what's the right answer, -- cgit mrf-deployment