More fixes

Author: meteorcloudy

src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java

@@ -138,7 +138,7 @@ public ImmutableMap<String, String> getCoverageEnvironment() {
    *
    * <p>This is useful for virtual include paths in C++, which get reported at the include location
    * and not the real source path. For example, the reported include source file can be
-   * "bazel-out/k8-fastbuild/bin/include/common/_virtual_includes/strategy/strategy.h", but its
+   * "bazel-out/k8-fastbuild/_v_inc/XXXXXXXX/strategy.h", but its
    * actual source path is "include/common/strategy.h".
    */
   NestedSet<Tuple> getReportedToActualSources() {

src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java

@@ -88,7 +88,7 @@ public final class CcCompilationContext implements CcCompilationContextApi<Artif
   // Each pair maps the Bazel generated paths of virtual include headers back to their original path
   // relative to the workspace directory.
   // For example it can map
-  // "bazel-out/k8-fastbuild/bin/include/common/_virtual_includes/strategy/strategy.h"
+  // "bazel-out/k8-fastbuild/_v_inc/XXXXXXXX/strategy.h"
   // back to the path of the header in the workspace directory "include/common/strategy.h".
   // This is needed only when code coverage collection is enabled, to report the actual source file
   // name in the coverage output file.

src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java

@@ -18,6 +18,7 @@
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.baseArtifactNames;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.baseNamesOf;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.truth.IterableSubject;
 import com.google.devtools.build.lib.actions.Action;
@@ -1204,8 +1205,8 @@ public void testSymlinkActionIsNotRegisteredWhenIncludePrefixDoesntChangePath()
 
     CcCompilationContext ccCompilationContext =
         getConfiguredTarget("//third_party:a").get(CcInfo.PROVIDER).getCcCompilationContext();
-    assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs()))
-        .doesNotContain("third_party/_virtual_includes/a/third_party/a.h");
+    assertThat(Joiner.on(" ").join(ActionsTestUtil.prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs())))
+        .doesNotContainMatch("_v_inc/[a-z0-9]{8}/third_party/a.h");
   }
 
   @Test