From fb6f38dda15d4155b500f6b3e1a311a951a22b69 Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Tue, 1 Aug 2023 13:43:08 -0400 Subject: [PATCH] cmd/distpack: test for .DS_Store files in all directories macOS may write a .DS_Store file to any directory at any time in the general case, unfortunately. Expand test rules to catch them no matter where they may appear. For #24904. Change-Id: I98a2bb5d0ae2ab3a191ff87b33d6f8048ca39aa8 Reviewed-on: https://go-review.googlesource.com/c/go/+/514898 Reviewed-by: Russ Cox Reviewed-by: Dmitri Shuralyov Run-TryBot: Dmitri Shuralyov TryBot-Result: Gopher Robot Auto-Submit: Dmitri Shuralyov --- src/cmd/distpack/test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/distpack/test.go b/src/cmd/distpack/test.go index 4544d72d1f386..22b54b5fe123b 100644 --- a/src/cmd/distpack/test.go +++ b/src/cmd/distpack/test.go @@ -26,7 +26,7 @@ var srcRules = []testRule{ {name: "go/VERSION"}, {name: "go/src/cmd/go/main.go"}, {name: "go/src/bytes/bytes.go"}, - {name: "go/.DS_Store", exclude: true}, + {name: "**/.DS_Store", exclude: true}, {name: "go/.git", exclude: true}, {name: "go/.gitattributes", exclude: true}, {name: "go/.github", exclude: true}, @@ -44,7 +44,7 @@ var zipRules = []testRule{ {name: "go/src/cmd/go/main.go"}, {name: "go/src/bytes/bytes.go"}, - {name: "go/.DS_Store", exclude: true}, + {name: "**/.DS_Store", exclude: true}, {name: "go/.git", exclude: true}, {name: "go/.gitattributes", exclude: true}, {name: "go/.github", exclude: true}, @@ -73,7 +73,7 @@ var modRules = []testRule{ {name: "golang.org/toolchain@*/src/cmd/go/main.go"}, {name: "golang.org/toolchain@*/src/bytes/bytes.go"}, - {name: "golang.org/toolchain@*/.DS_Store", exclude: true}, + {name: "**/.DS_Store", exclude: true}, {name: "golang.org/toolchain@*/.git", exclude: true}, {name: "golang.org/toolchain@*/.gitattributes", exclude: true}, {name: "golang.org/toolchain@*/.github", exclude: true},