aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2023-06-16 15:56:37 -0400
committerGopher Robot <gobot@golang.org>2023-06-16 20:47:32 +0000
commit0183c1aa02dc2efd17d9693d960ca6f4266eee8a (patch)
tree137e9364c0384760a7528bdcdb531713c7be9f2b
parent199fbd4b5911d90a99b13db44e5f2a9ca85f0d9e (diff)
downloadgo-0183c1aa02dc2efd17d9693d960ca6f4266eee8a.tar.gz
go-0183c1aa02dc2efd17d9693d960ca6f4266eee8a.zip
cmd/compile/internal/syntax: skip GOROOT/misc in TestStdLib if it doesn't exist
cmd/distpack deletes GOROOT/misc from its distribution. For #24904. Change-Id: I47c60e9a6d39d015683dde7f44bf7c34517b6a8e Reviewed-on: https://go-review.googlesource.com/c/go/+/504059 TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@google.com> Auto-Submit: Bryan Mills <bcmills@google.com> Run-TryBot: Bryan Mills <bcmills@google.com>
-rw-r--r--src/cmd/compile/internal/syntax/parser_test.go12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/syntax/parser_test.go b/src/cmd/compile/internal/syntax/parser_test.go
index 74583ca903..d5d4290f59 100644
--- a/src/cmd/compile/internal/syntax/parser_test.go
+++ b/src/cmd/compile/internal/syntax/parser_test.go
@@ -70,6 +70,18 @@ func TestStdLib(t *testing.T) {
filepath.Join(goroot, "src"),
filepath.Join(goroot, "misc"),
} {
+ if filepath.Base(dir) == "misc" {
+ // cmd/distpack deletes GOROOT/misc, so skip that directory if it isn't present.
+ // cmd/distpack also requires GOROOT/VERSION to exist, so use that to
+ // suppress false-positive skips.
+ if _, err := os.Stat(dir); os.IsNotExist(err) {
+ if _, err := os.Stat(filepath.Join(testenv.GOROOT(t), "VERSION")); err == nil {
+ fmt.Printf("%s not present; skipping\n", dir)
+ continue
+ }
+ }
+ }
+
walkDirs(t, dir, func(filename string) {
if skipRx != nil && skipRx.MatchString(filename) {
// Always report skipped files since regexp