Use more specific names for coverage variables to avoid clashes

please-build · Sep 9, 2024 · 7fef7aa · 7fef7aa
1 parent 004a8b3
commit 7fef7aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/tools/please_go/ChangeLog b/tools/please_go/ChangeLog
@@ -1,3 +1,7 @@
+Version 1.15.1
+--------------
+    * Use more specific names for coverage variables to avoid clashes
+
 Version 1.15.0
 --------------
     * Add support for Go 1.23 coverage generation (#294)

diff --git a/tools/please_go/VERSION b/tools/please_go/VERSION
@@ -1 +1 @@
-1.15.0
+1.15.1
diff --git a/tools/please_go/cover/cover.go b/tools/please_go/cover/cover.go
@@ -44,9 +44,9 @@ func WriteCoverage(goTool, coverTool, covercfg, output, pkg string, srcs []strin
 	}
 	var cmd *exec.Cmd
 	if coverTool != "" {
-		cmd = exec.Command(coverTool, append([]string{"-mode=set", "-var=goCover", "-pkgcfg", pkgConfigFile, "-outfilelist", output}, srcs...)...)
+		cmd = exec.Command(coverTool, append([]string{"-mode=set", "-var=_plz_goCover", "-pkgcfg", pkgConfigFile, "-outfilelist", output}, srcs...)...)
 	} else {
-		cmd = exec.Command(goTool, append([]string{"tool", "cover", "-mode=set", "-var=goCover", "-pkgcfg", pkgConfigFile, "-outfilelist", output}, srcs...)...)
+		cmd = exec.Command(goTool, append([]string{"tool", "cover", "-mode=set", "-var=_plz_goCover", "-pkgcfg", pkgConfigFile, "-outfilelist", output}, srcs...)...)
 	}
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr