Fix CppLinkActionsTest.testCompilesTestSourcesIntoDynamicLibrary to work

with non-k8 cpus.

Fixes https://github.com/bazelbuild/bazel/issues/2258.

--
Change-Id: I920a558f15374d8f5f643c5ef67945247b6c692f
Reviewed-on: https://cr.bazel.build/8011
PiperOrigin-RevId: 142287815
MOS_MIGRATED_REVID=142287815

1 files changed, 6 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
index f77efac0fb..876061d819 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
@@ -166,12 +166,15 @@ public class CppLinkActionTest extends BuildViewTestCase {
         (CppLinkAction)
             getGeneratingAction(configuredTarget, "x/a" + OsUtils.executableExtension());
     assertThat(artifactsToStrings(linkAction.getInputs()))
-        .contains("bin _solib_k8/libx_Sliba.ifso");
+        .contains("bin _solib_" + CrosstoolConfigurationHelper.defaultCpu() + "/libx_Sliba.ifso");
     assertThat(linkAction.getArguments())
-        .contains(getBinArtifactWithNoOwner("_solib_k8/libx_Sliba.ifso").getExecPathString());
+        .contains(
+            getBinArtifactWithNoOwner(
+                    "_solib_" + CrosstoolConfigurationHelper.defaultCpu() + "/libx_Sliba.ifso")
+                .getExecPathString());
     RunfilesProvider runfilesProvider = configuredTarget.getProvider(RunfilesProvider.class);
     assertThat(artifactsToStrings(runfilesProvider.getDefaultRunfiles().getArtifacts()))
-        .contains("bin _solib_k8/libx_Sliba.so");
+        .contains("bin _solib_" + CrosstoolConfigurationHelper.defaultCpu() + "/libx_Sliba.so");
   }
 
   @Test