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

This moves most misc/cgo tests to cmd/cgo/internal. This is mostly a
trivial rename and updating dist/test.go for the new paths, plus
excluding these packages from regular dist test registration. A few
tests were sensitive to what path they ran in, so we update those.

This will let these tests access facilities in internal/testenv.

For #37486.

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

251 files changed, 42 insertions, 28 deletions

diff --git a/src/cmd/cgo/doc.go b/src/cmd/cgo/doc.go
index 70685c7410..56f52d1ae0 100644
--- a/src/cmd/cgo/doc.go
+++ b/src/cmd/cgo/doc.go
@@ -26,7 +26,7 @@ declared in the preamble may be used, even if they start with a
 lower-case letter. Exception: static variables in the preamble may
 not be referenced from Go code; static functions are permitted.
 
-See $GOROOT/misc/cgo/stdio and $GOROOT/misc/cgo/gmp for examples. See
+See $GOROOT/cmd/cgo/internal/teststdio and $GOROOT/misc/cgo/gmp for examples. See
 "C? Go? Cgo!" for an introduction to using cgo:
 https://golang.org/doc/articles/c_go_cgo.html.
 
diff --git a/misc/cgo/testcarchive/carchive_test.go b/src/cmd/cgo/internal/testcarchive/carchive_test.go
index 8a39c24a6d..8a39c24a6d 100644
--- a/misc/cgo/testcarchive/carchive_test.go
+++ b/src/cmd/cgo/internal/testcarchive/carchive_test.go
diff --git a/misc/cgo/testcarchive/overlaydir_test.go b/src/cmd/cgo/internal/testcarchive/overlaydir_test.go
index 67974c5ed8..67974c5ed8 100644
--- a/misc/cgo/testcarchive/overlaydir_test.go
+++ b/src/cmd/cgo/internal/testcarchive/overlaydir_test.go
diff --git a/misc/cgo/testcarchive/testdata/libgo/libgo.go b/src/cmd/cgo/internal/testcarchive/testdata/libgo/libgo.go
index 37b30c1463..37b30c1463 100644
--- a/misc/cgo/testcarchive/testdata/libgo/libgo.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/libgo/libgo.go
diff --git a/misc/cgo/testcarchive/testdata/libgo2/libgo2.go b/src/cmd/cgo/internal/testcarchive/testdata/libgo2/libgo2.go
index b2e7731a45..b2e7731a45 100644
--- a/misc/cgo/testcarchive/testdata/libgo2/libgo2.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/libgo2/libgo2.go
diff --git a/misc/cgo/testcarchive/testdata/libgo3/libgo3.go b/src/cmd/cgo/internal/testcarchive/testdata/libgo3/libgo3.go
index 136695b09b..136695b09b 100644
--- a/misc/cgo/testcarchive/testdata/libgo3/libgo3.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/libgo3/libgo3.go
diff --git a/misc/cgo/testcarchive/testdata/libgo4/libgo4.go b/src/cmd/cgo/internal/testcarchive/testdata/libgo4/libgo4.go
index c81d3af4ea..c81d3af4ea 100644
--- a/misc/cgo/testcarchive/testdata/libgo4/libgo4.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/libgo4/libgo4.go
diff --git a/misc/cgo/testcarchive/testdata/libgo6/sigprof.go b/src/cmd/cgo/internal/testcarchive/testdata/libgo6/sigprof.go
index 31527c59af..31527c59af 100644
--- a/misc/cgo/testcarchive/testdata/libgo6/sigprof.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/libgo6/sigprof.go
diff --git a/misc/cgo/testcarchive/testdata/libgo7/sink.go b/src/cmd/cgo/internal/testcarchive/testdata/libgo7/sink.go
index d61638b38e..d61638b38e 100644
--- a/misc/cgo/testcarchive/testdata/libgo7/sink.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/libgo7/sink.go
diff --git a/misc/cgo/testcarchive/testdata/libgo8/a.go b/src/cmd/cgo/internal/testcarchive/testdata/libgo8/a.go
index 718418ecb8..718418ecb8 100644
--- a/misc/cgo/testcarchive/testdata/libgo8/a.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/libgo8/a.go
diff --git a/misc/cgo/testcarchive/testdata/main.c b/src/cmd/cgo/internal/testcarchive/testdata/main.c
index 163b5398e5..163b5398e5 100644
--- a/misc/cgo/testcarchive/testdata/main.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main.c
diff --git a/misc/cgo/testcarchive/testdata/main2.c b/src/cmd/cgo/internal/testcarchive/testdata/main2.c
index da35673421..e82294ded8 100644
--- a/misc/cgo/testcarchive/testdata/main2.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main2.c
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Test installing a signal handler before the Go code starts.
-// This is a lot like misc/cgo/testcshared/main4.c.
+// This is a lot like ../testcshared/main4.c.
 
 #include <setjmp.h>
 #include <signal.h>
diff --git a/misc/cgo/testcarchive/testdata/main3.c b/src/cmd/cgo/internal/testcarchive/testdata/main3.c
index 4d11d9ce4c..983e1b6122 100644
--- a/misc/cgo/testcarchive/testdata/main3.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main3.c
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Test os/signal.Notify and os/signal.Reset.
-// This is a lot like misc/cgo/testcshared/main5.c.
+// This is a lot like ../testcshared/main5.c.
 
 #include <signal.h>
 #include <stdio.h>
diff --git a/misc/cgo/testcarchive/testdata/main4.c b/src/cmd/cgo/internal/testcarchive/testdata/main4.c
index 04f774008f..04f774008f 100644
--- a/misc/cgo/testcarchive/testdata/main4.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main4.c
diff --git a/misc/cgo/testcarchive/testdata/main5.c b/src/cmd/cgo/internal/testcarchive/testdata/main5.c
index c64c246fde..c64c246fde 100644
--- a/misc/cgo/testcarchive/testdata/main5.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main5.c
diff --git a/misc/cgo/testcarchive/testdata/main6.c b/src/cmd/cgo/internal/testcarchive/testdata/main6.c
index 2745eb9dc5..2745eb9dc5 100644
--- a/misc/cgo/testcarchive/testdata/main6.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main6.c
diff --git a/misc/cgo/testcarchive/testdata/main7.c b/src/cmd/cgo/internal/testcarchive/testdata/main7.c
index 2c6d98daa8..2c6d98daa8 100644
--- a/misc/cgo/testcarchive/testdata/main7.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main7.c
diff --git a/misc/cgo/testcarchive/testdata/main8.c b/src/cmd/cgo/internal/testcarchive/testdata/main8.c
index 95fb7a349e..95fb7a349e 100644
--- a/misc/cgo/testcarchive/testdata/main8.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main8.c
diff --git a/misc/cgo/testcarchive/testdata/main_unix.c b/src/cmd/cgo/internal/testcarchive/testdata/main_unix.c
index bd00f9d233..bd00f9d233 100644
--- a/misc/cgo/testcarchive/testdata/main_unix.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main_unix.c
diff --git a/misc/cgo/testcarchive/testdata/main_windows.c b/src/cmd/cgo/internal/testcarchive/testdata/main_windows.c
index eded8af1a2..eded8af1a2 100644
--- a/misc/cgo/testcarchive/testdata/main_windows.c
+++ b/src/cmd/cgo/internal/testcarchive/testdata/main_windows.c
diff --git a/misc/cgo/testcarchive/testdata/p/p.go b/src/cmd/cgo/internal/testcarchive/testdata/p/p.go
index 82b445c121..82b445c121 100644
--- a/misc/cgo/testcarchive/testdata/p/p.go
+++ b/src/cmd/cgo/internal/testcarchive/testdata/p/p.go
diff --git a/misc/cgo/testcshared/cshared_test.go b/src/cmd/cgo/internal/testcshared/cshared_test.go
index 2b57249817..2b57249817 100644
--- a/misc/cgo/testcshared/cshared_test.go
+++ b/src/cmd/cgo/internal/testcshared/cshared_test.go
diff --git a/misc/cgo/testcshared/overlaydir_test.go b/src/cmd/cgo/internal/testcshared/overlaydir_test.go
index 85d6b44eef..85d6b44eef 100644
--- a/misc/cgo/testcshared/overlaydir_test.go
+++ b/src/cmd/cgo/internal/testcshared/overlaydir_test.go
diff --git a/misc/cgo/testcshared/testdata/go2c2go/go/shlib.go b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/go/shlib.go
index 76a5323ad2..76a5323ad2 100644
--- a/misc/cgo/testcshared/testdata/go2c2go/go/shlib.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/go/shlib.go
diff --git a/misc/cgo/testcshared/testdata/go2c2go/m1/c.c b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/m1/c.c
index 0e8fac4cf3..0e8fac4cf3 100644
--- a/misc/cgo/testcshared/testdata/go2c2go/m1/c.c
+++ b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/m1/c.c
diff --git a/misc/cgo/testcshared/testdata/go2c2go/m1/main.go b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/m1/main.go
index 17ba1eb0a7..17ba1eb0a7 100644
--- a/misc/cgo/testcshared/testdata/go2c2go/m1/main.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/m1/main.go
diff --git a/misc/cgo/testcshared/testdata/go2c2go/m2/main.go b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/m2/main.go
index 91bf308057..91bf308057 100644
--- a/misc/cgo/testcshared/testdata/go2c2go/m2/main.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/go2c2go/m2/main.go
diff --git a/misc/cgo/testcshared/testdata/issue36233/issue36233.go b/src/cmd/cgo/internal/testcshared/testdata/issue36233/issue36233.go
index 433bf5ce55..433bf5ce55 100644
--- a/misc/cgo/testcshared/testdata/issue36233/issue36233.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/issue36233/issue36233.go
diff --git a/misc/cgo/testcshared/testdata/libgo/libgo.go b/src/cmd/cgo/internal/testcshared/testdata/libgo/libgo.go
index 063441766a..063441766a 100644
--- a/misc/cgo/testcshared/testdata/libgo/libgo.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/libgo/libgo.go
diff --git a/misc/cgo/testcshared/testdata/libgo2/dup2.go b/src/cmd/cgo/internal/testcshared/testdata/libgo2/dup2.go
index d50e0c42ab..d50e0c42ab 100644
--- a/misc/cgo/testcshared/testdata/libgo2/dup2.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/libgo2/dup2.go
diff --git a/misc/cgo/testcshared/testdata/libgo2/dup3.go b/src/cmd/cgo/internal/testcshared/testdata/libgo2/dup3.go
index ec4b5a73ec..ec4b5a73ec 100644
--- a/misc/cgo/testcshared/testdata/libgo2/dup3.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/libgo2/dup3.go
diff --git a/misc/cgo/testcshared/testdata/libgo2/libgo2.go b/src/cmd/cgo/internal/testcshared/testdata/libgo2/libgo2.go
index 5f6cfd0039..5f6cfd0039 100644
--- a/misc/cgo/testcshared/testdata/libgo2/libgo2.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/libgo2/libgo2.go
diff --git a/misc/cgo/testcshared/testdata/libgo4/libgo4.go b/src/cmd/cgo/internal/testcshared/testdata/libgo4/libgo4.go
index 9c30c8585a..9c30c8585a 100644
--- a/misc/cgo/testcshared/testdata/libgo4/libgo4.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/libgo4/libgo4.go
diff --git a/misc/cgo/testcshared/testdata/libgo5/libgo5.go b/src/cmd/cgo/internal/testcshared/testdata/libgo5/libgo5.go
index 4ca44e5894..4ca44e5894 100644
--- a/misc/cgo/testcshared/testdata/libgo5/libgo5.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/libgo5/libgo5.go
diff --git a/misc/cgo/testcshared/testdata/main0.c b/src/cmd/cgo/internal/testcshared/testdata/main0.c
index 39ef7e3051..39ef7e3051 100644
--- a/misc/cgo/testcshared/testdata/main0.c
+++ b/src/cmd/cgo/internal/testcshared/testdata/main0.c
diff --git a/misc/cgo/testcshared/testdata/main1.c b/src/cmd/cgo/internal/testcshared/testdata/main1.c
index 420dd1ea97..420dd1ea97 100644
--- a/misc/cgo/testcshared/testdata/main1.c
+++ b/src/cmd/cgo/internal/testcshared/testdata/main1.c
diff --git a/misc/cgo/testcshared/testdata/main2.c b/src/cmd/cgo/internal/testcshared/testdata/main2.c
index f89bcca474..f89bcca474 100644
--- a/misc/cgo/testcshared/testdata/main2.c
+++ b/src/cmd/cgo/internal/testcshared/testdata/main2.c
diff --git a/misc/cgo/testcshared/testdata/main3.c b/src/cmd/cgo/internal/testcshared/testdata/main3.c
index 49cc0558a0..49cc0558a0 100644
--- a/misc/cgo/testcshared/testdata/main3.c
+++ b/src/cmd/cgo/internal/testcshared/testdata/main3.c
diff --git a/misc/cgo/testcshared/testdata/main4.c b/src/cmd/cgo/internal/testcshared/testdata/main4.c
index 355cdefb01..6c16364070 100644
--- a/misc/cgo/testcshared/testdata/main4.c
+++ b/src/cmd/cgo/internal/testcshared/testdata/main4.c
@@ -4,7 +4,7 @@
 
 // Test that a signal handler that uses up stack space does not crash
 // if the signal is delivered to a thread running a goroutine.
