From c3ea2961cbe8299d1a79eb7dc3f42675d595a49a Mon Sep 17 00:00:00 2001 From: Ross Light Date: Wed, 7 Nov 2018 14:11:44 -0800 Subject: [PATCH] wire: in tests, don't copy want/wire_gen.go into the temporary GOPATH (google/go-cloud#646) This does not change the results of the test, but should not be happening. --- internal/wire/wire_test.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/wire/wire_test.go b/internal/wire/wire_test.go index a8e3bf3..217f62d 100644 --- a/internal/wire/wire_test.go +++ b/internal/wire/wire_test.go @@ -488,13 +488,17 @@ func loadTestCase(root string, wireGoSrc []byte) (*testCase, error) { if err != nil { return err } - if !info.Mode().IsRegular() || filepath.Ext(src) != ".go" { - return nil - } rel, err := filepath.Rel(root, src) if err != nil { return err // unlikely } + if info.Mode().IsDir() && rel == "want" { + // The "want" directory should not be included in goFiles. + return filepath.SkipDir + } + if !info.Mode().IsRegular() || filepath.Ext(src) != ".go" { + return nil + } data, err := ioutil.ReadFile(src) if err != nil { return err