fix(cmd/gno): allow testing packages which contain test files with package x_test

examples/gno.land/p/demo/tests/tests.gno

@@ -8,6 +8,8 @@ import (
 	rtests "gno.land/r/demo/tests"
 )
 
+const World = "world"
+
 // IncCounter demonstrates that it's possible to call a realm function from
 // a package. So a package can potentially write into the store, by calling
 // an other realm.

examples/gno.land/p/demo/tests/z1_test.gno

@@ -0,0 +1,12 @@
+package tests_test
+
+import (
+	"testing"
+
+	"gno.land/p/demo/tests"
+)
+
+func TestGetHelloWorld(t *testing.T) {
+	s := "hello " + tests.World
+	println(s)
+}

gnovm/cmd/gno/test.go

@@ -328,9 +328,10 @@
 
 		// tfiles, ifiles := gno.ParseMemPackageTests(memPkg)
 		tfiles, ifiles := parseMemPackageTests(memPkg)
+		testPkgName := getPkgNameFromFileset(ifiles)
 
 		// run test files in pkg
-		{
+		if !strings.HasSuffix(testPkgName, "_test") {
 			m := tests.TestMachine(testStore, stdout, gnoPkgPath)
 			if printRuntimeMetrics {
 				// from tm2/pkg/sdk/vm/keeper.go
@@ -344,18 +345,12 @@
 			if err != nil {
 				errs = multierr.Append(errs, err)
 			}
-		}
-
-		// run test files in xxx_test pkg
-		{
-			testPkgName := getPkgNameFromFileset(ifiles)
-			if testPkgName != "" {
-				m := tests.TestMachine(testStore, stdout, testPkgName)
-				m.RunMemPackage(memPkg, true)
-				err := runTestFiles(m, ifiles, testPkgName, verbose, printRuntimeMetrics, runFlag, io)
-				if err != nil {
-					errs = multierr.Append(errs, err)
-				}
+		} else { // run xxx_test
+			m := tests.TestMachine(testStore, stdout, testPkgName)
+			m.RunMemPackage(memPkg, true)
+			err := runTestFiles(m, ifiles, testPkgName, verbose, printRuntimeMetrics, runFlag, io)
+			if err != nil {
+				errs = multierr.Append(errs, err)
 			}
 		}
 	}

gnovm/pkg/gnolang/machine.go

@@ -402,9 +402,15 @@
 	// Files' package names must match the machine's active one.
 	// if there is one.
 	for _, fn := range fns {
-		if fn.PkgName != "" && fn.PkgName != m.Package.PkgName {
-			panic(fmt.Sprintf("expected package name [%s] but got [%s]",
-				m.Package.PkgName, fn.PkgName))
+		var (
+			notEmptyName = fn.PkgName != ""
+			notBaseName  = fn.PkgName != m.Package.PkgName
+			notTestName  = m.Package.PkgName+"_test" != fn.PkgName
+		)
+
+		if notEmptyName && notBaseName && notTestName {
+			panic(fmt.Sprintf("expected package name [%s] or [%s_test] but got [%s]",
+				m.Package.PkgName, m.Package.PkgName, fn.PkgName))
 		}
 	}
 	// Add files to *PackageNode.FileSet.