From e17cdc41300f39d98a34f11ef50b3f6c70e072bf Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Tue, 29 Mar 2022 23:18:31 -0400 Subject: [PATCH] unix: fix staticcheck issues Change-Id: If7abd7a743c4359a9780401cec7c874d530ee268 Reviewed-on: https://go-review.googlesource.com/c/sys/+/396674 Trust: Matt Layher Run-TryBot: Matt Layher TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor --- unix/internal/mkmerge/mkmerge_test.go | 4 ++++ unix/syscall_freebsd_test.go | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/unix/internal/mkmerge/mkmerge_test.go b/unix/internal/mkmerge/mkmerge_test.go index 32072441..e61d7d47 100644 --- a/unix/internal/mkmerge/mkmerge_test.go +++ b/unix/internal/mkmerge/mkmerge_test.go @@ -410,6 +410,10 @@ const ( } got, err := filter(inFiles[0].src, commonSet.keepCommon) + if err != nil { + t.Fatal(err) + } + expected := []byte(mergedFile) if !bytes.Equal(got, expected) { diff --git a/unix/syscall_freebsd_test.go b/unix/syscall_freebsd_test.go index 08411489..de02a1a4 100644 --- a/unix/syscall_freebsd_test.go +++ b/unix/syscall_freebsd_test.go @@ -221,14 +221,14 @@ func OpenatTest() { panic(fmt.Sprintf("CapRightsIsSet failed: %s %#v", err, err)) } if !b { - panic(fmt.Sprintf("Unexpected rights")) + panic("Unexpected rights") } b, err = unix.CapRightsIsSet(r, []uint64{unix.CAP_READ, unix.CAP_LOOKUP, unix.CAP_WRITE}) if err != nil { panic(fmt.Sprintf("CapRightsIsSet failed: %s %#v", err, err)) } if b { - panic(fmt.Sprintf("Unexpected rights (2)")) + panic("Unexpected rights (2)") } // Can no longer create a file