diff options
author | John Cater <jcater@google.com> | 2016-12-16 20:40:29 +0000 |
---|---|---|
committer | John Cater <jcater@google.com> | 2016-12-16 20:43:37 +0000 |
commit | 8c83db0676104eb3c04fe7e7ced21113853ba069 (patch) | |
tree | 311dccb18f9e0fa75aec4627a7a2175df736fd6c /src/test | |
parent | cce4a8d027715e45e52287161f72d77b1a8fb950 (diff) |
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
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 9 |
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 |