diff options
author | 2016-09-13 16:03:04 +0000 | |
---|---|---|
committer | 2016-09-14 09:34:32 +0000 | |
commit | 4d94984c61892749315a6c98a3b1facf84762653 (patch) | |
tree | 7c8681145aaa75b221da3b81027cb8658e590455 /src/test/java | |
parent | 6022b7bd3719933be90a23006bc3adbbb9d125ee (diff) |
Fixed CcLibraryConfiguredTargetTest on Windows
Fixed #1765
--
MOS_MIGRATED_REVID=133006031
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index c9d6b0cf4b..2099df68a1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -100,6 +100,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { @Test public void testFilesToBuild() throws Exception { + useConfiguration("--cpu=k8"); ConfiguredTarget hello = getConfiguredTarget("//hello:hello"); String cpu = getTargetConfiguration().getCpu(); Artifact archive = getBinArtifact("libhello.a", hello); @@ -158,6 +159,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { @Test public void testFilesToBuildWithInterfaceSharedObjects() throws Exception { useConfiguration("--interface_shared_objects"); + useConfiguration("--cpu=k8"); ConfiguredTarget hello = getConfiguredTarget("//hello:hello"); String cpu = getTargetConfiguration().getCpu(); Artifact archive = getBinArtifact("libhello.a", hello); @@ -196,6 +198,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { // With interface shared libraries. useConfiguration("--interface_shared_objects"); + useConfiguration("--cpu=k8"); hello = getConfiguredTarget("//hello:hello"); sharedObject = FileType.filter(getFilesToBuild(hello), CppFileTypes.SHARED_LIBRARY).iterator().next(); @@ -242,6 +245,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { @Test public void testCppLinkActionExtraActionInfoWithSharedLibraries() throws Exception { + useConfiguration("--cpu=k8"); ConfiguredTarget hello = getConfiguredTarget("//hello:hello"); Artifact sharedObject = FileType.filter(getFilesToBuild(hello), CppFileTypes.SHARED_LIBRARY).iterator().next(); @@ -1146,6 +1150,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { @Test public void alwaysAddStaticAndDynamicLibraryToFilesToBuildWhenBuilding() throws Exception { + useConfiguration("--cpu=k8"); ConfiguredTarget target = scratchConfiguredTarget("a", "b", "cc_library(name = 'b', srcs = ['source.cc'])"); @@ -1216,6 +1221,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { @Test public void forbidBuildingAndWrappingSameLibraryIdentifier() throws Exception { + useConfiguration("--cpu=k8"); checkError( "a", "foo", |