From 6b818b08f9a3a1ecce453b94f60497986d3db27d Mon Sep 17 00:00:00 2001 From: Jes Cok Date: Wed, 8 Nov 2023 15:04:42 +0000 Subject: [PATCH] internal/zstd: use dynamic path resolution for xxhsum in FuzzXXHash Updates #64000 Change-Id: I71fb80128d7e2a1f82322cbf04f74db01dcc631b GitHub-Last-Rev: 74135946664b1b65a0de0a9228de998429dc74f9 GitHub-Pull-Request: golang/go#64003 Reviewed-on: https://go-review.googlesource.com/c/go/+/539938 Run-TryBot: Jes Cok TryBot-Result: Gopher Robot LUCI-TryBot-Result: Go LUCI Reviewed-by: Bryan Mills Reviewed-by: Heschi Kreinick --- src/internal/zstd/xxhash_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/internal/zstd/xxhash_test.go b/src/internal/zstd/xxhash_test.go index 032739fbc0..68ca558c5f 100644 --- a/src/internal/zstd/xxhash_test.go +++ b/src/internal/zstd/xxhash_test.go @@ -67,10 +67,16 @@ func TestLargeXXHash(t *testing.T) { } } -func FuzzXXHash(f *testing.F) { - if _, err := os.Stat("/usr/bin/xxhsum"); err != nil { - f.Skip("skipping because /usr/bin/xxhsum does not exist") +func findXxhsum(t testing.TB) string { + xxhsum, err := exec.LookPath("xxhsum") + if err != nil { + t.Skip("skipping because xxhsum not found") } + return xxhsum +} + +func FuzzXXHash(f *testing.F) { + xxhsum := findXxhsum(f) for _, test := range xxHashTests { f.Add([]byte(test.data)) @@ -84,7 +90,7 @@ func FuzzXXHash(f *testing.F) { f.Add(bigData(f)) f.Fuzz(func(t *testing.T, b []byte) { - cmd := exec.Command("/usr/bin/xxhsum", "-H64") + cmd := exec.Command(xxhsum, "-H64") cmd.Stdin = bytes.NewReader(b) var hhsumHash bytes.Buffer cmd.Stdout = &hhsumHash -- 2.44.0