aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar hlopko <hlopko@google.com>2017-06-20 08:38:50 -0400
committerGravatar Kristina Chodorow <kchodorow@google.com>2017-06-20 14:36:50 -0400
commitc4a48db62bc26ffb261f684876c8e9dc65df28fa (patch)
treec36096e2dbc655146e7623c49cf7872e1bc881d4 /src/test/java/com/google/devtools/build
parent2d008e824e4c5c39f00f21cfa879eed61d5b500a (diff)
Introduce is_cc_test build variable so we can migrate away from is_not_cc_test_link_action
If only hlopko@ used brain when he introduced is_not_cc_test_link_action he would realize that the current values make it impossible to migrate away from them. This cl introduces new build variable with boolean value. Then I can update internal crosstools to use expand_if_true/false, and then I can remove is_not_cc_test_link_action. RELNOTES: None. PiperOrigin-RevId: 159549814
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java
index fcdbdaf87b..7b28ff2a1f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java
@@ -259,13 +259,13 @@ public class LinkBuildVariablesTest extends BuildViewTestCase {
ConfiguredTarget testTarget = getConfiguredTarget("//x:foo_test");
Variables testVariables = getLinkBuildVariables(testTarget, LinkTargetType.EXECUTABLE);
- assertThat(testVariables.isAvailable(CppLinkActionBuilder.IS_CC_TEST_LINK_ACTION_VARIABLE))
+ assertThat(testVariables.getVariable(CppLinkActionBuilder.IS_CC_TEST_VARIABLE).isTruthy())
.isTrue();
ConfiguredTarget binaryTarget = getConfiguredTarget("//x:foo");
Variables binaryVariables = getLinkBuildVariables(binaryTarget, LinkTargetType.EXECUTABLE);
- assertThat(binaryVariables.isAvailable(CppLinkActionBuilder.IS_CC_TEST_LINK_ACTION_VARIABLE))
+ assertThat(binaryVariables.getVariable(CppLinkActionBuilder.IS_CC_TEST_VARIABLE).isTruthy())
.isFalse();
}