commit 3b0aca333e31d1f02af459a9efee4965033a5bce
author Googler <ilist@google.com> Mon Apr 15 03:37:09 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 15 03:38:57 2024 -0700
tree 7138a5142fc8efec387a03a39b1510a0fbf7b0ef
parent 5723961def2df3660bdc6e763ac46ffd2539b0b8

Add back CcBinaryFdoTest

It's a first, we had a test that was not setup to run.

PiperOrigin-RevId: 624901212
Change-Id: I73f71ac8997e9c6d600efbde086213d3891bf896

src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
index 7762bfe..f712096 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -165,6 +165,23 @@
 )
 
 java_test(
+    name = "CcBinaryFdoTest",
+    srcs = ["CcBinaryFdoTest.java"],
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
+        "//src/main/java/com/google/devtools/build/lib/analysis:actions/symlink_action",
+        "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
+        "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+        "//src/main/java/com/google/devtools/build/lib/rules/genrule",
+        "//src/test/java/com/google/devtools/build/lib/actions/util",
+        "//src/test/java/com/google/devtools/build/lib/analysis/util",
+        "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+        "//third_party:junit4",
+        "//third_party:truth",
+    ],
+)
+
+java_test(
     name = "CcCommonTest",
     timeout = "long",
     srcs = ["CcCommonTest.java"],

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

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcBinaryFdoTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcBinaryFdoTest.java
index 450f92d..ac447dc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcBinaryFdoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcBinaryFdoTest.java
@@ -15,6 +15,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.common.truth.Correspondence;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
@@ -23,6 +24,7 @@
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.packages.util.Crosstool.CcToolchainConfig;
 import com.google.devtools.build.lib.rules.genrule.GenRuleAction;
+import java.util.regex.Pattern;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -30,6 +32,9 @@
 /** Tests for cc_binary with FDO. */
 @RunWith(JUnit4.class)
 public class CcBinaryFdoTest extends BuildViewTestCase {
+  private static final Correspondence<String, String> MATCHES_REGEX =
+      Correspondence.from((a, b) -> Pattern.matches(b, a), "matches");
+
   @Test
   public void testActionGraph() throws Exception {
     AnalysisMock.get()
@@ -60,8 +65,8 @@
                 getBinArtifact("_objs/binary/binary.o", getConfiguredTarget("//:binary")));
     assertThat(compileAction).isNotNull();
     assertThat(compileAction.getArguments())
-        .contains(
-            "-fprofile-use=bazel-out/k8-opt/bin/external/bazel_tools/tools/cpp/fdo/everything/mock.profdata");
+        .comparingElementsUsing(MATCHES_REGEX)
+        .contains("-fprofile-use=bl?azel?-out/k8-opt/bin/.*/mock.profdata");
     Artifact profData =
         ActionsTestUtil.getFirstArtifactEndingWith(compileAction.getInputs(), ".profdata");
     assertThat(profData).isNotNull();