misc/cgo: move registerCgoTests tests to cmd/cgo/internal

This moves the remaining cgo tests.

For #37486.

Change-Id: I99dea5a312a1974de338461a8b02242e5c1bae62
Reviewed-on: https://go-review.googlesource.com/c/go/+/492721
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>

131 files changed, 43 insertions, 39 deletions

diff --git a/misc/cgo/test/backdoor.go b/src/cmd/cgo/internal/test/backdoor.go
index 6fb33d66cb..6fb33d66cb 100644
--- a/misc/cgo/test/backdoor.go
+++ b/src/cmd/cgo/internal/test/backdoor.go
diff --git a/misc/cgo/test/buildid_linux.go b/src/cmd/cgo/internal/test/buildid_linux.go
index 84d3edb664..84d3edb664 100644
--- a/misc/cgo/test/buildid_linux.go
+++ b/src/cmd/cgo/internal/test/buildid_linux.go
diff --git a/misc/cgo/test/callback.go b/src/cmd/cgo/internal/test/callback.go
index 08dd9b39d8..478bf8294a 100644
--- a/misc/cgo/test/callback.go
+++ b/src/cmd/cgo/internal/test/callback.go
@@ -211,7 +211,7 @@ func testCallbackCallers(t *testing.T) {
 		}
 		// In module mode, this package has a fully-qualified import path.
 		// Remove it if present.
