isGoxTestFile

goplus · Mar 5, 2024 · a8710a9 · a8710a9
1 parent 2bb1091
commit a8710a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cl/classfile.go b/cl/classfile.go
@@ -92,7 +92,7 @@ func loadClass(ctx *pkgCtx, pkg *gox.Package, file string, f *ast.File, conf *Co
 	p, ok := ctx.projs[gt.Ext]
 	if !ok {
 		pkgPaths := gt.PkgPaths
-		p = &gmxProject{pkgPaths: pkgPaths}
+		p = &gmxProject{pkgPaths: pkgPaths, isTest: isGoxTestFile(ext)}
 		ctx.projs[gt.Ext] = p
 
 		p.pkgImps = make([]gox.PkgRef, len(pkgPaths))

diff --git a/cl/compile.go b/cl/compile.go
@@ -730,12 +730,12 @@ func preloadGopFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, con
 			}
 		} else {
 			c := parent.classes[f]
+			classType = c.tname
 			proj, ctx.proj = c.proj, c.proj
 			ctx.autoimps = proj.autoimps
-			classType = c.tname
-			if isGoxTestFile(c.ext) { // test classfile
+			goxTestFile = proj.isTest
+			if goxTestFile { // test classfile
 				testType = c.tname
-				goxTestFile, proj.isTest = true, true
 				if !f.IsProj {
 					classType = casePrefix + testNameSuffix(testType)
 				}