diff options
author | hlopko <hlopko@google.com> | 2017-06-12 17:30:45 +0200 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-06-12 17:40:04 +0200 |
commit | d83d9bf1d6670f2e9bd25e2f6824d8b4a7099d4f (patch) | |
tree | 1e0708fc6b422a58dc7a201317b92c0db7625fa7 /src/test/java/com/google/devtools/build/lib/rules | |
parent | bde7c41c8b93c0f36806fed649021784700aaedd (diff) |
Init absent action configs for CppCompile actions
So far only link actions were initialized in CppLinkActionConfigs. This cl
changes this class to also initialize CppCompile actions. This is needed for
our ongoing work removing hard-coded flags from Bazel and moving them into
Crosstool.
RELNOTES: None.
PiperOrigin-RevId: 158715986
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | 2 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 7 |
2 files changed, 5 insertions, 4 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 1613d25323..a2bfc29e9e 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 @@ -282,7 +282,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { /** * Tests that if a given crosstool defines action configs for all link actions, that the link * action will be configured from the crosstool instead of from hard-coded action_configs in - * {@code CppLinkActionConfigs}. + * {@code CppActionConfigs}. */ @Test public void testUsesCrosstoolIfLinkActionDefined() throws Exception { 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 9a7e85ea13..2d2324259f 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 @@ -38,7 +38,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariableValue; -import com.google.devtools.build.lib.rules.cpp.CppLinkActionConfigs.CppLinkPlatform; +import com.google.devtools.build.lib.rules.cpp.CppActionConfigs.CppPlatform; import com.google.devtools.build.lib.rules.cpp.Link.LinkStaticness; import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType; import com.google.devtools.build.lib.rules.cpp.Link.Staticness; @@ -81,9 +81,10 @@ public class CppLinkActionTest extends BuildViewTestCase { private final FeatureConfiguration getMockFeatureConfiguration() throws Exception { return CcToolchainFeaturesTest.buildFeatures( - CppLinkActionConfigs.getCppLinkActionConfigs( - CppLinkPlatform.LINUX, + CppActionConfigs.getCppActionConfigs( + CppPlatform.LINUX, ImmutableSet.<String>of(), + "gcc_tool", "dynamic_library_linker_tool", "ar_tool", true)) |