-		fname = strings.TrimPrefix(fname, "misc/cgo/")
+		fname = strings.TrimPrefix(fname, "cmd/cgo/internal/")
 
 		namei := ""
 		if i < len(name) {
diff --git a/misc/cgo/test/callback_c.c b/src/cmd/cgo/internal/test/callback_c.c
index 8ecf70f272..8ecf70f272 100644
--- a/misc/cgo/test/callback_c.c
+++ b/src/cmd/cgo/internal/test/callback_c.c
diff --git a/misc/cgo/test/callback_c_gc.c b/src/cmd/cgo/internal/test/callback_c_gc.c
index c6666c2b4e..c6666c2b4e 100644
--- a/misc/cgo/test/callback_c_gc.c
+++ b/src/cmd/cgo/internal/test/callback_c_gc.c
diff --git a/misc/cgo/test/callback_c_gccgo.c b/src/cmd/cgo/internal/test/callback_c_gccgo.c
index 91d37f02d8..91d37f02d8 100644
--- a/misc/cgo/test/callback_c_gccgo.c
+++ b/src/cmd/cgo/internal/test/callback_c_gccgo.c
diff --git a/misc/cgo/test/cgo_linux_test.go b/src/cmd/cgo/internal/test/cgo_linux_test.go
index 3defc32ffd..3defc32ffd 100644
--- a/misc/cgo/test/cgo_linux_test.go
+++ b/src/cmd/cgo/internal/test/cgo_linux_test.go
diff --git a/misc/cgo/test/cgo_stubs_android_test.go b/src/cmd/cgo/internal/test/cgo_stubs_android_test.go
index a1c2482ab8..a1c2482ab8 100644
--- a/misc/cgo/test/cgo_stubs_android_test.go
+++ b/src/cmd/cgo/internal/test/cgo_stubs_android_test.go
diff --git a/misc/cgo/test/cgo_test.go b/src/cmd/cgo/internal/test/cgo_test.go
index 5a07c4c0fa..5a07c4c0fa 100644
--- a/misc/cgo/test/cgo_test.go
+++ b/src/cmd/cgo/internal/test/cgo_test.go
diff --git a/misc/cgo/test/cgo_thread_lock.go b/src/cmd/cgo/internal/test/cgo_thread_lock.go
index 1c983375d9..1c983375d9 100644
--- a/misc/cgo/test/cgo_thread_lock.go
+++ b/src/cmd/cgo/internal/test/cgo_thread_lock.go
diff --git a/misc/cgo/test/cgo_unix_test.go b/src/cmd/cgo/internal/test/cgo_unix_test.go
index 5c1f9b7e40..5c1f9b7e40 100644
--- a/misc/cgo/test/cgo_unix_test.go
+++ b/src/cmd/cgo/internal/test/cgo_unix_test.go
diff --git a/misc/cgo/test/cthread_unix.c b/src/cmd/cgo/internal/test/cthread_unix.c
index b6ec39816b..b6ec39816b 100644
--- a/misc/cgo/test/cthread_unix.c
+++ b/src/cmd/cgo/internal/test/cthread_unix.c
diff --git a/misc/cgo/test/cthread_windows.c b/src/cmd/cgo/internal/test/cthread_windows.c
index 3a62ddd373..3a62ddd373 100644
--- a/misc/cgo/test/cthread_windows.c
+++ b/src/cmd/cgo/internal/test/cthread_windows.c
diff --git a/misc/cgo/test/gcc68255.go b/src/cmd/cgo/internal/test/gcc68255.go
index 954bba9b5c..f5493a9c67 100644
--- a/misc/cgo/test/gcc68255.go
+++ b/src/cmd/cgo/internal/test/gcc68255.go
@@ -9,7 +9,7 @@ package cgotest
 import (
 	"testing"
 
-	"misc/cgo/test/gcc68255"
+	"cmd/cgo/internal/test/gcc68255"
 )
 
 func testGCC68255(t *testing.T) {
diff --git a/misc/cgo/test/gcc68255/a.go b/src/cmd/cgo/internal/test/gcc68255/a.go
index e106dee3ec..e106dee3ec 100644
--- a/misc/cgo/test/gcc68255/a.go
+++ b/src/cmd/cgo/internal/test/gcc68255/a.go
diff --git a/misc/cgo/test/gcc68255/c.c b/src/cmd/cgo/internal/test/gcc68255/c.c
index a4fe193825..a4fe193825 100644
--- a/misc/cgo/test/gcc68255/c.c
+++ b/src/cmd/cgo/internal/test/gcc68255/c.c
diff --git a/misc/cgo/test/gcc68255/c.h b/src/cmd/cgo/internal/test/gcc68255/c.h
index 05ecd8187c..05ecd8187c 100644
--- a/misc/cgo/test/gcc68255/c.h
+++ b/src/cmd/cgo/internal/test/gcc68255/c.h
diff --git a/misc/cgo/test/issue1435.go b/src/cmd/cgo/internal/test/issue1435.go
index a672e26aa0..a672e26aa0 100644
--- a/misc/cgo/test/issue1435.go
+++ b/src/cmd/cgo/internal/test/issue1435.go
diff --git a/misc/cgo/test/issue18146.go b/src/cmd/cgo/internal/test/issue18146.go
index d302bd029f..d302bd029f 100644
--- a/misc/cgo/test/issue18146.go
+++ b/src/cmd/cgo/internal/test/issue18146.go
diff --git a/misc/cgo/test/issue20266.go b/src/cmd/cgo/internal/test/issue20266.go
index 9f95086cc7..9f95086cc7 100644
--- a/misc/cgo/test/issue20266.go
+++ b/src/cmd/cgo/internal/test/issue20266.go
diff --git a/misc/cgo/test/issue20266/issue20266.h b/src/cmd/cgo/internal/test/issue20266/issue20266.h
index 8d3258ec6b..8d3258ec6b 100644
--- a/misc/cgo/test/issue20266/issue20266.h
+++ b/src/cmd/cgo/internal/test/issue20266/issue20266.h
diff --git a/misc/cgo/test/issue20910.c b/src/cmd/cgo/internal/test/issue20910.c
index e8d623fc98..e8d623fc98 100644
--- a/misc/cgo/test/issue20910.c
+++ b/src/cmd/cgo/internal/test/issue20910.c
diff --git a/misc/cgo/test/issue21897.go b/src/cmd/cgo/internal/test/issue21897.go
index cd3600a0cf..cd3600a0cf 100644
--- a/misc/cgo/test/issue21897.go
+++ b/src/cmd/cgo/internal/test/issue21897.go
diff --git a/misc/cgo/test/issue21897b.go b/src/cmd/cgo/internal/test/issue21897b.go
index e12564c216..e12564c216 100644
--- a/misc/cgo/test/issue21897b.go
+++ b/src/cmd/cgo/internal/test/issue21897b.go
diff --git a/misc/cgo/test/issue23555.go b/src/cmd/cgo/internal/test/issue23555.go
index 299fdcb914..1232148849 100644
--- a/misc/cgo/test/issue23555.go
+++ b/src/cmd/cgo/internal/test/issue23555.go
@@ -10,6 +10,6 @@
 package cgotest
 
 import (
-	_ "misc/cgo/test/issue23555a"
-	_ "misc/cgo/test/issue23555b"
+	_ "cmd/cgo/internal/test/issue23555a"
+	_ "cmd/cgo/internal/test/issue23555b"
 )
diff --git a/misc/cgo/test/issue23555a/a.go b/src/cmd/cgo/internal/test/issue23555a/a.go
index cb6626bb2b..cb6626bb2b 100644
--- a/misc/cgo/test/issue23555a/a.go
+++ b/src/cmd/cgo/internal/test/issue23555a/a.go
diff --git a/misc/cgo/test/issue23555b/a.go b/src/cmd/cgo/internal/test/issue23555b/a.go
index cb6626bb2b..cb6626bb2b 100644
--- a/misc/cgo/test/issue23555b/a.go
+++ b/src/cmd/cgo/internal/test/issue23555b/a.go
diff --git a/misc/cgo/test/issue24161_darwin_test.go b/src/cmd/cgo/internal/test/issue24161_darwin_test.go
index 9054d6205c..9d087519df 100644
--- a/misc/cgo/test/issue24161_darwin_test.go
+++ b/src/cmd/cgo/internal/test/issue24161_darwin_test.go
@@ -9,11 +9,11 @@ package cgotest
 import (
 	"testing"
 
-	"misc/cgo/test/issue24161arg"
-	"misc/cgo/test/issue24161e0"
-	"misc/cgo/test/issue24161e1"
-	"misc/cgo/test/issue24161e2"
-	"misc/cgo/test/issue24161res"
+	"cmd/cgo/internal/test/issue24161arg"
+	"cmd/cgo/internal/test/issue24161e0"
+	"cmd/cgo/internal/test/issue24161e1"
+	"cmd/cgo/internal/test/issue24161e2"
+	"cmd/cgo/internal/test/issue24161res"
 )
 
 func Test24161Arg(t *testing.T) {
diff --git a/misc/cgo/test/issue24161arg/def.go b/src/cmd/cgo/internal/test/issue24161arg/def.go
index acea3aeb34..acea3aeb34 100644
--- a/misc/cgo/test/issue24161arg/def.go
+++ b/src/cmd/cgo/internal/test/issue24161arg/def.go
diff --git a/misc/cgo/test/issue24161arg/use.go b/src/cmd/cgo/internal/test/issue24161arg/use.go
index 7987105efa..7987105efa 100644
--- a/misc/cgo/test/issue24161arg/use.go
+++ b/src/cmd/cgo/internal/test/issue24161arg/use.go
diff --git a/misc/cgo/test/issue24161e0/main.go b/src/cmd/cgo/internal/test/issue24161e0/main.go
index 5912fe27cc..5912fe27cc 100644
--- a/misc/cgo/test/issue24161e0/main.go
+++ b/src/cmd/cgo/internal/test/issue24161e0/main.go
diff --git a/misc/cgo/test/issue24161e1/main.go b/src/cmd/cgo/internal/test/issue24161e1/main.go
index 8c2bc6ec07..8c2bc6ec07 100644
--- a/misc/cgo/test/issue24161e1/main.go
+++ b/src/cmd/cgo/internal/test/issue24161e1/main.go
diff --git a/misc/cgo/test/issue24161e2/main.go b/src/cmd/cgo/internal/test/issue24161e2/main.go
index 159f4796fe..159f4796fe 100644
--- a/misc/cgo/test/issue24161e2/main.go
+++ b/src/cmd/cgo/internal/test/issue24161e2/main.go
diff --git a/misc/cgo/test/issue24161res/restype.go b/src/cmd/cgo/internal/test/issue24161res/restype.go
index 07cb98dbcf..07cb98dbcf 100644
--- a/misc/cgo/test/issue24161res/restype.go
+++ b/src/cmd/cgo/internal/test/issue24161res/restype.go
diff --git a/misc/cgo/test/issue26213/jni.h b/src/cmd/cgo/internal/test/issue26213/jni.h
index 0c76979a5a..0c76979a5a 100644
--- a/misc/cgo/test/issue26213/jni.h
+++ b/src/cmd/cgo/internal/test/issue26213/jni.h
diff --git a/misc/cgo/test/issue26213/test26213.go b/src/cmd/cgo/internal/test/issue26213/test26213.go
index 5d1f637ff9..5d1f637ff9 100644
--- a/misc/cgo/test/issue26213/test26213.go
+++ b/src/cmd/cgo/internal/test/issue26213/test26213.go
diff --git a/misc/cgo/test/issue26430.go b/src/cmd/cgo/internal/test/issue26430.go
index cf276a0362..837a745cb4 100644
--- a/misc/cgo/test/issue26430.go
+++ b/src/cmd/cgo/internal/test/issue26430.go
@@ -9,4 +9,4 @@
 
 package cgotest
 
-import _ "misc/cgo/test/issue26430"
+import _ "cmd/cgo/internal/test/issue26430"
diff --git a/misc/cgo/test/issue26430/a.go b/src/cmd/cgo/internal/test/issue26430/a.go
index fbaa46b1e8..fbaa46b1e8 100644
--- a/misc/cgo/test/issue26430/a.go
+++ b/src/cmd/cgo/internal/test/issue26430/a.go
diff --git a/misc/cgo/test/issue26430/b.go b/src/cmd/cgo/internal/test/issue26430/b.go
index a7c527cde3..a7c527cde3 100644
--- a/misc/cgo/test/issue26430/b.go
+++ b/src/cmd/cgo/internal/test/issue26430/b.go
diff --git a/misc/cgo/test/issue26743.go b/src/cmd/cgo/internal/test/issue26743.go
index 903caeeada..b6e1ac58bc 100644
--- a/misc/cgo/test/issue26743.go
+++ b/src/cmd/cgo/internal/test/issue26743.go
@@ -9,4 +9,4 @@
 
 package cgotest
 
-import _ "misc/cgo/test/issue26743"
+import _ "cmd/cgo/internal/test/issue26743"
diff --git a/misc/cgo/test/issue26743/a.go b/src/cmd/cgo/internal/test/issue26743/a.go
index a3df1797b3..a3df1797b3 100644
--- a/misc/cgo/test/issue26743/a.go
+++ b/src/cmd/cgo/internal/test/issue26743/a.go
diff --git a/misc/cgo/test/issue26743/b.go b/src/cmd/cgo/internal/test/issue26743/b.go
index c5f1ae478c..c5f1ae478c 100644
--- a/misc/cgo/test/issue26743/b.go
+++ b/src/cmd/cgo/internal/test/issue26743/b.go
diff --git a/misc/cgo/test/issue27054/egl.h b/src/cmd/cgo/internal/test/issue27054/egl.h
index 30796273e8..30796273e8 100644
--- a/misc/cgo/test/issue27054/egl.h
+++ b/src/cmd/cgo/internal/test/issue27054/egl.h
diff --git a/misc/cgo/test/issue27054/test27054.go b/src/cmd/cgo/internal/test/issue27054/test27054.go
index 01bf43a913..01bf43a913 100644
--- a/misc/cgo/test/issue27054/test27054.go
+++ b/src/cmd/cgo/internal/test/issue27054/test27054.go
diff --git a/misc/cgo/test/issue27340.go b/src/cmd/cgo/internal/test/issue27340.go
index d70f104179..a6de328a7f 100644
--- a/misc/cgo/test/issue27340.go
+++ b/src/cmd/cgo/internal/test/issue27340.go
@@ -9,6 +9,6 @@
 
 package cgotest
 
-import "misc/cgo/test/issue27340"
+import "cmd/cgo/internal/test/issue27340"
 
 var issue27340Var = issue27340.Issue27340GoFunc
diff --git a/misc/cgo/test/issue27340/a.go b/src/cmd/cgo/internal/test/issue27340/a.go
index f5b120c1fd..f5b120c1fd 100644
--- a/misc/cgo/test/issue27340/a.go
+++ b/src/cmd/cgo/internal/test/issue27340/a.go
diff --git a/misc/cgo/test/issue29563.go b/src/cmd/cgo/internal/test/issue29563.go
index 800b5461af..f5077598ec 100644
--- a/misc/cgo/test/issue29563.go
+++ b/src/cmd/cgo/internal/test/issue29563.go
@@ -9,4 +9,4 @@
 
 package cgotest
 
-import _ "misc/cgo/test/issue29563"
+import _ "cmd/cgo/internal/test/issue29563"
diff --git a/misc/cgo/test/issue29563/weak.go b/src/cmd/cgo/internal/test/issue29563/weak.go
index 21cf635cca..21cf635cca 100644
--- a/misc/cgo/test/issue29563/weak.go
+++ b/src/cmd/cgo/internal/test/issue29563/weak.go
diff --git a/misc/cgo/test/issue29563/weak1.c b/src/cmd/cgo/internal/test/issue29563/weak1.c
index 86a22734ad..86a22734ad 100644
--- a/misc/cgo/test/issue29563/weak1.c
+++ b/src/cmd/cgo/internal/test/issue29563/weak1.c
diff --git a/misc/cgo/test/issue29563/weak2.c b/src/cmd/cgo/internal/test/issue29563/weak2.c
index e01eae8b58..e01eae8b58 100644
--- a/misc/cgo/test/issue29563/weak2.c
+++ b/src/cmd/cgo/internal/test/issue29563/weak2.c
diff --git a/misc/cgo/test/issue30527.go b/src/cmd/cgo/internal/test/issue30527.go
index 982455084d..d3e57b6972 100644
--- a/misc/cgo/test/issue30527.go
+++ b/src/cmd/cgo/internal/test/issue30527.go
@@ -9,7 +9,7 @@
 
 package cgotest
 
-import "misc/cgo/test/issue30527"
+import "cmd/cgo/internal/test/issue30527"
 
 func issue30527G() {
 	issue30527.G(nil)
diff --git a/misc/cgo/test/issue30527/a.go b/src/cmd/cgo/internal/test/issue30527/a.go
index eb50147b39..eb50147b39 100644
--- a/misc/cgo/test/issue30527/a.go
+++ b/src/cmd/cgo/internal/test/issue30527/a.go
diff --git a/misc/cgo/test/issue30527/b.go b/src/cmd/cgo/internal/test/issue30527/b.go
index 87e8255bd8..87e8255bd8 100644
--- a/misc/cgo/test/issue30527/b.go
+++ b/src/cmd/cgo/internal/test/issue30527/b.go
diff --git a/misc/cgo/test/issue31891.c b/src/cmd/cgo/internal/test/issue31891.c
index 67a0dda2d6..67a0dda2d6 100644
--- a/misc/cgo/test/issue31891.c
+++ b/src/cmd/cgo/internal/test/issue31891.c
diff --git a/misc/cgo/test/issue4029.c b/src/cmd/cgo/internal/test/issue4029.c
index 212d6922f8..212d6922f8 100644
--- a/misc/cgo/test/issue4029.c
+++ b/src/cmd/cgo/internal/test/issue4029.c
diff --git a/misc/cgo/test/issue4029.go b/src/cmd/cgo/internal/test/issue4029.go
index 686b7679f3..686b7679f3 100644
--- a/misc/cgo/test/issue4029.go
+++ b/src/cmd/cgo/internal/test/issue4029.go
diff --git a/misc/cgo/test/issue4029w.go b/src/cmd/cgo/internal/test/issue4029w.go
index 91dad6abcb..91dad6abcb 100644
--- a/misc/cgo/test/issue4029w.go
+++ b/src/cmd/cgo/internal/test/issue4029w.go
diff --git a/misc/cgo/test/issue41761.go b/src/cmd/cgo/internal/test/issue41761.go
index ed45b46c46..27d904760d 100644
--- a/misc/cgo/test/issue41761.go
+++ b/src/cmd/cgo/internal/test/issue41761.go
@@ -10,7 +10,7 @@ package cgotest
 import "C"
 
 import (
-	"misc/cgo/test/issue41761a"
+	"cmd/cgo/internal/test/issue41761a"
 	"testing"
 )
 
diff --git a/misc/cgo/test/issue41761a/a.go b/src/cmd/cgo/internal/test/issue41761a/a.go
index 1c52782e05..1c52782e05 100644
--- a/misc/cgo/test/issue41761a/a.go
+++ b/src/cmd/cgo/internal/test/issue41761a/a.go
diff --git a/misc/cgo/test/issue42018.go b/src/cmd/cgo/internal/test/issue42018.go
index 6b369bfab4..6b369bfab4 100644
--- a/misc/cgo/test/issue42018.go
+++ b/src/cmd/cgo/internal/test/issue42018.go
diff --git a/misc/cgo/test/issue42018_windows.go b/src/cmd/cgo/internal/test/issue42018_windows.go
index 8f4570ab2a..8f4570ab2a 100644
--- a/misc/cgo/test/issue42018_windows.go
+++ b/src/cmd/cgo/internal/test/issue42018_windows.go
diff --git a/misc/cgo/test/issue42495.go b/src/cmd/cgo/internal/test/issue42495.go
index 509a67d9a3..509a67d9a3 100644
--- a/misc/cgo/test/issue42495.go
+++ b/src/cmd/cgo/internal/test/issue42495.go
diff --git a/misc/cgo/test/issue4273.c b/src/cmd/cgo/internal/test/issue4273.c
index cac98768de..cac98768de 100644
--- a/misc/cgo/test/issue4273.c
+++ b/src/cmd/cgo/internal/test/issue4273.c
diff --git a/misc/cgo/test/issue4273b.c b/src/cmd/cgo/internal/test/issue4273b.c
index 71e3f0d976..71e3f0d976 100644
--- a/misc/cgo/test/issue4273b.c
+++ b/src/cmd/cgo/internal/test/issue4273b.c
diff --git a/misc/cgo/test/issue4339.c b/src/cmd/cgo/internal/test/issue4339.c
index 15d0004078..15d0004078 100644
--- a/misc/cgo/test/issue4339.c
+++ b/src/cmd/cgo/internal/test/issue4339.c
diff --git a/misc/cgo/test/issue4339.h b/src/cmd/cgo/internal/test/issue4339.h
index 20f6cebb6b..20f6cebb6b 100644
--- a/misc/cgo/test/issue4339.h
+++ b/src/cmd/cgo/internal/test/issue4339.h
diff --git a/misc/cgo/test/issue43639.go b/src/cmd/cgo/internal/test/issue43639.go
index 38dae41d5e..c297bfe37f 100644
--- a/misc/cgo/test/issue43639.go
+++ b/src/cmd/cgo/internal/test/issue43639.go
@@ -6,6 +6,6 @@
 
 package cgotest
 
-// Issue 43639: No runtime test needed, make sure package misc/cgo/test/issue43639 compiles well.
+// Issue 43639: No runtime test needed, make sure package cmd/cgo/internal/test/issue43639 compiles well.
 
-import _ "misc/cgo/test/issue43639"
+import _ "cmd/cgo/internal/test/issue43639"
diff --git a/misc/cgo/test/issue43639/a.go b/src/cmd/cgo/internal/test/issue43639/a.go
index fe37d5e4b0..fe37d5e4b0 100644
--- a/misc/cgo/test/issue43639/a.go
+++ b/src/cmd/cgo/internal/test/issue43639/a.go
diff --git a/misc/cgo/test/issue52611.go b/src/cmd/cgo/internal/test/issue52611.go
index a190a10884..9082a53801 100644
--- a/misc/cgo/test/issue52611.go
+++ b/src/cmd/cgo/internal/test/issue52611.go
@@ -10,6 +10,6 @@
 package cgotest
 
 import (
-	_ "misc/cgo/test/issue52611a"
-	_ "misc/cgo/test/issue52611b"
+	_ "cmd/cgo/internal/test/issue52611a"
+	_ "cmd/cgo/internal/test/issue52611b"
 )
diff --git a/misc/cgo/test/issue52611a/a.go b/src/cmd/cgo/internal/test/issue52611a/a.go
index 0764688ec4..0764688ec4 100644
--- a/misc/cgo/test/issue52611a/a.go
+++ b/src/cmd/cgo/internal/test/issue52611a/a.go
diff --git a/misc/cgo/test/issue52611a/b.go b/src/cmd/cgo/internal/test/issue52611a/b.go
index 74a50c5dea..74a50c5dea 100644
--- a/misc/cgo/test/issue52611a/b.go
+++ b/src/cmd/cgo/internal/test/issue52611a/b.go
diff --git a/misc/cgo/test/issue52611b/a.go b/src/cmd/cgo/internal/test/issue52611b/a.go
index 730b52f5e9..730b52f5e9 100644
--- a/misc/cgo/test/issue52611b/a.go
+++ b/src/cmd/cgo/internal/test/issue52611b/a.go
diff --git a/misc/cgo/test/issue52611b/b.go b/src/cmd/cgo/internal/test/issue52611b/b.go
index d304175395..d304175395 100644
--- a/misc/cgo/test/issue52611b/b.go
+++ b/src/cmd/cgo/internal/test/issue52611b/b.go
diff --git a/misc/cgo/test/issue5548_c.c b/src/cmd/cgo/internal/test/issue5548_c.c
index 84115266ff..84115266ff 100644
--- a/misc/cgo/test/issue5548_c.c
+++ b/src/cmd/cgo/internal/test/issue5548_c.c
diff --git a/misc/cgo/test/issue5740a.c b/src/cmd/cgo/internal/test/issue5740a.c
index a6a7d0c960..a6a7d0c960 100644
--- a/misc/cgo/test/issue5740a.c
+++ b/src/cmd/cgo/internal/test/issue5740a.c
diff --git a/misc/cgo/test/issue5740b.c b/src/cmd/cgo/internal/test/issue5740b.c
index c2ff5fbc4a..c2ff5fbc4a 100644
--- a/misc/cgo/test/issue5740b.c
+++ b/src/cmd/cgo/internal/test/issue5740b.c
diff --git a/misc/cgo/test/issue6833_c.c b/src/cmd/cgo/internal/test/issue6833_c.c
index c94c2c6d45..c94c2c6d45 100644
--- a/misc/cgo/test/issue6833_c.c
+++ b/src/cmd/cgo/internal/test/issue6833_c.c
diff --git a/misc/cgo/test/issue6907export_c.c b/src/cmd/cgo/internal/test/issue6907export_c.c
index 9b1a4fc630..9b1a4fc630 100644
--- a/misc/cgo/test/issue6907export_c.c
+++ b/src/cmd/cgo/internal/test/issue6907export_c.c
diff --git a/misc/cgo/test/issue6997_linux.c b/src/cmd/cgo/internal/test/issue6997_linux.c
index c6d251bbe5..c6d251bbe5 100644
--- a/misc/cgo/test/issue6997_linux.c
+++ b/src/cmd/cgo/internal/test/issue6997_linux.c
diff --git a/misc/cgo/test/issue6997_linux.go b/src/cmd/cgo/internal/test/issue6997_linux.go
index 1de5edda04..1de5edda04 100644
--- a/misc/cgo/test/issue6997_linux.go
+++ b/src/cmd/cgo/internal/test/issue6997_linux.go
diff --git a/misc/cgo/test/issue7234_test.go b/src/cmd/cgo/internal/test/issue7234_test.go
index c191a1a66f..c191a1a66f 100644
--- a/misc/cgo/test/issue7234_test.go
+++ b/src/cmd/cgo/internal/test/issue7234_test.go
diff --git a/misc/cgo/test/issue8148.c b/src/cmd/cgo/internal/test/issue8148.c
index 927b4346cb..927b4346cb 100644
--- a/misc/cgo/test/issue8148.c
+++ b/src/cmd/cgo/internal/test/issue8148.c
diff --git a/misc/cgo/test/issue8148.go b/src/cmd/cgo/internal/test/issue8148.go
index aee9003d50..aee9003d50 100644
--- a/misc/cgo/test/issue8148.go
+++ b/src/cmd/cgo/internal/test/issue8148.go
diff --git a/misc/cgo/test/issue8331.h b/src/cmd/cgo/internal/test/issue8331.h
index 8065be0890..8065be0890 100644
--- a/misc/cgo/test/issue8331.h
+++ b/src/cmd/cgo/internal/test/issue8331.h
diff --git a/misc/cgo/test/issue8517.go b/src/cmd/cgo/internal/test/issue8517.go
index 2261513022..2261513022 100644
--- a/misc/cgo/test/issue8517.go
+++ b/src/cmd/cgo/internal/test/issue8517.go
diff --git a/misc/cgo/test/issue8517_windows.c b/src/cmd/cgo/internal/test/issue8517_windows.c
index a0b94c126f..a0b94c126f 100644
--- a/misc/cgo/test/issue8517_windows.c
+++ b/src/cmd/cgo/internal/test/issue8517_windows.c
diff --git a/misc/cgo/test/issue8517_windows.go b/src/cmd/cgo/internal/test/issue8517_windows.go
index 3782631e91..3782631e91 100644
--- a/misc/cgo/test/issue8517_windows.go
+++ b/src/cmd/cgo/internal/test/issue8517_windows.go
diff --git a/misc/cgo/test/issue8694.go b/src/cmd/cgo/internal/test/issue8694.go
index 3b8f065d27..3b8f065d27 100644
--- a/misc/cgo/test/issue8694.go
+++ b/src/cmd/cgo/internal/test/issue8694.go
diff --git a/misc/cgo/test/issue8756.go b/src/cmd/cgo/internal/test/issue8756.go
index 08099dc153..1ec85a8a5e 100644
--- a/misc/cgo/test/issue8756.go
+++ b/src/cmd/cgo/internal/test/issue8756.go
@@ -8,7 +8,7 @@ import "C"
 import (
 	"testing"
 
-	"misc/cgo/test/issue8756"
+	"cmd/cgo/internal/test/issue8756"
 )
 
 func test8756(t *testing.T) {
diff --git a/misc/cgo/test/issue8756/issue8756.go b/src/cmd/cgo/internal/test/issue8756/issue8756.go
index 5f6b7778ff..5f6b7778ff 100644
--- a/misc/cgo/test/issue8756/issue8756.go
+++ b/src/cmd/cgo/internal/test/issue8756/issue8756.go
diff --git a/misc/cgo/test/issue8811.c b/src/cmd/cgo/internal/test/issue8811.c
index 41b3c7c8ea..41b3c7c8ea 100644
--- a/misc/cgo/test/issue8811.c
+++ b/src/cmd/cgo/internal/test/issue8811.c
diff --git a/misc/cgo/test/issue8828.go b/src/cmd/cgo/internal/test/issue8828.go
index e9ec265268..9904a663d1 100644
--- a/misc/cgo/test/issue8828.go
+++ b/src/cmd/cgo/internal/test/issue8828.go
@@ -9,7 +9,7 @@
 
 package cgotest
 
-import "misc/cgo/test/issue8828"
+import "cmd/cgo/internal/test/issue8828"
 
 func p() {
 	issue8828.Bar()
diff --git a/misc/cgo/test/issue8828/issue8828.c b/src/cmd/cgo/internal/test/issue8828/issue8828.c
index 27ec23a260..27ec23a260 100644
--- a/misc/cgo/test/issue8828/issue8828.c
+++ b/src/cmd/cgo/internal/test/issue8828/issue8828.c
diff --git a/misc/cgo/test/issue8828/trivial.go b/src/cmd/cgo/internal/test/issue8828/trivial.go
index e7b9a4e573..e7b9a4e573 100644
--- a/misc/cgo/test/issue8828/trivial.go
+++ b/src/cmd/cgo/internal/test/issue8828/trivial.go
diff --git a/misc/cgo/test/issue9026.go b/src/cmd/cgo/internal/test/issue9026.go
index fc4df07a3b..bab06ba63d 100644
--- a/misc/cgo/test/issue9026.go
+++ b/src/cmd/cgo/internal/test/issue9026.go
@@ -9,7 +9,7 @@ package cgotest
 import (
 	"testing"
 
-	"misc/cgo/test/issue9026"
+	"cmd/cgo/internal/test/issue9026"
 )
 
 func test9026(t *testing.T) { issue9026.Test(t) }
diff --git a/misc/cgo/test/issue9026/issue9026.go b/src/cmd/cgo/internal/test/issue9026/issue9026.go
index ff269ca9eb..ff269ca9eb 100644
--- a/misc/cgo/test/issue9026/issue9026.go
+++ b/src/cmd/cgo/internal/test/issue9026/issue9026.go
diff --git a/misc/cgo/test/issue9400/asm_386.s b/src/cmd/cgo/internal/test/issue9400/asm_386.s
index 8a3830135f..8a3830135f 100644
--- a/misc/cgo/test/issue9400/asm_386.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_386.s
diff --git a/misc/cgo/test/issue9400/asm_amd64x.s b/src/cmd/cgo/internal/test/issue9400/asm_amd64x.s
index 07adaf745f..07adaf745f 100644
--- a/misc/cgo/test/issue9400/asm_amd64x.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_amd64x.s
diff --git a/misc/cgo/test/issue9400/asm_arm.s b/src/cmd/cgo/internal/test/issue9400/asm_arm.s
index 41261725ca..41261725ca 100644
--- a/misc/cgo/test/issue9400/asm_arm.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_arm.s
diff --git a/misc/cgo/test/issue9400/asm_arm64.s b/src/cmd/cgo/internal/test/issue9400/asm_arm64.s
index affbd71e65..affbd71e65 100644
--- a/misc/cgo/test/issue9400/asm_arm64.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_arm64.s
diff --git a/misc/cgo/test/issue9400/asm_loong64.s b/src/cmd/cgo/internal/test/issue9400/asm_loong64.s
index c242fc6c62..c242fc6c62 100644
--- a/misc/cgo/test/issue9400/asm_loong64.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_loong64.s
diff --git a/misc/cgo/test/issue9400/asm_mips64x.s b/src/cmd/cgo/internal/test/issue9400/asm_mips64x.s
index 1f492eafe9..1f492eafe9 100644
--- a/misc/cgo/test/issue9400/asm_mips64x.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_mips64x.s
diff --git a/misc/cgo/test/issue9400/asm_mipsx.s b/src/cmd/cgo/internal/test/issue9400/asm_mipsx.s
index 695273d90f..695273d90f 100644
--- a/misc/cgo/test/issue9400/asm_mipsx.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_mipsx.s
diff --git a/misc/cgo/test/issue9400/asm_ppc64x.s b/src/cmd/cgo/internal/test/issue9400/asm_ppc64x.s
index 5f13f1696d..5f13f1696d 100644
--- a/misc/cgo/test/issue9400/asm_ppc64x.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_ppc64x.s
diff --git a/misc/cgo/test/issue9400/asm_riscv64.s b/src/cmd/cgo/internal/test/issue9400/asm_riscv64.s
index fa34f6bd37..fa34f6bd37 100644
--- a/misc/cgo/test/issue9400/asm_riscv64.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_riscv64.s
diff --git a/misc/cgo/test/issue9400/asm_s390x.s b/src/cmd/cgo/internal/test/issue9400/asm_s390x.s
index 2552fa7008..2552fa7008 100644
--- a/misc/cgo/test/issue9400/asm_s390x.s
+++ b/src/cmd/cgo/internal/test/issue9400/asm_s390x.s
diff --git a/misc/cgo/test/issue9400/gccgo.go b/src/cmd/cgo/internal/test/issue9400/gccgo.go
index 4dd987bf74..4dd987bf74 100644
--- a/misc/cgo/test/issue9400/gccgo.go
+++ b/src/cmd/cgo/internal/test/issue9400/gccgo.go
diff --git a/misc/cgo/test/issue9400/stubs.go b/src/cmd/cgo/internal/test/issue9400/stubs.go
index c2b235abab..c2b235abab 100644
--- a/misc/cgo/test/issue9400/stubs.go
+++ b/src/cmd/cgo/internal/test/issue9400/stubs.go
diff --git a/misc/cgo/test/issue9400_linux.go b/src/cmd/cgo/internal/test/issue9400_linux.go
index 38fa9dd177..1511e25876 100644
--- a/misc/cgo/test/issue9400_linux.go
+++ b/src/cmd/cgo/internal/test/issue9400_linux.go
@@ -19,7 +19,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"misc/cgo/test/issue9400"
+	"cmd/cgo/internal/test/issue9400"
 )
 
 func test9400(t *testing.T) {
diff --git a/misc/cgo/test/issue9510.go b/src/cmd/cgo/internal/test/issue9510.go
index 9bccfeb5e7..7f0aff4fe4 100644
--- a/misc/cgo/test/issue9510.go
+++ b/src/cmd/cgo/internal/test/issue9510.go
@@ -13,8 +13,8 @@ import (
 	"runtime"
 	"testing"
 
-	"misc/cgo/test/issue9510a"
-	"misc/cgo/test/issue9510b"
+	"cmd/cgo/internal/test/issue9510a"
+	"cmd/cgo/internal/test/issue9510b"
 )
 
 func test9510(t *testing.T) {
diff --git a/misc/cgo/test/issue9510a/a.go b/src/cmd/cgo/internal/test/issue9510a/a.go
index 1a5224b8c6..1a5224b8c6 100644
--- a/misc/cgo/test/issue9510a/a.go
+++ b/src/cmd/cgo/internal/test/issue9510a/a.go
diff --git a/misc/cgo/test/issue9510b/b.go b/src/cmd/cgo/internal/test/issue9510b/b.go
index 5016b39597..5016b39597 100644
--- a/misc/cgo/test/issue9510b/b.go
+++ b/src/cmd/cgo/internal/test/issue9510b/b.go
diff --git a/misc/cgo/test/setgid2_linux.go b/src/cmd/cgo/internal/test/setgid2_linux.go
index 438f5ae512..438f5ae512 100644
--- a/misc/cgo/test/setgid2_linux.go
+++ b/src/cmd/cgo/internal/test/setgid2_linux.go
diff --git a/misc/cgo/test/setgid_linux.go b/src/cmd/cgo/internal/test/setgid_linux.go
index 7c64946cb3..7c64946cb3 100644
--- a/misc/cgo/test/setgid_linux.go
+++ b/src/cmd/cgo/internal/test/setgid_linux.go
diff --git a/misc/cgo/test/sigaltstack.go b/src/cmd/cgo/internal/test/sigaltstack.go
index d468cf8251..d468cf8251 100644
--- a/misc/cgo/test/sigaltstack.go
+++ b/src/cmd/cgo/internal/test/sigaltstack.go
diff --git a/misc/cgo/test/sigprocmask.c b/src/cmd/cgo/internal/test/sigprocmask.c
index 43158332b9..43158332b9 100644
--- a/misc/cgo/test/sigprocmask.c
+++ b/src/cmd/cgo/internal/test/sigprocmask.c
diff --git a/misc/cgo/test/sigprocmask.go b/src/cmd/cgo/internal/test/sigprocmask.go
index 6cc04d6855..6cc04d6855 100644
--- a/misc/cgo/test/sigprocmask.go
+++ b/src/cmd/cgo/internal/test/sigprocmask.go
diff --git a/misc/cgo/test/test.go b/src/cmd/cgo/internal/test/test.go
index 1529ca5928..1529ca5928 100644
--- a/misc/cgo/test/test.go
+++ b/src/cmd/cgo/internal/test/test.go
diff --git a/misc/cgo/test/test26213.go b/src/cmd/cgo/internal/test/test26213.go
index 3669590f47..04f8e84017 100644
--- a/misc/cgo/test/test26213.go
+++ b/src/cmd/cgo/internal/test/test26213.go
@@ -9,7 +9,7 @@ package cgotest
 import (
 	"testing"
 
-	"misc/cgo/test/issue26213"
+	"cmd/cgo/internal/test/issue26213"
 )
 
 func test26213(t *testing.T) {
diff --git a/misc/cgo/test/test_unix.go b/src/cmd/cgo/internal/test/test_unix.go
index 664c4850d3..664c4850d3 100644
--- a/misc/cgo/test/test_unix.go
+++ b/src/cmd/cgo/internal/test/test_unix.go
diff --git a/misc/cgo/test/test_windows.go b/src/cmd/cgo/internal/test/test_windows.go
index 7bfb33a83c..7bfb33a83c 100644
--- a/misc/cgo/test/test_windows.go
+++ b/src/cmd/cgo/internal/test/test_windows.go
diff --git a/misc/cgo/test/testx.c b/src/cmd/cgo/internal/test/testx.c
index 1258e326a4..1258e326a4 100644
--- a/misc/cgo/test/testx.c
+++ b/src/cmd/cgo/internal/test/testx.c
diff --git a/misc/cgo/test/testx.go b/src/cmd/cgo/internal/test/testx.go
index 6a8e97ddf3..6a8e97ddf3 100644
--- a/misc/cgo/test/testx.go
+++ b/src/cmd/cgo/internal/test/testx.go
diff --git a/misc/cgo/test/typeparam.go b/src/cmd/cgo/internal/test/typeparam.go
index 5f766c2bcb..5f766c2bcb 100644
--- a/misc/cgo/test/typeparam.go
+++ b/src/cmd/cgo/internal/test/typeparam.go
diff --git a/misc/cgo/nocgo/nocgo.go b/src/cmd/cgo/internal/testnocgo/nocgo.go
index 00ae5e9c86..00ae5e9c86 100644
--- a/misc/cgo/nocgo/nocgo.go
+++ b/src/cmd/cgo/internal/testnocgo/nocgo.go
diff --git a/misc/cgo/nocgo/nocgo_test.go b/src/cmd/cgo/internal/testnocgo/nocgo_test.go
index 45d247cf95..45d247cf95 100644
--- a/misc/cgo/nocgo/nocgo_test.go
+++ b/src/cmd/cgo/internal/testnocgo/nocgo_test.go
diff --git a/misc/cgo/testtls/tls.go b/src/cmd/cgo/internal/testtls/tls.go
index e634220be7..4684f82ebd 100644
--- a/misc/cgo/testtls/tls.go
+++ b/src/cmd/cgo/internal/testtls/tls.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build unix
+
 package cgotlstest
 
 // #include <pthread.h>
diff --git a/misc/cgo/testtls/tls_test.go b/src/cmd/cgo/internal/testtls/tls_test.go
index 9d660b8337..10b71f074e 100644
--- a/misc/cgo/testtls/tls_test.go
+++ b/src/cmd/cgo/internal/testtls/tls_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !windows
+//go:build cgo && unix
 
 package cgotlstest
 
diff --git a/misc/cgo/testtls/tls_unix.c b/src/cmd/cgo/internal/testtls/tls_unix.c
index 957afce90d..957afce90d 100644
--- a/misc/cgo/testtls/tls_unix.c
+++ b/src/cmd/cgo/internal/testtls/tls_unix.c
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 2bab3cd34f..2e0072f44f 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -600,6 +600,9 @@ func (t *tester) registerTests() {
 		"cmd/cgo/internal/teststdio":      true,
 		"cmd/cgo/internal/testlife":       true,
 		"cmd/cgo/internal/testfortran":    true,
+		"cmd/cgo/internal/test":           true,
+		"cmd/cgo/internal/testnocgo":      true,
+		"cmd/cgo/internal/testtls":        true,
 		"cmd/cgo/internal/testgodefs":     true,
 		"cmd/cgo/internal/testso":         true,
 		"cmd/cgo/internal/testsovar":      true,
@@ -1181,7 +1184,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
 func (t *tester) registerCgoTests() {
 	cgoTest := func(name string, subdir, linkmode, buildmode string, opts ...registerTestOpt) *goTest {
 		gt := &goTest{
-			dir:       "../misc/cgo/" + subdir,
+			dir:       "cmd/cgo/internal/" + subdir,
 			buildmode: buildmode,
 			ldflags:   "-linkmode=" + linkmode,
 		}
@@ -1206,7 +1209,7 @@ func (t *tester) registerCgoTests() {
 			gt.tags = append(gt.tags, "static")
 		}
 
-		t.registerTest("cgo:"+name, "../misc/cgo/test", gt, opts...)
+		t.registerTest("cgo:"+name, "cmd/cgo/internal/test", gt, opts...)
 		return gt
 	}
 
@@ -1266,7 +1269,7 @@ func (t *tester) registerCgoTests() {
 					return false
 				}
 			} else {
-				cmd := t.dirCmd("misc/cgo/test", cc, "-xc", "-o", "/dev/null", "-static", "-")
+				cmd := t.dirCmd("src/cmd/cgo/internal/test", cc, "-xc", "-o", "/dev/null", "-static", "-")
 				cmd.Stdin = strings.NewReader("int main() {}")
 				cmd.Stdout, cmd.Stderr = nil, nil // Discard output
 				if err := cmd.Run(); err != nil {
@@ -1294,10 +1297,10 @@ func (t *tester) registerCgoTests() {
 				// TODO(#56629): Why does this fail on netbsd-arm?
 				cgoTest("testtls-static", "testtls", "external", "static", staticCheck)
 			}
-			cgoTest("nocgo-auto", "nocgo", "auto", "", staticCheck)
-			cgoTest("nocgo-external", "nocgo", "external", "", staticCheck)
+			cgoTest("nocgo-auto", "testnocgo", "auto", "", staticCheck)
+			cgoTest("nocgo-external", "testnocgo", "external", "", staticCheck)
 			if goos != "android" {
-				cgoTest("nocgo-static", "nocgo", "external", "static", staticCheck)
+				cgoTest("nocgo-static", "testnocgo", "external", "static", staticCheck)
 				cgoTest("test-static", "test", "external", "static", staticCheck)
 				// -static in CGO_LDFLAGS triggers a different code path
 				// than -static in -extldflags, so test both.
@@ -1315,7 +1318,7 @@ func (t *tester) registerCgoTests() {
 					cgoTest("test-pie-internal", "test", "internal", "pie")
 				}
 				cgoTest("testtls-pie", "testtls", "auto", "pie")
-				cgoTest("nocgo-pie", "nocgo", "auto", "pie")
+				cgoTest("nocgo-pie", "testnocgo", "auto", "pie")
 			}
 		}
 	}
@@ -1550,11 +1553,11 @@ func (t *tester) registerRaceTests() {
 	// TODO(iant): Figure out how to catch this.
 	// t.registerTest("race:cmd/go", hdr, &goTest{race: true, runTests: "TestParallelTest", pkg: "cmd/go"})
 	if t.cgoEnabled {
-		// Building misc/cgo/test takes a long time.
+		// Building cmd/cgo/internal/test takes a long time.
 		// There are already cgo-enabled packages being tested with the race detector.
-		// We shouldn't need to redo all of misc/cgo/test too.
+		// We shouldn't need to redo all of cmd/cgo/internal/test too.
 		// The race buildler will take care of this.
-		// t.registerTest("race:misc/cgo/test", hdr, &goTest{dir: "../misc/cgo/test", race: true, env: []string{"GOTRACEBACK=2"}})
+		// t.registerTest("race:cmd/cgo/internal/test", hdr, &goTest{dir: "cmd/cgo/internal/test", race: true, env: []string{"GOTRACEBACK=2"}})
 	}
 	if t.extLink() {
 		// Test with external linking; see issue 9133.
diff --git a/src/go/internal/srcimporter/srcimporter_test.go b/src/go/internal/srcimporter/srcimporter_test.go
index e87745822b..61ae0c1453 100644
--- a/src/go/internal/srcimporter/srcimporter_test.go
+++ b/src/go/internal/srcimporter/srcimporter_test.go
@@ -244,9 +244,8 @@ func TestCgo(t *testing.T) {
 	testenv.MustHaveCGO(t)
 
 	buildCtx := build.Default
-	buildCtx.Dir = filepath.Join(testenv.GOROOT(t), "misc")
 	importer := New(&buildCtx, token.NewFileSet(), make(map[string]*types.Package))
-	_, err := importer.ImportFrom("./cgo/test", buildCtx.Dir, 0)
+	_, err := importer.ImportFrom("cmd/cgo/internal/test", buildCtx.Dir, 0)
 	if err != nil {
 		t.Fatalf("Import failed: %v", err)
 	}