Remove empty coverage environment

keith · copybara-github · commit 03eae37f24db · 2024-12-17T11:16:35.000-08:00
Fixes #23247 Closes #24670. PiperOrigin-RevId: 707176116 Change-Id: I71ef3c630f8130467cc6a0c730c1278ae6b0817f
diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl
@@ -1101,7 +1101,7 @@ def _get_coverage_environment(ctx, cc_config, cc_toolchain):
     }
     for k in list(env.keys()):
         if env[k] == None:
-            env[k] = ""
+            env.pop(k)
     if cc_config.fdo_instrument():
         env["FDO_DIR"] = cc_config.fdo_instrument()
     return env
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
@@ -349,7 +349,7 @@ public void testGcovNotDefined() throws Exception {
         getConfiguredTarget("//a:lib").get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR);
 
     assertThat(instrumentedFilesInfo.getCoverageEnvironment())
-        .containsEntry("COVERAGE_GCOV_PATH", "");
+        .doesNotContainKey("COVERAGE_GCOV_PATH");
   }
 
   // regression test for b/319501294
@@ -496,7 +496,8 @@ public void testLlvmCoverageToolsNotDefined() throws Exception {
             .get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR)
             .getCoverageEnvironment();
 
-    assertThat(coverageEnv).containsAtLeast("LLVM_COV", "", "LLVM_PROFDATA", "");
+    assertThat(coverageEnv).doesNotContainKey("LLVM_COV");
+    assertThat(coverageEnv).doesNotContainKey("LLVM_PROFDATA");
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -1101,7 +1101,7 @@ def _get_coverage_environment(ctx, cc_config, cc_toolchain):`
`1101`	`1101`	`}`
`1102`	`1102`	`for k in list(env.keys()):`
`1103`	`1103`	`if env[k] == None:`
`1104`		`- env[k] = ""`
	`1104`	`+ env.pop(k)`
`1105`	`1105`	`if cc_config.fdo_instrument():`
`1106`	`1106`	`env["FDO_DIR"] = cc_config.fdo_instrument()`
`1107`	`1107`	`return env`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ public void testGcovNotDefined() throws Exception {`
`349`	`349`	`getConfiguredTarget("//a:lib").get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR);`
`350`	`350`
`351`	`351`	`assertThat(instrumentedFilesInfo.getCoverageEnvironment())`
`352`		`- .containsEntry("COVERAGE_GCOV_PATH", "");`
	`352`	`+ .doesNotContainKey("COVERAGE_GCOV_PATH");`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`// regression test for b/319501294`
`@@ -496,7 +496,8 @@ public void testLlvmCoverageToolsNotDefined() throws Exception {`
`496`	`496`	`.get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR)`
`497`	`497`	`.getCoverageEnvironment();`
`498`	`498`
`499`		`- assertThat(coverageEnv).containsAtLeast("LLVM_COV", "", "LLVM_PROFDATA", "");`
	`499`	`+ assertThat(coverageEnv).doesNotContainKey("LLVM_COV");`
	`500`	`+ assertThat(coverageEnv).doesNotContainKey("LLVM_PROFDATA");`
`500`	`501`	`}`
`501`	`502`
`502`	`503`	`@Test`