replace _test filter with change in tests functions

tbruyelle · Jun 27, 2023 · 763ac29 · 763ac29
1 parent 1539ea3
commit 763ac29
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/gnovm/cmd/gno/test.go b/gnovm/cmd/gno/test.go
@@ -379,8 +379,12 @@ func runTestFiles(
 	}
 
 	m.RunFiles(files.Files...)
-	n := gno.MustParseFile("main_test.gno", testmain)
+	n := gno.MustParseFile("testmain.gno", testmain)
 	m.RunFiles(n)
+	// XXX Affect an ID to testmain so it doesn't trigger a panic when
+	// realm.FinalizeRealmTransaction() is invoked
+	oo := m.Package.FBlocks[len(m.Package.FBlocks)-1]
+	m.Realm.AssignNewObjectID(oo.(*gno.Block))
 
 	for _, test := range testFuncs.Tests {
 		if verbose {

diff --git a/gnovm/pkg/gnolang/realm.go b/gnovm/pkg/gnolang/realm.go
@@ -388,7 +388,7 @@ func (rlm *Realm) incRefCreatedDescendants(store Store, oo Object) {
 	if !oo.GetObjectID().IsZero() {
 		return
 	}
-	rlm.assignNewObjectID(oo)
+	rlm.AssignNewObjectID(oo)
 	rlm.created = append(rlm.created, oo)
 	// RECURSE GUARD END
 
@@ -1121,10 +1121,6 @@ func copyValueWithRefs(parent Object, val Value) Value {
 		}
 	case *FuncValue:
 		source := toRefNode(cv.Source)
-		if strings.HasSuffix(source.Location.File, "_test.gno") {
-			// Ignore _test files
-			return nil
-		}
 		var closure Value
 		if cv.Closure != nil {
 			closure = toRefValue(parent, cv.Closure)
@@ -1394,7 +1390,7 @@ func (rlm *Realm) nextObjectID() ObjectID {
 
 // Object gets its id set (panics if already set), and becomes
 // marked as new and real.
-func (rlm *Realm) assignNewObjectID(oo Object) ObjectID {
+func (rlm *Realm) AssignNewObjectID(oo Object) ObjectID {
 	oid := oo.GetObjectID()
 	if !oid.IsZero() {
 		panic("unexpected non-zero object id")

diff --git a/gnovm/stdlibs/testing/match.gno b/gnovm/stdlibs/testing/match.gno
@@ -166,11 +166,19 @@ func isSpace(r rune) bool {
 	return false
 }
 
+var (
+	matchPat string
+	matchRe  *regexp.Regexp
+)
+
 // based on testing/internal/testdeps.TestDeps.MatchString.
 func matchString(pat, str string) (result bool, err error) {
-	matchRe, err := regexp.Compile(pat)
-	if err != nil {
-		return
+	if matchRe == nil || matchPat != pat {
+		matchPat = pat
+		matchRe, err = regexp.Compile(matchPat)
+		if err != nil {
+			return
+		}
 	}
 	return matchRe.MatchString(str), nil
 }