-// This is a lot like misc/cgo/testcarchive/main2.c.
+// This is a lot like ../testcarchive/main2.c.
 
 #include <setjmp.h>
 #include <signal.h>
diff --git a/misc/cgo/testcshared/testdata/main5.c b/src/cmd/cgo/internal/testcshared/testdata/main5.c
index 1bc99101d7..e7bebab1ad 100644
--- a/misc/cgo/testcshared/testdata/main5.c
+++ b/src/cmd/cgo/internal/testcshared/testdata/main5.c
@@ -4,7 +4,7 @@
 
 // Test that a signal handler works in non-Go code when using
 // os/signal.Notify.
-// This is a lot like misc/cgo/testcarchive/main3.c.
+// This is a lot like ../testcarchive/main3.c.
 
 #include <signal.h>
 #include <stdio.h>
diff --git a/misc/cgo/testcshared/testdata/p/p.go b/src/cmd/cgo/internal/testcshared/testdata/p/p.go
index 0f02cf3ce6..0f02cf3ce6 100644
--- a/misc/cgo/testcshared/testdata/p/p.go
+++ b/src/cmd/cgo/internal/testcshared/testdata/p/p.go
diff --git a/misc/cgo/errors/argposition_test.go b/src/cmd/cgo/internal/testerrors/argposition_test.go
index dd26663df2..dd26663df2 100644
--- a/misc/cgo/errors/argposition_test.go
+++ b/src/cmd/cgo/internal/testerrors/argposition_test.go
diff --git a/misc/cgo/errors/badsym_test.go b/src/cmd/cgo/internal/testerrors/badsym_test.go
index bc3ba2b489..bc3ba2b489 100644
--- a/misc/cgo/errors/badsym_test.go
+++ b/src/cmd/cgo/internal/testerrors/badsym_test.go
diff --git a/misc/cgo/errors/errors_test.go b/src/cmd/cgo/internal/testerrors/errors_test.go
index 9718b7f9fb..9718b7f9fb 100644
--- a/misc/cgo/errors/errors_test.go
+++ b/src/cmd/cgo/internal/testerrors/errors_test.go
diff --git a/misc/cgo/errors/ptr_test.go b/src/cmd/cgo/internal/testerrors/ptr_test.go
index 24851cbf35..24851cbf35 100644
--- a/misc/cgo/errors/ptr_test.go
+++ b/src/cmd/cgo/internal/testerrors/ptr_test.go
diff --git a/misc/cgo/errors/testdata/err1.go b/src/cmd/cgo/internal/testerrors/testdata/err1.go
index ced7443599..ced7443599 100644
--- a/misc/cgo/errors/testdata/err1.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/err1.go
diff --git a/misc/cgo/errors/testdata/err2.go b/src/cmd/cgo/internal/testerrors/testdata/err2.go
index aa941584c3..aa941584c3 100644
--- a/misc/cgo/errors/testdata/err2.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/err2.go
diff --git a/misc/cgo/errors/testdata/err4.go b/src/cmd/cgo/internal/testerrors/testdata/err4.go
index 8e5f78e987..8e5f78e987 100644
--- a/misc/cgo/errors/testdata/err4.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/err4.go
diff --git a/misc/cgo/errors/testdata/issue11097a.go b/src/cmd/cgo/internal/testerrors/testdata/issue11097a.go
index 028d10ce5c..028d10ce5c 100644
--- a/misc/cgo/errors/testdata/issue11097a.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue11097a.go
diff --git a/misc/cgo/errors/testdata/issue11097b.go b/src/cmd/cgo/internal/testerrors/testdata/issue11097b.go
index b00f24fc10..b00f24fc10 100644
--- a/misc/cgo/errors/testdata/issue11097b.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue11097b.go
diff --git a/misc/cgo/errors/testdata/issue14669.go b/src/cmd/cgo/internal/testerrors/testdata/issue14669.go
index 04d2bcb631..04d2bcb631 100644
--- a/misc/cgo/errors/testdata/issue14669.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue14669.go
diff --git a/misc/cgo/errors/testdata/issue18452.go b/src/cmd/cgo/internal/testerrors/testdata/issue18452.go
index 0386d76892..0386d76892 100644
--- a/misc/cgo/errors/testdata/issue18452.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue18452.go
diff --git a/misc/cgo/errors/testdata/issue18889.go b/src/cmd/cgo/internal/testerrors/testdata/issue18889.go
index bba6b8f9bb..bba6b8f9bb 100644
--- a/misc/cgo/errors/testdata/issue18889.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue18889.go
diff --git a/misc/cgo/errors/testdata/issue28069.go b/src/cmd/cgo/internal/testerrors/testdata/issue28069.go
index e19a3b45bd..e19a3b45bd 100644
--- a/misc/cgo/errors/testdata/issue28069.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue28069.go
diff --git a/misc/cgo/errors/testdata/issue28721.go b/src/cmd/cgo/internal/testerrors/testdata/issue28721.go
index 0eb2a9271c..0eb2a9271c 100644
--- a/misc/cgo/errors/testdata/issue28721.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue28721.go
diff --git a/misc/cgo/errors/testdata/issue33061.go b/src/cmd/cgo/internal/testerrors/testdata/issue33061.go
index 77d5f7a7c9..77d5f7a7c9 100644
--- a/misc/cgo/errors/testdata/issue33061.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue33061.go
diff --git a/misc/cgo/errors/testdata/issue42580.go b/src/cmd/cgo/internal/testerrors/testdata/issue42580.go
index aba80dfeba..aba80dfeba 100644
--- a/misc/cgo/errors/testdata/issue42580.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue42580.go
diff --git a/misc/cgo/errors/testdata/issue50710.go b/src/cmd/cgo/internal/testerrors/testdata/issue50710.go
index dffea22903..dffea22903 100644
--- a/misc/cgo/errors/testdata/issue50710.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/issue50710.go
diff --git a/misc/cgo/errors/testdata/long_double_size.go b/src/cmd/cgo/internal/testerrors/testdata/long_double_size.go
index 8b797f886a..8b797f886a 100644
--- a/misc/cgo/errors/testdata/long_double_size.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/long_double_size.go
diff --git a/misc/cgo/errors/testdata/malloc.go b/src/cmd/cgo/internal/testerrors/testdata/malloc.go
index 65da0208b9..65da0208b9 100644
--- a/misc/cgo/errors/testdata/malloc.go
+++ b/src/cmd/cgo/internal/testerrors/testdata/malloc.go
diff --git a/misc/cgo/fortran/fortran_test.go b/src/cmd/cgo/internal/testfortran/fortran_test.go
index 4604a4dce3..182ea29a08 100644
--- a/misc/cgo/fortran/fortran_test.go
+++ b/src/cmd/cgo/internal/testfortran/fortran_test.go
@@ -63,7 +63,7 @@ func TestFortran(t *testing.T) {
 	}
 
 	// Do a test build that doesn't involve Go FORTRAN support.
