Automated rollback of commit 5c1005c.

*** Reason for rollback *** Rolling forward flag flip (--experimental_build_setting_api=True) now that b/134580627 is fixed *** Original change description *** Automated rollback of commit 536a166. *** Reason for rollback *** Found an incremental correctness concern with build settings. Rolling back while investigating and to rollback for the bazel release *** Original change description *** Turn on --experimental_build_setting_api RELNOTES: Turn on --experimental_build_setting_api by default for starlark build settings (see https://docs.bazel.build/versions/master/skylark/config.html#user-defined-build-settings for more info) SKIP_CI=bl... *** Related to #5577 ROLLBACK_OF=252715211 PiperOrigin-RevId: 255967767
bazelbuild · Jul 1, 2019 · f113c44 · f113c44
1 parent 89a6ff5
commit f113c44
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -79,7 +79,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
 
   @Option(
       name = "experimental_build_setting_api",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS,
       help =

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -237,7 +237,7 @@ public static Builder builderWithDefaults() {
   public static final StarlarkSemantics DEFAULT_SEMANTICS =
       builder()
           // <== Add new options here in alphabetic order ==>
-          .experimentalBuildSettingApi(false)
+          .experimentalBuildSettingApi(true)
           .experimentalCcSkylarkApiEnabledPackages(ImmutableList.of())
           .experimentalAllowIncrementalRepositoryUpdates(false)
           .experimentalEnableAndroidMigrationApis(false)

diff --git a/src/test/shell/integration/starlark_configurations_test.sh b/src/test/shell/integration/starlark_configurations_test.sh
@@ -161,19 +161,6 @@ function test_dont_parse_flags_after_dash_dash() {
   expect_log "invalid package name '-//test_dont_parse_flags_after_dash_dash'"
 }
 
-function test_doesnt_work_without_experimental_flag() {
-  local -r pkg=$FUNCNAME
-  mkdir -p $pkg
-
-  write_build_setting_bzl
-
-  bazel build //$pkg:my_drink --//$pkg:type=coffee > output 2>"$TEST_log" \
-    && fail "Expected failure"
-
-  expect_log "Error loading option //$pkg:type:"
-  expect_log "Extension file '$pkg/build_setting.bzl' has errors"
-}
-
 function test_multiple_starlark_flags() {
   local -r pkg=$FUNCNAME
   mkdir -p $pkg