From: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
Date: Tue, 1 Aug 2023 23:01:13 +0000 (-0700)
Subject: [release-branch.go1.21] runtime/internal: switch GOWASIRUNTIME default
X-Git-Tag: go1.21.0~3
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=aeef93cd648b19de8d9e6899dec370b7c99740d3;p=gostls13.git

[release-branch.go1.21] runtime/internal: switch GOWASIRUNTIME default

CL 513235 switched the default wasip1 runtime in the misc/wasm
executable script, but it missed this use of the GOWASIRUNTIME
environment variable. Update this instance to make the default runtime
choice consistent.

Change-Id: Iff7f96231422747a38d65d13a940f6e9d04d835d
Reviewed-on: https://go-review.googlesource.com/c/go/+/515116
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
---

diff --git a/src/runtime/internal/wasitest/tcpecho_test.go b/src/runtime/internal/wasitest/tcpecho_test.go
index c56af2cc85..c15da86f35 100644
--- a/src/runtime/internal/wasitest/tcpecho_test.go
+++ b/src/runtime/internal/wasitest/tcpecho_test.go
@@ -44,9 +44,9 @@ func TestTCPEcho(t *testing.T) {
 	subProcess.Env = append(os.Environ(), "GOOS=wasip1", "GOARCH=wasm")
 
 	switch os.Getenv("GOWASIRUNTIME") {
-	case "wazero", "":
+	case "wazero":
 		subProcess.Env = append(subProcess.Env, "GOWASIRUNTIMEARGS=--listen="+host)
-	case "wasmtime":
+	case "wasmtime", "":
 		subProcess.Env = append(subProcess.Env, "GOWASIRUNTIMEARGS=--tcplisten="+host)
 	default:
 		t.Skip("WASI runtime does not support sockets")