-	fcArgs := append([]string{"helloworld/helloworld.f90", "-o", "/dev/null"}, fcExtra...)
+	fcArgs := append([]string{"testdata/helloworld/helloworld.f90", "-o", "/dev/null"}, fcExtra...)
 	t.Logf("%s %s", fc, fcArgs)
 	if err := exec.Command(fc, fcArgs...).Run(); err != nil {
 		t.Skipf("skipping Fortran test: could not build helloworld.f90 with %s: %s", fc, err)
diff --git a/misc/cgo/fortran/helloworld/helloworld.f90 b/src/cmd/cgo/internal/testfortran/testdata/helloworld/helloworld.f90
index cbc34c16ef..cbc34c16ef 100644
--- a/misc/cgo/fortran/helloworld/helloworld.f90
+++ b/src/cmd/cgo/internal/testfortran/testdata/helloworld/helloworld.f90
diff --git a/misc/cgo/fortran/testdata/testprog/answer.f90 b/src/cmd/cgo/internal/testfortran/testdata/testprog/answer.f90
index b3717ee27a..b3717ee27a 100644
--- a/misc/cgo/fortran/testdata/testprog/answer.f90
+++ b/src/cmd/cgo/internal/testfortran/testdata/testprog/answer.f90
diff --git a/misc/cgo/fortran/testdata/testprog/fortran.go b/src/cmd/cgo/internal/testfortran/testdata/testprog/fortran.go
index d8004ceb6d..d8004ceb6d 100644
--- a/misc/cgo/fortran/testdata/testprog/fortran.go
+++ b/src/cmd/cgo/internal/testfortran/testdata/testprog/fortran.go
diff --git a/misc/cgo/testgodefs/testdata/anonunion.go b/src/cmd/cgo/internal/testgodefs/testdata/anonunion.go
index 2c86c5c29e..2c86c5c29e 100644
--- a/misc/cgo/testgodefs/testdata/anonunion.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/anonunion.go
diff --git a/misc/cgo/testgodefs/testdata/bitfields.go b/src/cmd/cgo/internal/testgodefs/testdata/bitfields.go
index 431ffc0696..431ffc0696 100644
--- a/misc/cgo/testgodefs/testdata/bitfields.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/bitfields.go
diff --git a/misc/cgo/testgodefs/testdata/fieldtypedef.go b/src/cmd/cgo/internal/testgodefs/testdata/fieldtypedef.go
index b0c507477f..b0c507477f 100644
--- a/misc/cgo/testgodefs/testdata/fieldtypedef.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/fieldtypedef.go
diff --git a/misc/cgo/testgodefs/testdata/issue37479.go b/src/cmd/cgo/internal/testgodefs/testdata/issue37479.go
index d54531045f..d54531045f 100644
--- a/misc/cgo/testgodefs/testdata/issue37479.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/issue37479.go
diff --git a/misc/cgo/testgodefs/testdata/issue37621.go b/src/cmd/cgo/internal/testgodefs/testdata/issue37621.go
index 655e8ae465..655e8ae465 100644
--- a/misc/cgo/testgodefs/testdata/issue37621.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/issue37621.go
diff --git a/misc/cgo/testgodefs/testdata/issue38649.go b/src/cmd/cgo/internal/testgodefs/testdata/issue38649.go
index 78b5f78edd..78b5f78edd 100644
--- a/misc/cgo/testgodefs/testdata/issue38649.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/issue38649.go
diff --git a/misc/cgo/testgodefs/testdata/issue39534.go b/src/cmd/cgo/internal/testgodefs/testdata/issue39534.go
index af730e98d9..af730e98d9 100644
--- a/misc/cgo/testgodefs/testdata/issue39534.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/issue39534.go
diff --git a/misc/cgo/testgodefs/testdata/issue48396.go b/src/cmd/cgo/internal/testgodefs/testdata/issue48396.go
index 81dd2feb80..81dd2feb80 100644
--- a/misc/cgo/testgodefs/testdata/issue48396.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/issue48396.go
diff --git a/misc/cgo/testgodefs/testdata/issue8478.go b/src/cmd/cgo/internal/testgodefs/testdata/issue8478.go
index f4ef164bda..f4ef164bda 100644
--- a/misc/cgo/testgodefs/testdata/issue8478.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/issue8478.go
diff --git a/misc/cgo/testgodefs/testdata/main.go b/src/cmd/cgo/internal/testgodefs/testdata/main.go
index 5c670f3d32..5c670f3d32 100644
--- a/misc/cgo/testgodefs/testdata/main.go
+++ b/src/cmd/cgo/internal/testgodefs/testdata/main.go
diff --git a/misc/cgo/testgodefs/testgodefs_test.go b/src/cmd/cgo/internal/testgodefs/testgodefs_test.go
index d03769ea87..d03769ea87 100644
--- a/misc/cgo/testgodefs/testgodefs_test.go
+++ b/src/cmd/cgo/internal/testgodefs/testgodefs_test.go
diff --git a/misc/cgo/life/life_test.go b/src/cmd/cgo/internal/testlife/life_test.go
index 98d25a197d..98d25a197d 100644
--- a/misc/cgo/life/life_test.go
+++ b/src/cmd/cgo/internal/testlife/life_test.go
diff --git a/misc/cgo/life/overlaydir_test.go b/src/cmd/cgo/internal/testlife/overlaydir_test.go
index 034c836248..034c836248 100644
--- a/misc/cgo/life/overlaydir_test.go
+++ b/src/cmd/cgo/internal/testlife/overlaydir_test.go
diff --git a/misc/cgo/life/testdata/c-life.c b/src/cmd/cgo/internal/testlife/testdata/c-life.c
index f853163e2f..f853163e2f 100644
--- a/misc/cgo/life/testdata/c-life.c
+++ b/src/cmd/cgo/internal/testlife/testdata/c-life.c
diff --git a/misc/cgo/life/testdata/life.go b/src/cmd/cgo/internal/testlife/testdata/life.go
index 72311404df..72311404df 100644
--- a/misc/cgo/life/testdata/life.go
+++ b/src/cmd/cgo/internal/testlife/testdata/life.go
diff --git a/misc/cgo/life/testdata/life.h b/src/cmd/cgo/internal/testlife/testdata/life.h
index 11d2b97226..11d2b97226 100644
--- a/misc/cgo/life/testdata/life.h
+++ b/src/cmd/cgo/internal/testlife/testdata/life.h
diff --git a/misc/cgo/life/testdata/main.go b/src/cmd/cgo/internal/testlife/testdata/main.go
index e9d19be487..e9d19be487 100644
--- a/misc/cgo/life/testdata/main.go
+++ b/src/cmd/cgo/internal/testlife/testdata/main.go
diff --git a/misc/cgo/life/testdata/main.out b/src/cmd/cgo/internal/testlife/testdata/main.out
index 26fc9c6e3f..26fc9c6e3f 100644
--- a/misc/cgo/life/testdata/main.out
+++ b/src/cmd/cgo/internal/testlife/testdata/main.out
diff --git a/misc/cgo/testplugin/altpath/testdata/common/common.go b/src/cmd/cgo/internal/testplugin/altpath/testdata/common/common.go
index 505ba02b1f..505ba02b1f 100644
--- a/misc/cgo/testplugin/altpath/testdata/common/common.go
+++ b/src/cmd/cgo/internal/testplugin/altpath/testdata/common/common.go
diff --git a/misc/cgo/testplugin/altpath/testdata/plugin-mismatch/main.go b/src/cmd/cgo/internal/testplugin/altpath/testdata/plugin-mismatch/main.go
index bfb4ba45aa..bfb4ba45aa 100644
--- a/misc/cgo/testplugin/altpath/testdata/plugin-mismatch/main.go
+++ b/src/cmd/cgo/internal/testplugin/altpath/testdata/plugin-mismatch/main.go
diff --git a/misc/cgo/testplugin/overlaydir_test.go b/src/cmd/cgo/internal/testplugin/overlaydir_test.go
index e2c32d83ce..e2c32d83ce 100644
--- a/misc/cgo/testplugin/overlaydir_test.go
+++ b/src/cmd/cgo/internal/testplugin/overlaydir_test.go
diff --git a/misc/cgo/testplugin/plugin_test.go b/src/cmd/cgo/internal/testplugin/plugin_test.go
index 8960694351..84ea839a2f 100644
--- a/misc/cgo/testplugin/plugin_test.go
+++ b/src/cmd/cgo/internal/testplugin/plugin_test.go
@@ -48,7 +48,7 @@ func testMain(m *testing.M) int {
 	if err != nil {
 		log.Fatal(err)
 	}
-	goroot = filepath.Join(cwd, "../../..")
+	goroot = filepath.Join(cwd, "../../../../..")
 
 	// Copy testdata into GOPATH/src/testplugin, along with a go.mod file
 	// declaring the same path.
diff --git a/misc/cgo/testplugin/testdata/checkdwarf/main.go b/src/cmd/cgo/internal/testplugin/testdata/checkdwarf/main.go
index 7886c834e7..7886c834e7 100644
--- a/misc/cgo/testplugin/testdata/checkdwarf/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/checkdwarf/main.go
diff --git a/misc/cgo/testplugin/testdata/common/common.go b/src/cmd/cgo/internal/testplugin/testdata/common/common.go
index b064e6bccf..b064e6bccf 100644
--- a/misc/cgo/testplugin/testdata/common/common.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/common/common.go
diff --git a/misc/cgo/testplugin/testdata/forkexec/main.go b/src/cmd/cgo/internal/testplugin/testdata/forkexec/main.go
index 3169ff5f04..3169ff5f04 100644
--- a/misc/cgo/testplugin/testdata/forkexec/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/forkexec/main.go
diff --git a/misc/cgo/testplugin/testdata/host/host.go b/src/cmd/cgo/internal/testplugin/testdata/host/host.go
index a3799328cd..a3799328cd 100644
--- a/misc/cgo/testplugin/testdata/host/host.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/host/host.go
diff --git a/misc/cgo/testplugin/testdata/iface/main.go b/src/cmd/cgo/internal/testplugin/testdata/iface/main.go
index c04f28880f..c04f28880f 100644
--- a/misc/cgo/testplugin/testdata/iface/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/iface/main.go
diff --git a/misc/cgo/testplugin/testdata/iface_a/a.go b/src/cmd/cgo/internal/testplugin/testdata/iface_a/a.go
index 357f7e827e..357f7e827e 100644
--- a/misc/cgo/testplugin/testdata/iface_a/a.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/iface_a/a.go
diff --git a/misc/cgo/testplugin/testdata/iface_b/b.go b/src/cmd/cgo/internal/testplugin/testdata/iface_b/b.go
index 357f7e827e..357f7e827e 100644
--- a/misc/cgo/testplugin/testdata/iface_b/b.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/iface_b/b.go
diff --git a/misc/cgo/testplugin/testdata/iface_i/i.go b/src/cmd/cgo/internal/testplugin/testdata/iface_i/i.go
index 31c80387c7..31c80387c7 100644
--- a/misc/cgo/testplugin/testdata/iface_i/i.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/iface_i/i.go
diff --git a/misc/cgo/testplugin/testdata/issue18584/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue18584/main.go
index c280fd4620..c280fd4620 100644
--- a/misc/cgo/testplugin/testdata/issue18584/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue18584/main.go
diff --git a/misc/cgo/testplugin/testdata/issue18584/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue18584/plugin.go
index be0868d375..be0868d375 100644
--- a/misc/cgo/testplugin/testdata/issue18584/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue18584/plugin.go
diff --git a/misc/cgo/testplugin/testdata/issue18676/dynamodbstreamsevt/definition.go b/src/cmd/cgo/internal/testplugin/testdata/issue18676/dynamodbstreamsevt/definition.go
index 70fd054d08..70fd054d08 100644
--- a/misc/cgo/testplugin/testdata/issue18676/dynamodbstreamsevt/definition.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue18676/dynamodbstreamsevt/definition.go
diff --git a/misc/cgo/testplugin/testdata/issue18676/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue18676/main.go
index 471f3d969c..471f3d969c 100644
--- a/misc/cgo/testplugin/testdata/issue18676/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue18676/main.go
diff --git a/misc/cgo/testplugin/testdata/issue18676/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue18676/plugin.go
index e7fc74f777..e7fc74f777 100644
--- a/misc/cgo/testplugin/testdata/issue18676/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue18676/plugin.go
diff --git a/misc/cgo/testplugin/testdata/issue19418/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue19418/main.go
index 2ec9f9aaaa..2ec9f9aaaa 100644
--- a/misc/cgo/testplugin/testdata/issue19418/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue19418/main.go
diff --git a/misc/cgo/testplugin/testdata/issue19418/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue19418/plugin.go
index fe93b16143..fe93b16143 100644
--- a/misc/cgo/testplugin/testdata/issue19418/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue19418/plugin.go
diff --git a/misc/cgo/testplugin/testdata/issue19529/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue19529/plugin.go
index ad2df6cc7c..ad2df6cc7c 100644
--- a/misc/cgo/testplugin/testdata/issue19529/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue19529/plugin.go
diff --git a/misc/cgo/testplugin/testdata/issue19534/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue19534/main.go
index de263b6f0f..de263b6f0f 100644
--- a/misc/cgo/testplugin/testdata/issue19534/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue19534/main.go
diff --git a/misc/cgo/testplugin/testdata/issue19534/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue19534/plugin.go
index 582d33305c..582d33305c 100644
--- a/misc/cgo/testplugin/testdata/issue19534/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue19534/plugin.go
diff --git a/misc/cgo/testplugin/testdata/issue22175/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue22175/main.go
index 9be9bab9dc..9be9bab9dc 100644
--- a/misc/cgo/testplugin/testdata/issue22175/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue22175/main.go
diff --git a/misc/cgo/testplugin/testdata/issue22175/plugin1.go b/src/cmd/cgo/internal/testplugin/testdata/issue22175/plugin1.go
index 5ae6cb631e..5ae6cb631e 100644
--- a/misc/cgo/testplugin/testdata/issue22175/plugin1.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue22175/plugin1.go
diff --git a/misc/cgo/testplugin/testdata/issue22175/plugin2.go b/src/cmd/cgo/internal/testplugin/testdata/issue22175/plugin2.go
index f387a192e6..f387a192e6 100644
--- a/misc/cgo/testplugin/testdata/issue22175/plugin2.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue22175/plugin2.go
diff --git a/misc/cgo/testplugin/testdata/issue22295.pkg/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue22295.pkg/main.go
index 44b2a2140e..44b2a2140e 100644
--- a/misc/cgo/testplugin/testdata/issue22295.pkg/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue22295.pkg/main.go
diff --git a/misc/cgo/testplugin/testdata/issue22295.pkg/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue22295.pkg/plugin.go
index 46b08a405b..46b08a405b 100644
--- a/misc/cgo/testplugin/testdata/issue22295.pkg/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue22295.pkg/plugin.go
diff --git a/misc/cgo/testplugin/testdata/issue24351/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue24351/main.go
index 4107adff7b..4107adff7b 100644
--- a/misc/cgo/testplugin/testdata/issue24351/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue24351/main.go
diff --git a/misc/cgo/testplugin/testdata/issue24351/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue24351/plugin.go
index db17e0a609..db17e0a609 100644
--- a/misc/cgo/testplugin/testdata/issue24351/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue24351/plugin.go
diff --git a/misc/cgo/testplugin/testdata/issue25756/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue25756/main.go
index 817daf42f6..817daf42f6 100644
--- a/misc/cgo/testplugin/testdata/issue25756/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue25756/main.go
diff --git a/misc/cgo/testplugin/testdata/issue25756/plugin/c-life.c b/src/cmd/cgo/internal/testplugin/testdata/issue25756/plugin/c-life.c
index f853163e2f..f853163e2f 100644
--- a/misc/cgo/testplugin/testdata/issue25756/plugin/c-life.c
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue25756/plugin/c-life.c
diff --git a/misc/cgo/testplugin/testdata/issue25756/plugin/life.go b/src/cmd/cgo/internal/testplugin/testdata/issue25756/plugin/life.go
index 468bc6fab6..468bc6fab6 100644
--- a/misc/cgo/testplugin/testdata/issue25756/plugin/life.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue25756/plugin/life.go
diff --git a/misc/cgo/testplugin/testdata/issue25756/plugin/life.h b/src/cmd/cgo/internal/testplugin/testdata/issue25756/plugin/life.h
index 11d2b97226..11d2b97226 100644
--- a/misc/cgo/testplugin/testdata/issue25756/plugin/life.h
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue25756/plugin/life.h
diff --git a/misc/cgo/testplugin/testdata/issue44956/base/base.go b/src/cmd/cgo/internal/testplugin/testdata/issue44956/base/base.go
index 609aa0dff4..609aa0dff4 100644
--- a/misc/cgo/testplugin/testdata/issue44956/base/base.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue44956/base/base.go
diff --git a/misc/cgo/testplugin/testdata/issue44956/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue44956/main.go
index 287a60585e..287a60585e 100644
--- a/misc/cgo/testplugin/testdata/issue44956/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue44956/main.go
diff --git a/misc/cgo/testplugin/testdata/issue44956/plugin1.go b/src/cmd/cgo/internal/testplugin/testdata/issue44956/plugin1.go
index 499fa31abf..499fa31abf 100644
--- a/misc/cgo/testplugin/testdata/issue44956/plugin1.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue44956/plugin1.go
diff --git a/misc/cgo/testplugin/testdata/issue44956/plugin2.go b/src/cmd/cgo/internal/testplugin/testdata/issue44956/plugin2.go
index a73542ca71..a73542ca71 100644
--- a/misc/cgo/testplugin/testdata/issue44956/plugin2.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue44956/plugin2.go
diff --git a/misc/cgo/testplugin/testdata/issue52937/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue52937/main.go
index 66f09effea..66f09effea 100644
--- a/misc/cgo/testplugin/testdata/issue52937/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue52937/main.go
diff --git a/misc/cgo/testplugin/testdata/issue53989/main.go b/src/cmd/cgo/internal/testplugin/testdata/issue53989/main.go
index 6907dfd858..6907dfd858 100644
--- a/misc/cgo/testplugin/testdata/issue53989/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue53989/main.go
diff --git a/misc/cgo/testplugin/testdata/issue53989/p/p.go b/src/cmd/cgo/internal/testplugin/testdata/issue53989/p/p.go
index 02567c1cee..02567c1cee 100644
--- a/misc/cgo/testplugin/testdata/issue53989/p/p.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue53989/p/p.go
diff --git a/misc/cgo/testplugin/testdata/issue53989/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/issue53989/plugin.go
index a753ee4419..a753ee4419 100644
--- a/misc/cgo/testplugin/testdata/issue53989/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/issue53989/plugin.go
diff --git a/misc/cgo/testplugin/testdata/method/main.go b/src/cmd/cgo/internal/testplugin/testdata/method/main.go
index 5e9189b450..5e9189b450 100644
--- a/misc/cgo/testplugin/testdata/method/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method/main.go
diff --git a/misc/cgo/testplugin/testdata/method/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/method/plugin.go
index 240edd3bc4..240edd3bc4 100644
--- a/misc/cgo/testplugin/testdata/method/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method/plugin.go
diff --git a/misc/cgo/testplugin/testdata/method2/main.go b/src/cmd/cgo/internal/testplugin/testdata/method2/main.go
index 89afbda3d4..89afbda3d4 100644
--- a/misc/cgo/testplugin/testdata/method2/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method2/main.go
diff --git a/misc/cgo/testplugin/testdata/method2/p/p.go b/src/cmd/cgo/internal/testplugin/testdata/method2/p/p.go
index acb526acec..acb526acec 100644
--- a/misc/cgo/testplugin/testdata/method2/p/p.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method2/p/p.go
diff --git a/misc/cgo/testplugin/testdata/method2/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/method2/plugin.go
index 6198e7648e..6198e7648e 100644
--- a/misc/cgo/testplugin/testdata/method2/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method2/plugin.go
diff --git a/misc/cgo/testplugin/testdata/method3/main.go b/src/cmd/cgo/internal/testplugin/testdata/method3/main.go
index a3a51711cd..a3a51711cd 100644
--- a/misc/cgo/testplugin/testdata/method3/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method3/main.go
diff --git a/misc/cgo/testplugin/testdata/method3/p/p.go b/src/cmd/cgo/internal/testplugin/testdata/method3/p/p.go
index f72f7c715c..f72f7c715c 100644
--- a/misc/cgo/testplugin/testdata/method3/p/p.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method3/p/p.go
diff --git a/misc/cgo/testplugin/testdata/method3/plugin.go b/src/cmd/cgo/internal/testplugin/testdata/method3/plugin.go
index bd25b31857..bd25b31857 100644
--- a/misc/cgo/testplugin/testdata/method3/plugin.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/method3/plugin.go
diff --git a/misc/cgo/testplugin/testdata/plugin1/plugin1.go b/src/cmd/cgo/internal/testplugin/testdata/plugin1/plugin1.go
index d29d674ade..d29d674ade 100644
--- a/misc/cgo/testplugin/testdata/plugin1/plugin1.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/plugin1/plugin1.go
diff --git a/misc/cgo/testplugin/testdata/plugin2/plugin2.go b/src/cmd/cgo/internal/testplugin/testdata/plugin2/plugin2.go
index 31ed642ca5..31ed642ca5 100644
--- a/misc/cgo/testplugin/testdata/plugin2/plugin2.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/plugin2/plugin2.go
diff --git a/misc/cgo/testplugin/testdata/sub/plugin1/plugin1.go b/src/cmd/cgo/internal/testplugin/testdata/sub/plugin1/plugin1.go
index 5f891b09a3..5f891b09a3 100644
--- a/misc/cgo/testplugin/testdata/sub/plugin1/plugin1.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/sub/plugin1/plugin1.go
diff --git a/misc/cgo/testplugin/testdata/unnamed1/main.go b/src/cmd/cgo/internal/testplugin/testdata/unnamed1/main.go
index 1620dc48ce..1620dc48ce 100644
--- a/misc/cgo/testplugin/testdata/unnamed1/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/unnamed1/main.go
diff --git a/misc/cgo/testplugin/testdata/unnamed2/main.go b/src/cmd/cgo/internal/testplugin/testdata/unnamed2/main.go
index 027ef6475c..027ef6475c 100644
--- a/misc/cgo/testplugin/testdata/unnamed2/main.go
+++ b/src/cmd/cgo/internal/testplugin/testdata/unnamed2/main.go
diff --git a/misc/cgo/testsanitizers/asan_test.go b/src/cmd/cgo/internal/testsanitizers/asan_test.go
index 932cfb1b60..1e85a5dda0 100644
--- a/misc/cgo/testsanitizers/asan_test.go
+++ b/src/cmd/cgo/internal/testsanitizers/asan_test.go
@@ -127,7 +127,7 @@ func TestASANLinkerX(t *testing.T) {
 
 	var ldflags string
 	for i := 1; i <= 10; i++ {
-		ldflags += fmt.Sprintf("-X=main.S%d=%d -X=misc/cgo/testsanitizers/testdata/asan_linkerx/p.S%d=%d ", i, i, i, i)
+		ldflags += fmt.Sprintf("-X=main.S%d=%d -X=cmd/cgo/internal/testsanitizers/testdata/asan_linkerx/p.S%d=%d ", i, i, i, i)
 	}
 
 	// build the binary
diff --git a/misc/cgo/testsanitizers/cc_test.go b/src/cmd/cgo/internal/testsanitizers/cc_test.go
index 8eda1372f6..67d281a8c5 100644
--- a/misc/cgo/testsanitizers/cc_test.go
+++ b/src/cmd/cgo/internal/testsanitizers/cc_test.go
@@ -144,7 +144,7 @@ func cc(args ...string) (*exec.Cmd, error) {
 	// Split GOGCCFLAGS, respecting quoting.
 	//
 	// TODO(bcmills): This code also appears in
-	// misc/cgo/testcarchive/carchive_test.go, and perhaps ought to go in
+	// cmd/cgo/internal/testcarchive/carchive_test.go, and perhaps ought to go in
 	// src/cmd/dist/test.go as well. Figure out where to put it so that it can be
 	// shared.
 	var flags []string
@@ -493,7 +493,7 @@ func (c *config) checkRuntime() (skip bool, err error) {
 	if err != nil {
 		return false, err
 	}
-	cmd.Args = append(cmd.Args, "-dM", "-E", "../../../src/runtime/cgo/libcgo.h")
+	cmd.Args = append(cmd.Args, "-dM", "-E", "../../../../runtime/cgo/libcgo.h")
 	cmdStr := strings.Join(cmd.Args, " ")
 	out, err := cmd.CombinedOutput()
 	if err != nil {
diff --git a/misc/cgo/testsanitizers/cshared_test.go b/src/cmd/cgo/internal/testsanitizers/cshared_test.go
index 21b13ce4ed..21b13ce4ed 100644
--- a/misc/cgo/testsanitizers/cshared_test.go
+++ b/src/cmd/cgo/internal/testsanitizers/cshared_test.go
diff --git a/misc/cgo/testsanitizers/libfuzzer_test.go b/src/cmd/cgo/internal/testsanitizers/libfuzzer_test.go
index 345751b9c7..345751b9c7 100644
--- a/misc/cgo/testsanitizers/libfuzzer_test.go
+++ b/src/cmd/cgo/internal/testsanitizers/libfuzzer_test.go
diff --git a/misc/cgo/testsanitizers/msan_test.go b/src/cmd/cgo/internal/testsanitizers/msan_test.go
index 96397e0a87..96397e0a87 100644
--- a/misc/cgo/testsanitizers/msan_test.go
+++ b/src/cmd/cgo/internal/testsanitizers/msan_test.go
diff --git a/misc/cgo/testsanitizers/testdata/arena_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/arena_fail.go
index 5b6c52e435..5b6c52e435 100644
--- a/misc/cgo/testsanitizers/testdata/arena_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/arena_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan1_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan1_fail.go
index 80289e5c30..80289e5c30 100644
--- a/misc/cgo/testsanitizers/testdata/asan1_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan1_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan2_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan2_fail.go
index 3ab0608571..3ab0608571 100644
--- a/misc/cgo/testsanitizers/testdata/asan2_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan2_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan3_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan3_fail.go
index 9f6d26dd89..9f6d26dd89 100644
--- a/misc/cgo/testsanitizers/testdata/asan3_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan3_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan4_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan4_fail.go
index 12098458ae..12098458ae 100644
--- a/misc/cgo/testsanitizers/testdata/asan4_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan4_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan5_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan5_fail.go
index d6853eab73..d6853eab73 100644
--- a/misc/cgo/testsanitizers/testdata/asan5_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan5_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_global1_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global1_fail.go
index 6cfc0b7138..6cfc0b7138 100644
--- a/misc/cgo/testsanitizers/testdata/asan_global1_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global1_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_global2_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global2_fail.go
index 1932633368..1932633368 100644
--- a/misc/cgo/testsanitizers/testdata/asan_global2_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global2_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_global3_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global3_fail.go
index 9ab026c7fa..9ab026c7fa 100644
--- a/misc/cgo/testsanitizers/testdata/asan_global3_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global3_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_global4_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global4_fail.go
index d593598d5b..d593598d5b 100644
--- a/misc/cgo/testsanitizers/testdata/asan_global4_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global4_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_global5.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global5.go
index 0ed103da4f..0ed103da4f 100644
--- a/misc/cgo/testsanitizers/testdata/asan_global5.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_global5.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_linkerx/main.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_linkerx/main.go
index bbd6127d90..290b5888d7 100644
--- a/misc/cgo/testsanitizers/testdata/asan_linkerx/main.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_linkerx/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "misc/cgo/testsanitizers/testdata/asan_linkerx/p"
+import "cmd/cgo/internal/testsanitizers/testdata/asan_linkerx/p"
 
 func pstring(s *string) {
 	println(*s)
diff --git a/misc/cgo/testsanitizers/testdata/asan_linkerx/p/p.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_linkerx/p/p.go
index c31f00109d..c31f00109d 100644
--- a/misc/cgo/testsanitizers/testdata/asan_linkerx/p/p.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_linkerx/p/p.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_unsafe_fail1.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_unsafe_fail1.go
index ec54a66880..ec54a66880 100644
--- a/misc/cgo/testsanitizers/testdata/asan_unsafe_fail1.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_unsafe_fail1.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_unsafe_fail2.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_unsafe_fail2.go
index 70f21275af..70f21275af 100644
--- a/misc/cgo/testsanitizers/testdata/asan_unsafe_fail2.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_unsafe_fail2.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_unsafe_fail3.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_unsafe_fail3.go
index 47a8a072ef..47a8a072ef 100644
--- a/misc/cgo/testsanitizers/testdata/asan_unsafe_fail3.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_unsafe_fail3.go
diff --git a/misc/cgo/testsanitizers/testdata/asan_useAfterReturn.go b/src/cmd/cgo/internal/testsanitizers/testdata/asan_useAfterReturn.go
index 3d3d5a6ab1..3d3d5a6ab1 100644
--- a/misc/cgo/testsanitizers/testdata/asan_useAfterReturn.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/asan_useAfterReturn.go
diff --git a/misc/cgo/testsanitizers/testdata/libfuzzer1.go b/src/cmd/cgo/internal/testsanitizers/testdata/libfuzzer1.go
index d178fb1ca0..d178fb1ca0 100644
--- a/misc/cgo/testsanitizers/testdata/libfuzzer1.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/libfuzzer1.go
diff --git a/misc/cgo/testsanitizers/testdata/libfuzzer2.c b/src/cmd/cgo/internal/testsanitizers/testdata/libfuzzer2.c
index 567ff5a1cc..567ff5a1cc 100644
--- a/misc/cgo/testsanitizers/testdata/libfuzzer2.c
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/libfuzzer2.c
diff --git a/misc/cgo/testsanitizers/testdata/libfuzzer2.go b/src/cmd/cgo/internal/testsanitizers/testdata/libfuzzer2.go
index c7a4325976..c7a4325976 100644
--- a/misc/cgo/testsanitizers/testdata/libfuzzer2.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/libfuzzer2.go
diff --git a/misc/cgo/testsanitizers/testdata/msan.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan.go
index 5d73c38079..5d73c38079 100644
--- a/misc/cgo/testsanitizers/testdata/msan.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan.go
diff --git a/misc/cgo/testsanitizers/testdata/msan2.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan2.go
index 6690cb034f..6690cb034f 100644
--- a/misc/cgo/testsanitizers/testdata/msan2.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan2.go
diff --git a/misc/cgo/testsanitizers/testdata/msan2_cmsan.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan2_cmsan.go
index 8fdaea90c9..8fdaea90c9 100644
--- a/misc/cgo/testsanitizers/testdata/msan2_cmsan.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan2_cmsan.go
diff --git a/misc/cgo/testsanitizers/testdata/msan3.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan3.go
index 61a9c29e1a..61a9c29e1a 100644
--- a/misc/cgo/testsanitizers/testdata/msan3.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan3.go
diff --git a/misc/cgo/testsanitizers/testdata/msan4.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan4.go
index 6c91ff5f09..6c91ff5f09 100644
--- a/misc/cgo/testsanitizers/testdata/msan4.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan4.go
diff --git a/misc/cgo/testsanitizers/testdata/msan5.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan5.go
index f1479eb8a0..f1479eb8a0 100644
--- a/misc/cgo/testsanitizers/testdata/msan5.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan5.go
diff --git a/misc/cgo/testsanitizers/testdata/msan6.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan6.go
index e96e8f9ead..e96e8f9ead 100644
--- a/misc/cgo/testsanitizers/testdata/msan6.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan6.go
diff --git a/misc/cgo/testsanitizers/testdata/msan7.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan7.go
index 2f29fd21b2..2f29fd21b2 100644
--- a/misc/cgo/testsanitizers/testdata/msan7.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan7.go
diff --git a/misc/cgo/testsanitizers/testdata/msan8.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan8.go
index 1cb5c5677f..1cb5c5677f 100644
--- a/misc/cgo/testsanitizers/testdata/msan8.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan8.go
diff --git a/misc/cgo/testsanitizers/testdata/msan_fail.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan_fail.go
index 4c8dab34f6..4c8dab34f6 100644
--- a/misc/cgo/testsanitizers/testdata/msan_fail.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan_fail.go
diff --git a/misc/cgo/testsanitizers/testdata/msan_shared.go b/src/cmd/cgo/internal/testsanitizers/testdata/msan_shared.go
index 966947cac3..966947cac3 100644
--- a/misc/cgo/testsanitizers/testdata/msan_shared.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/msan_shared.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan.go
index 6c377a701f..6c377a701f 100644
--- a/misc/cgo/testsanitizers/testdata/tsan.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan10.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan10.go
index a40f245553..a40f245553 100644
--- a/misc/cgo/testsanitizers/testdata/tsan10.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan10.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan11.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan11.go
index 189e10f699..189e10f699 100644
--- a/misc/cgo/testsanitizers/testdata/tsan11.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan11.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan12.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan12.go
index 0ef545d09b..0ef545d09b 100644
--- a/misc/cgo/testsanitizers/testdata/tsan12.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan12.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan13.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan13.go
index ebdf63581b..ebdf63581b 100644
--- a/misc/cgo/testsanitizers/testdata/tsan13.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan13.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan2.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan2.go
index 5018a1987c..5018a1987c 100644
--- a/misc/cgo/testsanitizers/testdata/tsan2.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan2.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan3.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan3.go
index 87f6c80f1b..87f6c80f1b 100644
--- a/misc/cgo/testsanitizers/testdata/tsan3.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan3.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan4.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan4.go
index f0c76d8411..f0c76d8411 100644
--- a/misc/cgo/testsanitizers/testdata/tsan4.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan4.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan5.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan5.go
index 1214a7743b..1214a7743b 100644
--- a/misc/cgo/testsanitizers/testdata/tsan5.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan5.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan6.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan6.go
index c96f08d2f3..c96f08d2f3 100644
--- a/misc/cgo/testsanitizers/testdata/tsan6.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan6.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan7.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan7.go
index 2fb9e45ee2..2fb9e45ee2 100644
--- a/misc/cgo/testsanitizers/testdata/tsan7.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan7.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan8.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan8.go
index 88d82a6078..88d82a6078 100644
--- a/misc/cgo/testsanitizers/testdata/tsan8.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan8.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan9.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan9.go
index 06304be751..06304be751 100644
--- a/misc/cgo/testsanitizers/testdata/tsan9.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan9.go
diff --git a/misc/cgo/testsanitizers/testdata/tsan_shared.go b/src/cmd/cgo/internal/testsanitizers/testdata/tsan_shared.go
index 55ff67ecba..55ff67ecba 100644
--- a/misc/cgo/testsanitizers/testdata/tsan_shared.go
+++ b/src/cmd/cgo/internal/testsanitizers/testdata/tsan_shared.go
diff --git a/misc/cgo/testsanitizers/tsan_test.go b/src/cmd/cgo/internal/testsanitizers/tsan_test.go
index f65d842363..f65d842363 100644
--- a/misc/cgo/testsanitizers/tsan_test.go
+++ b/src/cmd/cgo/internal/testsanitizers/tsan_test.go
diff --git a/misc/cgo/testshared/overlaydir_test.go b/src/cmd/cgo/internal/testshared/overlaydir_test.go
index eb587a2d44..eb587a2d44 100644
--- a/misc/cgo/testshared/overlaydir_test.go
+++ b/src/cmd/cgo/internal/testshared/overlaydir_test.go
diff --git a/misc/cgo/testshared/shared_test.go b/src/cmd/cgo/internal/testshared/shared_test.go
index 3a8fda05ed..34cf3f3141 100644
--- a/misc/cgo/testshared/shared_test.go
+++ b/src/cmd/cgo/internal/testshared/shared_test.go
@@ -95,7 +95,7 @@ func testMain(m *testing.M) (int, error) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	oldGOROOT = filepath.Join(cwd, "../../..")
+	oldGOROOT = filepath.Join(cwd, "../../../../..")
 
 	workDir, err := os.MkdirTemp("", "shared_test")
 	if err != nil {
diff --git a/misc/cgo/testshared/testdata/dep2/dep2.go b/src/cmd/cgo/internal/testshared/testdata/dep2/dep2.go
index 94f38cf507..94f38cf507 100644
--- a/misc/cgo/testshared/testdata/dep2/dep2.go
+++ b/src/cmd/cgo/internal/testshared/testdata/dep2/dep2.go
diff --git a/misc/cgo/testshared/testdata/dep3/dep3.go b/src/cmd/cgo/internal/testshared/testdata/dep3/dep3.go
index 6b02ad2ee5..6b02ad2ee5 100644
--- a/misc/cgo/testshared/testdata/dep3/dep3.go
+++ b/src/cmd/cgo/internal/testshared/testdata/dep3/dep3.go
diff --git a/misc/cgo/testshared/testdata/depBase/asm.s b/src/cmd/cgo/internal/testshared/testdata/depBase/asm.s
index 51adca3a33..51adca3a33 100644
--- a/misc/cgo/testshared/testdata/depBase/asm.s
+++ b/src/cmd/cgo/internal/testshared/testdata/depBase/asm.s
diff --git a/misc/cgo/testshared/testdata/depBase/dep.go b/src/cmd/cgo/internal/testshared/testdata/depBase/dep.go
index e7cc7c81eb..e7cc7c81eb 100644
--- a/misc/cgo/testshared/testdata/depBase/dep.go
+++ b/src/cmd/cgo/internal/testshared/testdata/depBase/dep.go
diff --git a/misc/cgo/testshared/testdata/depBase/gccgo.go b/src/cmd/cgo/internal/testshared/testdata/depBase/gccgo.go
index a59d0b8c3f..a59d0b8c3f 100644
--- a/misc/cgo/testshared/testdata/depBase/gccgo.go
+++ b/src/cmd/cgo/internal/testshared/testdata/depBase/gccgo.go
diff --git a/misc/cgo/testshared/testdata/depBase/stubs.go b/src/cmd/cgo/internal/testshared/testdata/depBase/stubs.go
index c15e4e9a74..c15e4e9a74 100644
--- a/misc/cgo/testshared/testdata/depBase/stubs.go
+++ b/src/cmd/cgo/internal/testshared/testdata/depBase/stubs.go
diff --git a/misc/cgo/testshared/testdata/division/division.go b/src/cmd/cgo/internal/testshared/testdata/division/division.go
index bb5fc98460..bb5fc98460 100644
--- a/misc/cgo/testshared/testdata/division/division.go
+++ b/src/cmd/cgo/internal/testshared/testdata/division/division.go
diff --git a/misc/cgo/testshared/testdata/exe/exe.go b/src/cmd/cgo/internal/testshared/testdata/exe/exe.go
index ee95f97bc9..ee95f97bc9 100644
--- a/misc/cgo/testshared/testdata/exe/exe.go
+++ b/src/cmd/cgo/internal/testshared/testdata/exe/exe.go
diff --git a/misc/cgo/testshared/testdata/exe2/exe2.go b/src/cmd/cgo/internal/testshared/testdata/exe2/exe2.go
index 433f331e36..433f331e36 100644
--- a/misc/cgo/testshared/testdata/exe2/exe2.go
+++ b/src/cmd/cgo/internal/testshared/testdata/exe2/exe2.go
diff --git a/misc/cgo/testshared/testdata/exe3/exe3.go b/src/cmd/cgo/internal/testshared/testdata/exe3/exe3.go
index 533e3a9e3d..533e3a9e3d 100644
--- a/misc/cgo/testshared/testdata/exe3/exe3.go
+++ b/src/cmd/cgo/internal/testshared/testdata/exe3/exe3.go
diff --git a/misc/cgo/testshared/testdata/execgo/exe.go b/src/cmd/cgo/internal/testshared/testdata/execgo/exe.go
index 0427be8bdf..0427be8bdf 100644
--- a/misc/cgo/testshared/testdata/execgo/exe.go
+++ b/src/cmd/cgo/internal/testshared/testdata/execgo/exe.go
diff --git a/misc/cgo/testshared/testdata/explicit/explicit.go b/src/cmd/cgo/internal/testshared/testdata/explicit/explicit.go
index af969fcb23..af969fcb23 100644
--- a/misc/cgo/testshared/testdata/explicit/explicit.go
+++ b/src/cmd/cgo/internal/testshared/testdata/explicit/explicit.go
diff --git a/misc/cgo/testshared/testdata/gcdata/main/main.go b/src/cmd/cgo/internal/testshared/testdata/gcdata/main/main.go
index 394862fd94..394862fd94 100644
--- a/misc/cgo/testshared/testdata/gcdata/main/main.go
+++ b/src/cmd/cgo/internal/testshared/testdata/gcdata/main/main.go
diff --git a/misc/cgo/testshared/testdata/gcdata/p/p.go b/src/cmd/cgo/internal/testshared/testdata/gcdata/p/p.go
index 1fee75429e..1fee75429e 100644
--- a/misc/cgo/testshared/testdata/gcdata/p/p.go
+++ b/src/cmd/cgo/internal/testshared/testdata/gcdata/p/p.go
diff --git a/misc/cgo/testshared/testdata/global/main.go b/src/cmd/cgo/internal/testshared/testdata/global/main.go
index f43e7c3fb3..f43e7c3fb3 100644
--- a/misc/cgo/testshared/testdata/global/main.go
+++ b/src/cmd/cgo/internal/testshared/testdata/global/main.go
diff --git a/misc/cgo/testshared/testdata/globallib/global.go b/src/cmd/cgo/internal/testshared/testdata/globallib/global.go
index b4372a2e9e..b4372a2e9e 100644
--- a/misc/cgo/testshared/testdata/globallib/global.go
+++ b/src/cmd/cgo/internal/testshared/testdata/globallib/global.go
diff --git a/misc/cgo/testshared/testdata/iface/main.go b/src/cmd/cgo/internal/testshared/testdata/iface/main.go
index d26ebbcc9c..d26ebbcc9c 100644
--- a/misc/cgo/testshared/testdata/iface/main.go
+++ b/src/cmd/cgo/internal/testshared/testdata/iface/main.go
diff --git a/misc/cgo/testshared/testdata/iface_a/a.go b/src/cmd/cgo/internal/testshared/testdata/iface_a/a.go
index e2cef1ecda..e2cef1ecda 100644
--- a/misc/cgo/testshared/testdata/iface_a/a.go
+++ b/src/cmd/cgo/internal/testshared/testdata/iface_a/a.go
diff --git a/misc/cgo/testshared/testdata/iface_b/b.go b/src/cmd/cgo/internal/testshared/testdata/iface_b/b.go
index dd3e027b37..dd3e027b37 100644
--- a/misc/cgo/testshared/testdata/iface_b/b.go
+++ b/src/cmd/cgo/internal/testshared/testdata/iface_b/b.go
diff --git a/misc/cgo/testshared/testdata/iface_i/i.go b/src/cmd/cgo/internal/testshared/testdata/iface_i/i.go
index 31c80387c7..31c80387c7 100644
--- a/misc/cgo/testshared/testdata/iface_i/i.go
+++ b/src/cmd/cgo/internal/testshared/testdata/iface_i/i.go
diff --git a/misc/cgo/testshared/testdata/implicit/implicit.go b/src/cmd/cgo/internal/testshared/testdata/implicit/implicit.go
index 5360188c56..5360188c56 100644
--- a/misc/cgo/testshared/testdata/implicit/implicit.go
+++ b/src/cmd/cgo/internal/testshared/testdata/implicit/implicit.go
diff --git a/misc/cgo/testshared/testdata/implicitcmd/implicitcmd.go b/src/cmd/cgo/internal/testshared/testdata/implicitcmd/implicitcmd.go
index 4d4296738e..4d4296738e 100644
--- a/misc/cgo/testshared/testdata/implicitcmd/implicitcmd.go
+++ b/src/cmd/cgo/internal/testshared/testdata/implicitcmd/implicitcmd.go
diff --git a/misc/cgo/testshared/testdata/issue25065/a.go b/src/cmd/cgo/internal/testshared/testdata/issue25065/a.go
index 646de4e52f..646de4e52f 100644
--- a/misc/cgo/testshared/testdata/issue25065/a.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue25065/a.go
diff --git a/misc/cgo/testshared/testdata/issue30768/issue30768lib/lib.go b/src/cmd/cgo/internal/testshared/testdata/issue30768/issue30768lib/lib.go
index 9e45ebe683..9e45ebe683 100644
--- a/misc/cgo/testshared/testdata/issue30768/issue30768lib/lib.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue30768/issue30768lib/lib.go
diff --git a/misc/cgo/testshared/testdata/issue30768/x_test.go b/src/cmd/cgo/internal/testshared/testdata/issue30768/x_test.go
index 1bbd139d3e..1bbd139d3e 100644
--- a/misc/cgo/testshared/testdata/issue30768/x_test.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue30768/x_test.go
diff --git a/misc/cgo/testshared/testdata/issue39777/a/a.go b/src/cmd/cgo/internal/testshared/testdata/issue39777/a/a.go
index c7bf835951..c7bf835951 100644
--- a/misc/cgo/testshared/testdata/issue39777/a/a.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue39777/a/a.go
diff --git a/misc/cgo/testshared/testdata/issue39777/b/b.go b/src/cmd/cgo/internal/testshared/testdata/issue39777/b/b.go
index 4e681965e6..4e681965e6 100644
--- a/misc/cgo/testshared/testdata/issue39777/b/b.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue39777/b/b.go
diff --git a/misc/cgo/testshared/testdata/issue44031/a/a.go b/src/cmd/cgo/internal/testshared/testdata/issue44031/a/a.go
index 48827e682f..48827e682f 100644
--- a/misc/cgo/testshared/testdata/issue44031/a/a.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue44031/a/a.go
diff --git a/misc/cgo/testshared/testdata/issue44031/b/b.go b/src/cmd/cgo/internal/testshared/testdata/issue44031/b/b.go
index ad3ebec2b9..ad3ebec2b9 100644
--- a/misc/cgo/testshared/testdata/issue44031/b/b.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue44031/b/b.go
diff --git a/misc/cgo/testshared/testdata/issue44031/main/main.go b/src/cmd/cgo/internal/testshared/testdata/issue44031/main/main.go
index 47f2e3a98e..47f2e3a98e 100644
--- a/misc/cgo/testshared/testdata/issue44031/main/main.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue44031/main/main.go
diff --git a/misc/cgo/testshared/testdata/issue47837/a/a.go b/src/cmd/cgo/internal/testshared/testdata/issue47837/a/a.go
index 68588eda2f..68588eda2f 100644
--- a/misc/cgo/testshared/testdata/issue47837/a/a.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue47837/a/a.go
diff --git a/misc/cgo/testshared/testdata/issue47837/main/main.go b/src/cmd/cgo/internal/testshared/testdata/issue47837/main/main.go
index 77c6f34379..77c6f34379 100644
--- a/misc/cgo/testshared/testdata/issue47837/main/main.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue47837/main/main.go
diff --git a/misc/cgo/testshared/testdata/issue58966/main.go b/src/cmd/cgo/internal/testshared/testdata/issue58966/main.go
index 2d923c3607..2d923c3607 100644
--- a/misc/cgo/testshared/testdata/issue58966/main.go
+++ b/src/cmd/cgo/internal/testshared/testdata/issue58966/main.go
diff --git a/misc/cgo/testshared/testdata/trivial/trivial.go b/src/cmd/cgo/internal/testshared/testdata/trivial/trivial.go
index 6ade47ce36..6ade47ce36 100644
--- a/misc/cgo/testshared/testdata/trivial/trivial.go
+++ b/src/cmd/cgo/internal/testshared/testdata/trivial/trivial.go
diff --git a/misc/cgo/testso/noso_test.go b/src/cmd/cgo/internal/testso/noso_test.go
index 45b13e1928..45b13e1928 100644
--- a/misc/cgo/testso/noso_test.go
+++ b/src/cmd/cgo/internal/testso/noso_test.go
diff --git a/misc/cgo/testso/overlaydir_test.go b/src/cmd/cgo/internal/testso/overlaydir_test.go
index 09a1d512f1..09a1d512f1 100644
--- a/misc/cgo/testso/overlaydir_test.go
+++ b/src/cmd/cgo/internal/testso/overlaydir_test.go
diff --git a/misc/cgo/testso/so_test.go b/src/cmd/cgo/internal/testso/so_test.go
index 5c460d21b6..5c460d21b6 100644
--- a/misc/cgo/testso/so_test.go
+++ b/src/cmd/cgo/internal/testso/so_test.go
diff --git a/misc/cgo/testso/testdata/cgoso.c b/src/cmd/cgo/internal/testso/testdata/cgoso.c
index 612e5d335a..612e5d335a 100644
--- a/misc/cgo/testso/testdata/cgoso.c
+++ b/src/cmd/cgo/internal/testso/testdata/cgoso.c
diff --git a/misc/cgo/testso/testdata/cgoso.go b/src/cmd/cgo/internal/testso/testdata/cgoso.go
index b59b2a8e8b..b59b2a8e8b 100644
--- a/misc/cgo/testso/testdata/cgoso.go
+++ b/src/cmd/cgo/internal/testso/testdata/cgoso.go
diff --git a/misc/cgo/testso/testdata/cgoso_c.c b/src/cmd/cgo/internal/testso/testdata/cgoso_c.c
index d5fb559f83..d5fb559f83 100644
--- a/misc/cgo/testso/testdata/cgoso_c.c
+++ b/src/cmd/cgo/internal/testso/testdata/cgoso_c.c
diff --git a/misc/cgo/testso/testdata/cgoso_unix.go b/src/cmd/cgo/internal/testso/testdata/cgoso_unix.go
index ea9cb0a903..ea9cb0a903 100644
--- a/misc/cgo/testso/testdata/cgoso_unix.go
+++ b/src/cmd/cgo/internal/testso/testdata/cgoso_unix.go
diff --git a/misc/cgo/testso/testdata/main.go b/src/cmd/cgo/internal/testso/testdata/main.go
index 84382f739c..84382f739c 100644
--- a/misc/cgo/testso/testdata/main.go
+++ b/src/cmd/cgo/internal/testso/testdata/main.go
diff --git a/misc/cgo/testsovar/noso_test.go b/src/cmd/cgo/internal/testsovar/noso_test.go
index 45b13e1928..45b13e1928 100644
--- a/misc/cgo/testsovar/noso_test.go
+++ b/src/cmd/cgo/internal/testsovar/noso_test.go
diff --git a/misc/cgo/testsovar/overlaydir_test.go b/src/cmd/cgo/internal/testsovar/overlaydir_test.go
index 09a1d512f1..09a1d512f1 100644
--- a/misc/cgo/testsovar/overlaydir_test.go
+++ b/src/cmd/cgo/internal/testsovar/overlaydir_test.go
diff --git a/misc/cgo/testsovar/so_test.go b/src/cmd/cgo/internal/testsovar/so_test.go
index 5c460d21b6..5c460d21b6 100644
--- a/misc/cgo/testsovar/so_test.go
+++ b/src/cmd/cgo/internal/testsovar/so_test.go
diff --git a/misc/cgo/testsovar/testdata/cgoso.go b/src/cmd/cgo/internal/testsovar/testdata/cgoso.go
index d9deb556da..d9deb556da 100644
--- a/misc/cgo/testsovar/testdata/cgoso.go
+++ b/src/cmd/cgo/internal/testsovar/testdata/cgoso.go
diff --git a/misc/cgo/testsovar/testdata/cgoso_c.c b/src/cmd/cgo/internal/testsovar/testdata/cgoso_c.c
index 36f4d570ee..36f4d570ee 100644
--- a/misc/cgo/testsovar/testdata/cgoso_c.c
+++ b/src/cmd/cgo/internal/testsovar/testdata/cgoso_c.c
diff --git a/misc/cgo/testsovar/testdata/cgoso_c.h b/src/cmd/cgo/internal/testsovar/testdata/cgoso_c.h
index eccd8c0d0c..eccd8c0d0c 100644
--- a/misc/cgo/testsovar/testdata/cgoso_c.h
+++ b/src/cmd/cgo/internal/testsovar/testdata/cgoso_c.h
diff --git a/misc/cgo/testsovar/testdata/main.go b/src/cmd/cgo/internal/testsovar/testdata/main.go
index 018b835c6c..018b835c6c 100644
--- a/misc/cgo/testsovar/testdata/main.go
+++ b/src/cmd/cgo/internal/testsovar/testdata/main.go
diff --git a/misc/cgo/stdio/overlaydir_test.go b/src/cmd/cgo/internal/teststdio/overlaydir_test.go
index 027ebf17c3..027ebf17c3 100644
--- a/misc/cgo/stdio/overlaydir_test.go
+++ b/src/cmd/cgo/internal/teststdio/overlaydir_test.go
diff --git a/misc/cgo/stdio/stdio_test.go b/src/cmd/cgo/internal/teststdio/stdio_test.go
index cd03443ec2..cd03443ec2 100644
--- a/misc/cgo/stdio/stdio_test.go
+++ b/src/cmd/cgo/internal/teststdio/stdio_test.go
diff --git a/misc/cgo/stdio/testdata/chain.go b/src/cmd/cgo/internal/teststdio/testdata/chain.go
index c7163f5ae0..c7163f5ae0 100644
--- a/misc/cgo/stdio/testdata/chain.go
+++ b/src/cmd/cgo/internal/teststdio/testdata/chain.go
diff --git a/misc/cgo/stdio/testdata/chain.out b/src/cmd/cgo/internal/teststdio/testdata/chain.out
index 963cf9b667..963cf9b667 100644
--- a/misc/cgo/stdio/testdata/chain.out
+++ b/src/cmd/cgo/internal/teststdio/testdata/chain.out
diff --git a/misc/cgo/stdio/testdata/fib.go b/src/cmd/cgo/internal/teststdio/testdata/fib.go
index 9617368335..9617368335 100644
--- a/misc/cgo/stdio/testdata/fib.go
+++ b/src/cmd/cgo/internal/teststdio/testdata/fib.go
diff --git a/misc/cgo/stdio/testdata/fib.out b/src/cmd/cgo/internal/teststdio/testdata/fib.out
index 17ff503356..17ff503356 100644
--- a/misc/cgo/stdio/testdata/fib.out
+++ b/src/cmd/cgo/internal/teststdio/testdata/fib.out
diff --git a/misc/cgo/stdio/testdata/hello.go b/src/cmd/cgo/internal/teststdio/testdata/hello.go
index c0b52bf6c5..c0b52bf6c5 100644
--- a/misc/cgo/stdio/testdata/hello.go
+++ b/src/cmd/cgo/internal/teststdio/testdata/hello.go
diff --git a/misc/cgo/stdio/testdata/hello.out b/src/cmd/cgo/internal/teststdio/testdata/hello.out
index 4b5fa63702..4b5fa63702 100644
--- a/misc/cgo/stdio/testdata/hello.out
+++ b/src/cmd/cgo/internal/teststdio/testdata/hello.out
diff --git a/misc/cgo/stdio/testdata/stdio/file.go b/src/cmd/cgo/internal/teststdio/testdata/stdio/file.go
index 2aa282eed3..d97ee4c3a1 100644
--- a/misc/cgo/stdio/testdata/stdio/file.go
+++ b/src/cmd/cgo/internal/teststdio/testdata/stdio/file.go
@@ -5,7 +5,7 @@
 /*
 A trivial example of wrapping a C library in Go.
 For a more complex example and explanation,
-see ../gmp/gmp.go.
+see misc/cgo/gmp/gmp.go.
 */
 
 package stdio
diff --git a/misc/cgo/stdio/testdata/stdio/stdio.go b/src/cmd/cgo/internal/teststdio/testdata/stdio/stdio.go
index 08286d4898..08286d4898 100644
--- a/misc/cgo/stdio/testdata/stdio/stdio.go
+++ b/src/cmd/cgo/internal/teststdio/testdata/stdio/stdio.go
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 31eb69113a..2bab3cd34f 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -595,6 +595,20 @@ func (t *tester) registerTests() {
 	// whose test registration happens in a special way.
 	registerStdTestSpecially := map[string]bool{
 		"internal/testdir": true, // Registered at the bottom with sharding.
+		// cgo tests are registered specially because they involve unusual build
+		// conditions and flags.
+		"cmd/cgo/internal/teststdio":      true,
+		"cmd/cgo/internal/testlife":       true,
+		"cmd/cgo/internal/testfortran":    true,
+		"cmd/cgo/internal/testgodefs":     true,
+		"cmd/cgo/internal/testso":         true,
+		"cmd/cgo/internal/testsovar":      true,
+		"cmd/cgo/internal/testcarchive":   true,
+		"cmd/cgo/internal/testcshared":    true,
+		"cmd/cgo/internal/testshared":     true,
+		"cmd/cgo/internal/testplugin":     true,
+		"cmd/cgo/internal/testsanitizers": true,
+		"cmd/cgo/internal/testerrors":     true,
 	}
 
 	// Fast path to avoid the ~1 second of `go list std cmd` when
@@ -848,10 +862,10 @@ func (t *tester) registerTests() {
 
 	if t.cgoEnabled && !t.iOS() {
 		// Disabled on iOS. golang.org/issue/15919
-		t.registerTest("cgo_stdio", "", &goTest{dir: "../misc/cgo/stdio", timeout: 5 * time.Minute}, rtHostTest{})
-		t.registerTest("cgo_life", "", &goTest{dir: "../misc/cgo/life", timeout: 5 * time.Minute}, rtHostTest{})
+		t.registerTest("cgo_teststdio", "", &goTest{dir: "cmd/cgo/internal/teststdio", timeout: 5 * time.Minute}, rtHostTest{})
+		t.registerTest("cgo_testlife", "", &goTest{dir: "cmd/cgo/internal/testlife", timeout: 5 * time.Minute}, rtHostTest{})
 		if goos != "android" {
-			t.registerTest("cgo_fortran", "", &goTest{dir: "../misc/cgo/fortran", timeout: 5 * time.Minute}, rtHostTest{})
+			t.registerTest("cgo_testfortran", "", &goTest{dir: "cmd/cgo/internal/testfortran", timeout: 5 * time.Minute}, rtHostTest{})
 		}
 		if t.hasSwig() && goos != "android" {
 			t.registerTest("swig_stdio", "", &goTest{dir: "../misc/swig/stdio"})
@@ -879,29 +893,29 @@ func (t *tester) registerTests() {
 	// recompile the entire standard library. If make.bash ran with
 	// special -gcflags, that's not true.
 	if t.cgoEnabled && gogcflags == "" {
-		t.registerTest("testgodefs", "", &goTest{dir: "../misc/cgo/testgodefs", timeout: 5 * time.Minute}, rtHostTest{})
+		t.registerTest("cgo_testgodefs", "", &goTest{dir: "cmd/cgo/internal/testgodefs", timeout: 5 * time.Minute}, rtHostTest{})
 
-		t.registerTest("testso", "", &goTest{dir: "../misc/cgo/testso", timeout: 600 * time.Second})
-		t.registerTest("testsovar", "", &goTest{dir: "../misc/cgo/testsovar", timeout: 600 * time.Second})
+		t.registerTest("cgo_testso", "", &goTest{dir: "cmd/cgo/internal/testso", timeout: 600 * time.Second})
+		t.registerTest("cgo_testsovar", "", &goTest{dir: "cmd/cgo/internal/testsovar", timeout: 600 * time.Second})
 		if t.supportedBuildmode("c-archive") {
-			t.registerTest("testcarchive", "", &goTest{dir: "../misc/cgo/testcarchive", timeout: 5 * time.Minute}, rtHostTest{})
+			t.registerTest("cgo_testcarchive", "", &goTest{dir: "cmd/cgo/internal/testcarchive", timeout: 5 * time.Minute}, rtHostTest{})
 		}
 		if t.supportedBuildmode("c-shared") {
-			t.registerTest("testcshared", "", &goTest{dir: "../misc/cgo/testcshared", timeout: 5 * time.Minute}, rtHostTest{})
+			t.registerTest("cgo_testcshared", "", &goTest{dir: "cmd/cgo/internal/testcshared", timeout: 5 * time.Minute}, rtHostTest{})
 		}
 		if t.supportedBuildmode("shared") {
-			t.registerTest("testshared", "", &goTest{dir: "../misc/cgo/testshared", timeout: 600 * time.Second})
+			t.registerTest("cgo_testshared", "", &goTest{dir: "cmd/cgo/internal/testshared", timeout: 600 * time.Second})
 		}
 		if t.supportedBuildmode("plugin") {
-			t.registerTest("testplugin", "", &goTest{dir: "../misc/cgo/testplugin", timeout: 600 * time.Second})
+			t.registerTest("cgo_testplugin", "", &goTest{dir: "cmd/cgo/internal/testplugin", timeout: 600 * time.Second})
 		}
 		if goos == "linux" || (goos == "freebsd" && goarch == "amd64") {
-			// because Pdeathsig of syscall.SysProcAttr struct used in misc/cgo/testsanitizers is only
+			// because Pdeathsig of syscall.SysProcAttr struct used in cmd/cgo/internal/testsanitizers is only
 			// supported on Linux and FreeBSD.
-			t.registerTest("testsanitizers", "", &goTest{dir: "../misc/cgo/testsanitizers", timeout: 5 * time.Minute}, rtHostTest{})
+			t.registerTest("cgo_testsanitizers", "", &goTest{dir: "cmd/cgo/internal/testsanitizers", timeout: 5 * time.Minute}, rtHostTest{})
 		}
 		if t.hasBash() && goos != "android" && !t.iOS() && gohostos != "windows" {
-			t.registerTest("cgo_errors", "", &goTest{dir: "../misc/cgo/errors", timeout: 5 * time.Minute}, rtHostTest{})
+			t.registerTest("cgo_errors", "", &goTest{dir: "cmd/cgo/internal/testerrors", timeout: 5 * time.Minute}, rtHostTest{})
 		}
 	}
 
diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index 24f32ee825..1d5c074fdc 100644
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -1851,7 +1851,7 @@ func (p *Package) load(ctx context.Context, opts PackageOpts, path string, stk *
 	} else {
 		p.Target = p.Internal.Build.PkgObj
 		if cfg.BuildBuildmode == "shared" && p.Internal.Build.PkgTargetRoot != "" {
-			// TODO(matloob): This shouldn't be necessary, but the misc/cgo/testshared
+			// TODO(matloob): This shouldn't be necessary, but the cmd/cgo/internal/testshared
 			// test fails without Target set for this condition. Figure out why and
 			// fix it.
 			p.Target = filepath.Join(p.Internal.Build.PkgTargetRoot, p.ImportPath+".a")
diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go
index 8242e32fef..0750351133 100644
--- a/src/cmd/go/internal/work/init.go
+++ b/src/cmd/go/internal/work/init.go
@@ -396,7 +396,7 @@ func compilerVersion() (version, error) {
 }
 
 // compilerRequiredAsanVersion is a copy of the function defined in
-// misc/cgo/testsanitizers/cc_test.go
+// cmd/cgo/internal/testsanitizers/cc_test.go
 // compilerRequiredAsanVersion reports whether the compiler is the version
 // required by Asan.
 func compilerRequiredAsanVersion() error {