os, testing: just check runtime.GOOS == "wasip1"

src/os/is_wasi_no_test.go

@@ -1,5 +0,0 @@
-//go:build !wasip1
-
-package os_test
-
-const isWASI = false

src/os/is_wasi_test.go

@@ -1,5 +0,0 @@
-//go:build wasip1
-
-package os_test
-
-const isWASI = true

src/os/os_anyos_test.go

@@ -275,7 +275,7 @@ func TestDirFS(t *testing.T) {
 		t.Log("TODO: implement Readdir for Windows")
 		return
 	}
-	if isWASI {
+	if runtime.GOOS == "wasip1" {
 		t.Log("TODO: allow foo/bar/. as synonym for path foo/bar on wasi?")
 		return
 	}
@@ -296,7 +296,7 @@ func TestDirFSPathsValid(t *testing.T) {
 		t.Log("skipping on Windows")
 		return
 	}
-	if isWASI {
+	if runtime.GOOS == "wasip1" {
 		t.Log("skipping on wasi because it fails on wasi on windows")
 		return
 	}

src/testing/is_wasi_no_test.go

@@ -1,9 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-//go:build !wasip1
-
-package testing_test
-
-const isWASI = false

src/testing/is_wasi_test.go

@@ -1,9 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-//go:build wasip1
-
-package testing_test
-
-const isWASI = true

src/testing/testing_test.go

@@ -13,6 +13,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 )
 
@@ -25,7 +26,7 @@ func TestMain(m *testing.M) {
 }
 
 func TestTempDirInCleanup(t *testing.T) {
-	if isWASI {
+	if runtime.GOOS == "wasip1" {
 		t.Log("Skipping.  TODO: implement RemoveAll for wasi")
 		return
 	}
@@ -62,7 +63,7 @@ func TestTempDirInBenchmark(t *testing.T) {
 }
 
 func TestTempDir(t *testing.T) {
-	if isWASI {
+	if runtime.GOOS == "wasip1" {
 		t.Log("Skipping.  TODO: implement RemoveAll for wasi")
 		return
 	}