misc/wasm: move wasm runtime files to lib/wasm

Zxilly · Zxilly · commit 062fe8d4c1dd · 2024-08-18T12:33:50.000+08:00
diff --git a/doc/next/7-ports.md b/doc/next/7-ports.md
@@ -1,2 +1,5 @@
 ## Ports {#ports}
 
+### WebAssembly {#wasm}
+
+The support files for WebAssembly have been moved to `lib/wasm` from `misc/wasm`.
diff --git a/lib/wasm/go_js_wasm_exec b/lib/wasm/go_js_wasm_exec
diff --git a/lib/wasm/go_wasip1_wasm_exec b/lib/wasm/go_wasip1_wasm_exec
diff --git a/lib/wasm/wasm_exec.html b/lib/wasm/wasm_exec.html
diff --git a/lib/wasm/wasm_exec.js b/lib/wasm/wasm_exec.js
diff --git a/lib/wasm/wasm_exec_node.js b/lib/wasm/wasm_exec_node.js
diff --git a/src/cmd/distpack/test.go b/src/cmd/distpack/test.go
@@ -73,6 +73,11 @@ var modRules = []testRule{
 	{name: "golang.org/toolchain@*/src/cmd/go/main.go"},
 	{name: "golang.org/toolchain@*/src/bytes/bytes.go"},
 
+	{name: "golang.org/toolchain@*/lib/wasm/go_js_wasm_exec"},
+	{name: "golang.org/toolchain@*/lib/wasm/go_wasip1_wasm_exec"},
+	{name: "golang.org/toolchain@*/lib/wasm/wasm_exec.js"},
+	{name: "golang.org/toolchain@*/lib/wasm/wasm_exec_node.js"},
+
 	{name: "**/.DS_Store", exclude: true},
 	{name: "golang.org/toolchain@*/.git", exclude: true},
 	{name: "golang.org/toolchain@*/.gitattributes", exclude: true},
diff --git a/src/cmd/go/internal/toolchain/select.go b/src/cmd/go/internal/toolchain/select.go
@@ -353,13 +353,20 @@ func Exec(gotoolchain string) {
 			base.Fatalf("download %s: %v", gotoolchain, err)
 		}
 		if info.Mode()&0111 == 0 {
-			// allowExec sets the exec permission bits on all files found in dir.
-			allowExec := func(dir string) {
+			// allowExec sets the exec permission bits on all files found in dir if pattern is the empty string,
+			// or only those files that match the pattern if it's non-empty.
+			allowExec := func(dir, pattern string) {
 				err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
 					if err != nil {
 						return err
 					}
 					if !d.IsDir() {
+						if pattern != "" {
+							if matched, _ := filepath.Match(pattern, d.Name()); !matched {
+								// Skip file.
+								return nil
+							}
+						}
 						info, err := os.Stat(path)
 						if err != nil {
 							return err
@@ -380,12 +387,13 @@ func Exec(gotoolchain string) {
 			// then the check of bin/go above might succeed, the other go command
 			// would skip its own mode-setting, and then the go command might
 			// try to run a tool before we get to setting the bits on pkg/tool.
-			// Setting pkg/tool before bin/go avoids that ordering problem.
+			// Setting pkg/tool and lib before bin/go avoids that ordering problem.
 			// The only other tool the go command invokes is gofmt,
 			// so we set that one explicitly before handling bin (which will include bin/go).
-			allowExec(filepath.Join(dir, "pkg/tool"))
-			allowExec(filepath.Join(dir, "bin/gofmt"))
-			allowExec(filepath.Join(dir, "bin"))
+			allowExec(filepath.Join(dir, "pkg/tool"), "")
+			allowExec(filepath.Join(dir, "lib"), "go_*_*_exec")
+			allowExec(filepath.Join(dir, "bin/gofmt"), "")
+			allowExec(filepath.Join(dir, "bin"), "")
 		}
 	}
 
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.aix-ppc64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.aix-ppc64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-386.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-386.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-arm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-arm.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.android-arm64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.darwin-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.darwin-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.darwin-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.darwin-arm64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.dragonfly-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.dragonfly-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-386.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-386.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-arm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-arm.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-arm64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-riscv64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.freebsd-riscv64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.illumos-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.illumos-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.ios-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.ios-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.ios-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.ios-arm64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.js-wasm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.js-wasm.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-386.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-386.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-arm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-arm.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-arm64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-loong64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-loong64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-mips64x.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-mips64x.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-mipsx.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-mipsx.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-ppc64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-ppc64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-ppc64le.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-ppc64le.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-riscv64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-riscv64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-s390x.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.linux-s390x.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-386.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-386.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-arm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-arm.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.netbsd-arm64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-386.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-386.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-arm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-arm.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-arm64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-mips64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-mips64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-ppc64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-ppc64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-riscv64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.openbsd-riscv64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.plan9-386.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.plan9-386.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.plan9-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.plan9-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.plan9-arm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.plan9-arm.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.solaris-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.solaris-amd64.txt
@@ -12,3 +12,4 @@ echo go1.999testmod here!
 -- bin/gofmt --
 echo i am unused
 -- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-386.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-386.txt
@@ -8,3 +8,5 @@ module golang.org/toolchain
 module golang.org/toolchain
 -- bin/go.bat --
 @echo go1.999testmod here!
+-- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-amd64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-amd64.txt
@@ -8,3 +8,5 @@ module golang.org/toolchain
 module golang.org/toolchain
 -- bin/go.bat --
 @echo go1.999testmod here!
+-- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-arm.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-arm.txt
@@ -8,3 +8,5 @@ module golang.org/toolchain
 module golang.org/toolchain
 -- bin/go.bat --
 @echo go1.999testmod here!
+-- pkg/tool/fake --
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-arm64.txt b/src/cmd/go/testdata/mod/golang.org_toolchain_v0.0.1-go1.999testmod.windows-arm64.txt
@@ -8,3 +8,4 @@ module golang.org/toolchain
 module golang.org/toolchain
 -- bin/go.bat --
 @echo go1.999testmod here!
+-- lib/wasm/go_js_wasm_exec --
diff --git a/src/syscall/js/js_test.go b/src/syscall/js/js_test.go
@@ -7,7 +7,7 @@
 // To run these tests:
 //
 // - Install Node
-// - Add /path/to/go/misc/wasm to your $PATH (so that "go test" can find
+// - Add /path/to/go/lib/wasm to your $PATH (so that "go test" can find
 //   "go_js_wasm_exec").
 // - GOOS=js GOARCH=wasm go test
 //
@@ -587,13 +587,13 @@ func TestGarbageCollection(t *testing.T) {
 // Note: All JavaScript functions return a JavaScript array, which will cause
 // one allocation to be created to track the Value.gcPtr for the Value finalizer.
 var allocTests = []struct {
-	argLen  int // The number of arguments to use for the syscall
+	argLen   int // The number of arguments to use for the syscall
 	expected int // The expected number of allocations
 }{
 	// For less than or equal to 16 arguments, we expect 1 alloction:
 	// - makeValue new(ref)
-	{0,  1},
-	{2,  1},
+	{0, 1},
+	{2, 1},
 	{15, 1},
 	{16, 1},
 	// For greater than 16 arguments, we expect 3 alloction:
@@ -613,7 +613,7 @@ func TestCallAllocations(t *testing.T) {
 		tmpArray := js.Global().Get("Array").New(0)
 		numAllocs := testing.AllocsPerRun(100, func() {
 			tmpArray.Call("concat", args...)
-		});
+		})
 
 		if numAllocs != float64(test.expected) {
 			t.Errorf("got numAllocs %#v, want %#v", numAllocs, test.expected)
@@ -630,7 +630,7 @@ func TestInvokeAllocations(t *testing.T) {
 		concatFunc := tmpArray.Get("concat").Call("bind", tmpArray)
 		numAllocs := testing.AllocsPerRun(100, func() {
 			concatFunc.Invoke(args...)
-		});
+		})
 
 		if numAllocs != float64(test.expected) {
 			t.Errorf("got numAllocs %#v, want %#v", numAllocs, test.expected)
@@ -647,7 +647,7 @@ func TestNewAllocations(t *testing.T) {
 
 		numAllocs := testing.AllocsPerRun(100, func() {
 			arrayConstructor.New(args...)
-		});
+		})
 
 		if numAllocs != float64(test.expected) {
 			t.Errorf("got numAllocs %#v, want %#v", numAllocs, test.expected)
