]> Cypherpunks.ru repositories - gostls13.git/commit
misc/cgo/test: simplify for module mode
authorAustin Clements <austin@google.com>
Fri, 21 Oct 2022 19:18:14 +0000 (15:18 -0400)
committerAustin Clements <austin@google.com>
Fri, 4 Nov 2022 20:47:59 +0000 (20:47 +0000)
commitb079640404a1e83a23b95bd22ec67cedd38798a9
tree9be8abd26a787853b2b50b07a7da44eff291abfa
parent7e88b866f9576d6f9ddfe0a054da7383bfff54fa
misc/cgo/test: simplify for module mode

When we were first introducing module mode, CL 163418 moved many of
the tests in misc/cgo/test into their own test binary under testdata
so misc/cgo/test continued to work in both GOPATH mode and module
mode. This introduce a somewhat complicated test driver into
misc/cgo/test. Since the misc/cgo/test test had to invoke "go test" as
a subprocess, this required care to thread any build flags down into
the subprocess. The output from any failures of the sub-process was
also less than ideal.

Now that we don't have to worry about running these in GOPATH mode any
more, this CL moves all of the tests back into misc/cgo/test and drops
the test driver.

There are two slight complications:

- Test41761 was added after this split and has a C type "S" that's
  also present in misc/cgo/test itself. We rename that to keep that
  test working.

- TestCgo in go/internal/srcimporter now fails to import misc/cgo/test
  because misc/cgo/test now contains imports of other "misc" module
  packages and the importer it sets up isn't configured to allow that.
  We fix this by setting up a build context that's configured for
  this.

Preparation for #37486.

