Make sure GopherJS tests work correctly under when build as js/wasm.

- Fix skip condition in tests that should be run under normal Go. - TestNativesDontImportExtraPackages loads original packages with `js/wasm` build target.
gopherjs · nevkontakte · Apr 20, 2022 · Oct 2, 2021 · Oct 2, 2021 · Oct 3, 2021
commit d6aec8e68e1bda586d93a2cb5a113aeecdde3b62
diff --git a/build/build_test.go b/build/build_test.go
@@ -25,6 +25,9 @@ func TestNativesDontImportExtraPackages(t *testing.T) {
 	// It's needed for populateImportSet.
 	stdOnly := gobuild.Default
 	stdOnly.GOPATH = "" // We only care about standard library, so skip all GOPATH packages.
+	// FIXME(nevkontakte): Use appropriate GOOS/GOARCH.
+	stdOnly.GOOS = "js"
+	stdOnly.GOARCH = "wasm"
 	forward, _, err := importgraphutil.BuildNoTests(&stdOnly)
 	if err != nil {
 		t.Fatalf("importgraphutil.BuildNoTests: %v", err)
@@ -76,7 +79,7 @@ func TestNativesDontImportExtraPackages(t *testing.T) {
 			// Normal package.
 			{
 				// Import the real normal package, and populate its real import set.
-				bpkg, err := gobuild.Import(pkg, "", gobuild.ImportComment)
+				bpkg, err := stdOnly.Import(pkg, "", gobuild.ImportComment)
 				if err != nil {
 					t.Fatalf("gobuild.Import: %v", err)
 				}
@@ -115,7 +118,7 @@ func TestNativesDontImportExtraPackages(t *testing.T) {
 			// Test package.
 			{
 				// Import the real test package, and populate its real import set.
-				bpkg, err := gobuild.Import(pkg, "", gobuild.ImportComment)
+				bpkg, err := stdOnly.Import(pkg, "", gobuild.ImportComment)
 				if err != nil {
 					t.Fatalf("gobuild.Import: %v", err)
 				}
@@ -154,7 +157,7 @@ func TestNativesDontImportExtraPackages(t *testing.T) {
 			// External test package.
 			{
 				// Import the real external test package, and populate its real import set.
-				bpkg, err := gobuild.Import(pkg, "", gobuild.ImportComment)
+				bpkg, err := stdOnly.Import(pkg, "", gobuild.ImportComment)
 				if err != nil {
 					t.Fatalf("gobuild.Import: %v", err)
 				}

diff --git a/compiler/natives/src/internal/syscall/unix/unix.go b/compiler/natives/src/internal/syscall/unix/unix.go
@@ -1,5 +1,5 @@
-//go:build js
-// +build js
+//go:build js && !wasm
+// +build js,!wasm
 
 package unix
 

diff --git a/compiler/natives/src/syscall/js/js.go b/compiler/natives/src/syscall/js/js.go
@@ -4,7 +4,6 @@
 package js
 
 import (
-	"reflect"
 	"unsafe"
 
 	"github.com/gopherjs/gopherjs/js"
@@ -160,7 +159,7 @@ func ValueOf(x interface{}) Value {
 	case bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64, unsafe.Pointer, string, map[string]interface{}, []interface{}:
 		return objectToValue(id.Invoke(x))
 	default:
-		panic(`invalid arg: ` + reflect.TypeOf(x).String())
+		panic("ValueOf: invalid value")
 	}
 }
 

diff --git a/tests/lowlevel_test.go b/tests/lowlevel_test.go
@@ -14,7 +14,7 @@ import (
 //
 // See https://github.com/gopherjs/gopherjs/issues/279.
 func TestTimeInternalizationExternalization(t *testing.T) {
-	if runtime.GOARCH == "js" {
+	if runtime.GOOS == "js" {
 		t.Skip("test meant to be run using normal Go compiler (needs os/exec)")
 	}
 
@@ -34,7 +34,7 @@ func TestTimeInternalizationExternalization(t *testing.T) {
 }
 
 func TestDeferBuiltin(t *testing.T) {
-	if runtime.GOARCH == "js" {
+	if runtime.GOOS == "js" {
 		t.Skip("test meant to be run using normal Go compiler (needs os/exec)")
 	}
 

diff --git a/tests/vendored_test.go b/tests/vendored_test.go
@@ -10,7 +10,7 @@ import (
 // Test that GopherJS can be vendored into a project, and then used to build Go programs.
 // See issue https://github.com/gopherjs/gopherjs/issues/415.
 func TestGopherJSCanBeVendored(t *testing.T) {
-	if runtime.GOARCH == "js" {
+	if runtime.GOOS == "js" {
 		t.Skip("test meant to be run using normal Go compiler (needs os/exec)")
 	}