单测fix

lvyahui8 · Jan 6, 2024 · be7dd03 · be7dd03
1 parent bee0839
commit be7dd03
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/ellyn_ast/program.go b/ellyn_ast/program.go
@@ -59,7 +59,7 @@ func (p *Program) _init() {
 		}
 		p.mainPkg.Name = p.pkgMap[p.mainPkg.Dir].Name
 		p.modFile = utils.Go.GetModFile(p.mainPkg.Dir)
-		rootPkgPath := utils.Go.GetRootPkgPath(p.modFile)
+		rootPkgPath := utils.Go.GetProjectRootPkgPath(p.modFile)
 		p.rootPkg = NewPackage(path.Dir(p.modFile), rootPkgPath)
 		p.progCtx = &ProgramContext{rootPkgPath: rootPkgPath}
 	})

diff --git a/ellyn_common/utils/go.go b/ellyn_common/utils/go.go
@@ -31,8 +31,8 @@ func (g *goUtils) AllPackages(mainPkgPath string) map[string]string {
 }
 
 // GetGoEnv 获取指定的go env
-func (g *goUtils) GetGoEnv(mainPkgPath, envKey string) string {
-	out := Shell.Exec(mainPkgPath, "go", "env", envKey)
+func (g *goUtils) GetGoEnv(workDir, envKey string) string {
+	out := Shell.Exec(workDir, "go", "env", envKey)
 	return strings.TrimSpace(out)
 }
 
@@ -41,15 +41,21 @@ func (g *goUtils) GetModFile(mainPkgPath string) string {
 	return g.GetGoEnv(mainPkgPath, "GOMOD")
 }
 
-// GetRootPkgPath 获取项目go.mod文件所在的package name
-func (g *goUtils) GetRootPkgPath(modFilePath string) string {
+// GetProjectRootPkgPath 获取项目go.mod文件所在的package name
+func (g *goUtils) GetProjectRootPkgPath(modFilePath string) string {
 	content, err := os.ReadFile(modFilePath)
 	asserts.IsNil(err)
 	modFile, err := modfile.Parse("go.mod", content, nil)
 	asserts.IsNil(err)
 	return modFile.Module.Mod.Path
 }
 
+func (g *goUtils) GetGoRootDir() string {
+	wd, err := os.Getwd()
+	asserts.IsNil(err)
+	return g.GetGoEnv(wd, "GOROOT")
+}
+
 func (g *goUtils) IsTestFile(file string) bool {
 	return strings.HasSuffix(file, "_test.go")
 }

diff --git a/ellyn_common/utils/go_test.go b/ellyn_common/utils/go_test.go
@@ -28,11 +28,12 @@ func TestGoUtils_GetModFile(t *testing.T) {
 }
 
 func TestGoUtils_GetRootPkg(t *testing.T) {
-	rootPkg := Go.GetRootPkgPath(Go.GetModFile(ellyn_testing.GetTestProjPath()))
+	rootPkg := Go.GetProjectRootPkgPath(Go.GetModFile(ellyn_testing.GetTestProjPath()))
 	require.Equal(t, "test_proj", rootPkg)
 }
 
 func TestGoUtils_IsAutoGenFile(t *testing.T) {
-	require.True(t, Go.IsAutoGenFile("D:\\software\\go\\go1.18\\src\\cmd\\go\\internal\\test\\flagdefs.go"))
-	require.False(t, Go.IsAutoGenFile("D:\\software\\go\\go1.18\\src\\cmd\\go\\internal\\test\\cover.go"))
+	goRootDir := Go.GetGoRootDir()
+	require.True(t, Go.IsAutoGenFile(goRootDir+"\\src\\cmd\\go\\internal\\test\\flagdefs.go"))
+	require.False(t, Go.IsAutoGenFile(goRootDir+"\\src\\cmd\\go\\internal\\test\\cover.go"))
 }