Skip to content

Commit

Permalink
Flip --incompatible_require_ctx_in_configure_features
Browse files Browse the repository at this point in the history 
Last run of the CI (https://buildkite.com/bazel/bazelisk-plus-incompatible-flags/builds/124) shows only Tensorflow and Envoy issues. Envoy is fixed by envoyproxy/envoy#7058, and Tensorflow is fixed in Bazel@HEAD by cab65ff.

RELNOTES: Incompatible flag `--incompatible_require_ctx_in_configure_features` has been flipped. See #7793 for more information.
PiperOrigin-RevId: 250458681
  • Loading branch information
@hlopko @copybara-github
hlopko authored and copybara-github committed May 29, 2019
1 parent ab5de51 commit 1bfedba
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ public Label getFdoPrefetchHintsLabel() {

@Option(
name = "incompatible_require_ctx_in_configure_features",
defaultValue = "false",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {
Expand Down
8 changes: 6 additions & 2 deletions src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ public void testSkylarkCallables() throws Exception {
"MyInfo = provider()",
"def _impl(ctx):",
" provider = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = provider)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = provider,",
" )",
" return MyInfo(",
" dirs = provider.built_in_include_directories,",
" sysroot = provider.sysroot,",
Expand All @@ -63,7 +66,8 @@ public void testSkylarkCallables() throws Exception {
"",
"my_rule = rule(",
" _impl,",
" attrs = {'_cc_toolchain': attr.label(default=Label('//test:toolchain')) }",
" attrs = {'_cc_toolchain': attr.label(default=Label('//test:toolchain'))},",
" fragments = [ 'cpp' ],",
")");

scratch.file("test/BUILD",
Expand Down
49 changes: 40 additions & 9 deletions src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,10 @@ public void testGetToolForAction() throws Exception {
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" return [MyInfo(",
" action_tool_path = cc_common.get_tool_for_action(",
" feature_configuration = feature_configuration,",
Expand Down Expand Up @@ -248,6 +251,7 @@ public void testFeatureConfigurationWithAdditionalEnabledFeature() throws Except
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" requested_features = ['foo_feature'])",
" return [MyInfo(",
Expand Down Expand Up @@ -287,6 +291,7 @@ public void testFeatureConfigurationWithAdditionalUnsupportedFeature() throws Ex
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" unsupported_features = ['foo_feature'])",
" return [MyInfo(",
Expand Down Expand Up @@ -320,7 +325,10 @@ public void testGetCommandLine() throws Exception {
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" return [MyInfo(",
" command_line = cc_common.get_memory_inefficient_command_line(",
" feature_configuration = feature_configuration,",
Expand Down Expand Up @@ -366,7 +374,10 @@ public void testGetEnvironment() throws Exception {
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" return [MyInfo(",
" environment_variables = cc_common.get_environment_variables(",
" feature_configuration = feature_configuration,",
Expand Down Expand Up @@ -413,7 +424,10 @@ public void testActionIsEnabled() throws Exception {
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" return [MyInfo(",
" enabled_action = cc_common.action_is_enabled(",
" feature_configuration = feature_configuration,",
Expand Down Expand Up @@ -451,7 +465,10 @@ public void testIsEnabled() throws Exception {
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" return [MyInfo(",
" enabled_feature = cc_common.is_enabled(",
" feature_configuration = feature_configuration,",
Expand Down Expand Up @@ -539,7 +556,10 @@ public void testActionNames() throws Exception {
" 'STRIP_ACTION_NAME')",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" return [MyInfo(",
" c_compile_action_name=C_COMPILE_ACTION_NAME,",
" cpp_compile_action_name=CPP_COMPILE_ACTION_NAME,",
Expand Down Expand Up @@ -937,7 +957,10 @@ private SkylarkList<String> commandLineForVariables(
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" variables = " + Joiner.on("\n").join(variables),
" return [MyInfo(",
" command_line = cc_common.get_memory_inefficient_command_line(",
Expand Down Expand Up @@ -1317,7 +1340,10 @@ private void setUpCcLinkingContextTest() throws Exception {
" alwayslink=alwayslink)",
"def _impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" library_to_link = _create(ctx, feature_configuration, ctx.file.static_library, ",
" ctx.file.pic_static_library, ctx.file.dynamic_library, ctx.file.interface_library,",
" ctx.attr.alwayslink)",
Expand Down Expand Up @@ -5277,6 +5303,7 @@ private static void createFiles(
"def _cc_aspect_impl(target, ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" requested_features = ctx.features,",
" unsupported_features = ctx.disabled_features,",
Expand Down Expand Up @@ -5315,6 +5342,7 @@ private static void createFiles(
" dep_linking_contexts.append(dep[CcInfo].linking_context)",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain=toolchain,",
" requested_features = ctx.features,",
" unsupported_features = ctx.disabled_features)",
Expand Down Expand Up @@ -5511,7 +5539,10 @@ private static void setupTestTransitiveLink(Scratch scratch, String... additiona
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _cc_bin_impl(ctx):",
" toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
" feature_configuration = cc_common.configure_features(cc_toolchain = toolchain)",
" feature_configuration = cc_common.configure_features(",
" ctx = ctx,",
" cc_toolchain = toolchain,",
" )",
" dep_linking_contexts = []",
" for dep in ctx.attr.deps:",
" dep_linking_contexts.append(dep[CcInfo].linking_context)",
Expand Down

0 comments on commit 1bfedba

Please sign in to comment.