From a1f3dc33dced2d337261b693b1ef1bf6a5bbce8d Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 22 May 2023 10:32:31 -0400 Subject: cmd/cgo: merge overlayDir into one package There are many copies of overlaydir_test.go between the cgo tests from when these couldn't share code. Now that they can, merge these copies into a cmd/cgo/internal/cgotest package. Change-Id: I203217f5d08e6306cb049a13718652cf7c447b80 Reviewed-on: https://go-review.googlesource.com/c/go/+/497078 Run-TryBot: Austin Clements Reviewed-by: Bryan Mills TryBot-Result: Gopher Robot --- src/cmd/cgo/internal/testshared/shared_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/cmd/cgo/internal/testshared/shared_test.go') diff --git a/src/cmd/cgo/internal/testshared/shared_test.go b/src/cmd/cgo/internal/testshared/shared_test.go index 05e87b9d50..6596d88952 100644 --- a/src/cmd/cgo/internal/testshared/shared_test.go +++ b/src/cmd/cgo/internal/testshared/shared_test.go @@ -7,6 +7,7 @@ package shared_test import ( "bufio" "bytes" + "cmd/cgo/internal/cgotest" "debug/elf" "encoding/binary" "flag" @@ -203,7 +204,7 @@ func TestMain(m *testing.M) { // It returns the directory within gopath at which the module root is located. func cloneTestdataModule(gopath string) (string, error) { modRoot := filepath.Join(gopath, "src", "testshared") - if err := overlayDir(modRoot, "testdata"); err != nil { + if err := cgotest.OverlayDir(modRoot, "testdata"); err != nil { return "", err } if err := os.WriteFile(filepath.Join(modRoot, "go.mod"), []byte("module testshared\n"), 0644); err != nil { @@ -255,7 +256,7 @@ func cloneGOROOTDeps(goroot string) error { if testing.Verbose() { fmt.Fprintf(os.Stderr, "+ cp -r %s %s\n", filepath.Join(oldGOROOT, dir), filepath.Join(goroot, dir)) } - if err := overlayDir(filepath.Join(goroot, dir), filepath.Join(oldGOROOT, dir)); err != nil { + if err := cgotest.OverlayDir(filepath.Join(goroot, dir), filepath.Join(oldGOROOT, dir)); err != nil { return err } } -- cgit v1.3-5-g9baa