Change-Id: I3c4f73540e0482bbd493823cca44b0ce7fac01f3
Reviewed-on: https://go-review.googlesource.com/c/go/+/447355
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
75 files changed:
misc/cgo/test/cgo_linux_test.go
misc/cgo/test/cgo_test.go
misc/cgo/test/gcc68255.go [moved from misc/cgo/test/testdata/gcc68255.go with 92% similarity]
misc/cgo/test/gcc68255/a.go [moved from misc/cgo/test/testdata/gcc68255/a.go with 100% similarity]
misc/cgo/test/gcc68255/c.c [moved from misc/cgo/test/testdata/gcc68255/c.c with 100% similarity]
misc/cgo/test/gcc68255/c.h [moved from misc/cgo/test/testdata/gcc68255/c.h with 100% similarity]
misc/cgo/test/issue20266.go [moved from misc/cgo/test/testdata/issue20266.go with 100% similarity]
misc/cgo/test/issue20266/issue20266.h [moved from misc/cgo/test/testdata/issue20266/issue20266.h with 100% similarity]
misc/cgo/test/issue23555.go [moved from misc/cgo/test/testdata/issue23555.go with 80% similarity]
misc/cgo/test/issue23555a/a.go [moved from misc/cgo/test/testdata/issue23555a/a.go with 100% similarity]
misc/cgo/test/issue23555b/a.go [moved from misc/cgo/test/testdata/issue23555b/a.go with 100% similarity]
misc/cgo/test/issue24161_darwin_test.go [moved from misc/cgo/test/testdata/issue24161_darwin_test.go with 76% similarity]
misc/cgo/test/issue24161arg/def.go [moved from misc/cgo/test/testdata/issue24161arg/def.go with 100% similarity]
misc/cgo/test/issue24161arg/use.go [moved from misc/cgo/test/testdata/issue24161arg/use.go with 100% similarity]
misc/cgo/test/issue24161e0/main.go [moved from misc/cgo/test/testdata/issue24161e0/main.go with 100% similarity]
misc/cgo/test/issue24161e1/main.go [moved from misc/cgo/test/testdata/issue24161e1/main.go with 100% similarity]
misc/cgo/test/issue24161e2/main.go [moved from misc/cgo/test/testdata/issue24161e2/main.go with 100% similarity]
misc/cgo/test/issue24161res/restype.go [moved from misc/cgo/test/testdata/issue24161res/restype.go with 100% similarity]
misc/cgo/test/issue26213/jni.h [moved from misc/cgo/test/testdata/issue26213/jni.h with 100% similarity]
misc/cgo/test/issue26213/test26213.go [moved from misc/cgo/test/testdata/issue26213/test26213.go with 100% similarity]
misc/cgo/test/issue26430.go [moved from misc/cgo/test/testdata/issue26430.go with 89% similarity]
misc/cgo/test/issue26430/a.go [moved from misc/cgo/test/testdata/issue26430/a.go with 100% similarity]
misc/cgo/test/issue26430/b.go [moved from misc/cgo/test/testdata/issue26430/b.go with 100% similarity]
misc/cgo/test/issue26743.go [moved from misc/cgo/test/testdata/issue26743.go with 89% similarity]
misc/cgo/test/issue26743/a.go [moved from misc/cgo/test/testdata/issue26743/a.go with 100% similarity]
misc/cgo/test/issue26743/b.go [moved from misc/cgo/test/testdata/issue26743/b.go with 100% similarity]
misc/cgo/test/issue27054/egl.h [moved from misc/cgo/test/testdata/issue27054/egl.h with 100% similarity]
misc/cgo/test/issue27054/test27054.go [moved from misc/cgo/test/testdata/issue27054/test27054.go with 100% similarity]
misc/cgo/test/issue27340.go [moved from misc/cgo/test/testdata/issue27340.go with 90% similarity]
misc/cgo/test/issue27340/a.go [moved from misc/cgo/test/testdata/issue27340/a.go with 100% similarity]
misc/cgo/test/issue29563.go [moved from misc/cgo/test/testdata/issue29563.go with 84% similarity]
misc/cgo/test/issue29563/weak.go [moved from misc/cgo/test/testdata/issue29563/weak.go with 100% similarity]
misc/cgo/test/issue29563/weak1.c [moved from misc/cgo/test/testdata/issue29563/weak1.c with 100% similarity]
misc/cgo/test/issue29563/weak2.c [moved from misc/cgo/test/testdata/issue29563/weak2.c with 100% similarity]
misc/cgo/test/issue30527.go [moved from misc/cgo/test/testdata/issue30527.go with 90% similarity]
misc/cgo/test/issue30527/a.go [moved from misc/cgo/test/testdata/issue30527/a.go with 100% similarity]
misc/cgo/test/issue30527/b.go [moved from misc/cgo/test/testdata/issue30527/b.go with 100% similarity]
misc/cgo/test/issue41761.go [moved from misc/cgo/test/testdata/issue41761.go with 74% similarity]
misc/cgo/test/issue41761a/a.go [moved from misc/cgo/test/testdata/issue41761a/a.go with 82% similarity]
misc/cgo/test/issue43639.go [moved from misc/cgo/test/testdata/issue43639.go with 57% similarity]
misc/cgo/test/issue43639/a.go [moved from misc/cgo/test/testdata/issue43639/a.go with 100% similarity]
misc/cgo/test/issue52611.go [moved from misc/cgo/test/testdata/issue52611.go with 83% similarity]
misc/cgo/test/issue52611a/a.go [moved from misc/cgo/test/testdata/issue52611a/a.go with 100% similarity]
misc/cgo/test/issue52611a/b.go [moved from misc/cgo/test/testdata/issue52611a/b.go with 100% similarity]
misc/cgo/test/issue52611b/a.go [moved from misc/cgo/test/testdata/issue52611b/a.go with 100% similarity]
misc/cgo/test/issue52611b/b.go [moved from misc/cgo/test/testdata/issue52611b/b.go with 100% similarity]
misc/cgo/test/issue8756.go [moved from misc/cgo/test/testdata/issue8756.go with 85% similarity]
misc/cgo/test/issue8756/issue8756.go [moved from misc/cgo/test/testdata/issue8756/issue8756.go with 100% similarity]
misc/cgo/test/issue8828.go [moved from misc/cgo/test/testdata/issue8828.go with 91% similarity]
misc/cgo/test/issue8828/issue8828.c [moved from misc/cgo/test/testdata/issue8828/issue8828.c with 100% similarity]
misc/cgo/test/issue8828/trivial.go [moved from misc/cgo/test/testdata/issue8828/trivial.go with 100% similarity]
misc/cgo/test/issue9026.go [moved from misc/cgo/test/testdata/issue9026.go with 77% similarity]
misc/cgo/test/issue9026/issue9026.go [moved from misc/cgo/test/testdata/issue9026/issue9026.go with 100% similarity]
misc/cgo/test/issue9400/asm_386.s [moved from misc/cgo/test/testdata/issue9400/asm_386.s with 100% similarity]
misc/cgo/test/issue9400/asm_amd64x.s [moved from misc/cgo/test/testdata/issue9400/asm_amd64x.s with 100% similarity]
misc/cgo/test/issue9400/asm_arm.s [moved from misc/cgo/test/testdata/issue9400/asm_arm.s with 100% similarity]
misc/cgo/test/issue9400/asm_arm64.s [moved from misc/cgo/test/testdata/issue9400/asm_arm64.s with 100% similarity]
misc/cgo/test/issue9400/asm_loong64.s [moved from misc/cgo/test/testdata/issue9400/asm_loong64.s with 100% similarity]
misc/cgo/test/issue9400/asm_mips64x.s [moved from misc/cgo/test/testdata/issue9400/asm_mips64x.s with 100% similarity]
misc/cgo/test/issue9400/asm_mipsx.s [moved from misc/cgo/test/testdata/issue9400/asm_mipsx.s with 100% similarity]
misc/cgo/test/issue9400/asm_ppc64x.s [moved from misc/cgo/test/testdata/issue9400/asm_ppc64x.s with 100% similarity]
misc/cgo/test/issue9400/asm_riscv64.s [moved from misc/cgo/test/testdata/issue9400/asm_riscv64.s with 100% similarity]
misc/cgo/test/issue9400/asm_s390x.s [moved from misc/cgo/test/testdata/issue9400/asm_s390x.s with 100% similarity]
misc/cgo/test/issue9400/gccgo.go [moved from misc/cgo/test/testdata/issue9400/gccgo.go with 100% similarity]
misc/cgo/test/issue9400/stubs.go [moved from misc/cgo/test/testdata/issue9400/stubs.go with 100% similarity]
misc/cgo/test/issue9400_linux.go [moved from misc/cgo/test/testdata/issue9400_linux.go with 98% similarity]
misc/cgo/test/issue9510.go [moved from misc/cgo/test/testdata/issue9510.go with 89% similarity]
misc/cgo/test/issue9510a/a.go [moved from misc/cgo/test/testdata/issue9510a/a.go with 100% similarity]
misc/cgo/test/issue9510b/b.go [moved from misc/cgo/test/testdata/issue9510b/b.go with 100% similarity]
misc/cgo/test/overlaydir_test.go [deleted file]
misc/cgo/test/pkg_test.go [deleted file]
misc/cgo/test/test26213.go [moved from misc/cgo/test/testdata/test26213.go with 90% similarity]
misc/cgo/test/testdata/cgo_linux_test.go [deleted file]
misc/cgo/test/testdata/cgo_test.go [deleted file]
src/go/internal/srcimporter/srcimporter_test.go