commit 240bdea03a6a149ab04f20207d4a44750e3a9d12
author adonovan <adonovan@google.com> Thu Sep 03 15:24:12 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 03 15:25:47 2020 -0700
tree 6429013c6ec086c9f0d726eeac77d40f0c8e3dc2
parent ece3ec725475e958210be1d5547e91df05a454dd

bazel packages: rename StarlarkSemanticsOptions -> packages.semantics.BuildLanguageOptions

It is not a part of lib.packages, but a dependency of it;
some clients (e.g. skydoc) depend on it alone.

FYI: syntax.StarlarkSemantics does not have a code dependency on Bazel, but
it has many logical dependencies on Bazel concepts. Follow-up changes will
make StarlarkSemantics a base class, and define
packages.semantics.BuildLanguageSemantics as a Bazel-specific subclass
containing all Bazelisms.
PiperOrigin-RevId: 330004717

src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index 05157c5..1ae670a 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -42,7 +42,7 @@
 import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.PackageValidator;
 import com.google.devtools.build.lib.packages.PackageValidator.InvalidPackageException;
-import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
 import com.google.devtools.build.lib.pkgcache.PackageOptions;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
 import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -107,11 +107,11 @@
 
   private void preparePackageLoading(Path... roots) {
     preparePackageLoadingWithCustomStarklarkSemanticsOptions(
-        Options.getDefaults(StarlarkSemanticsOptions.class), roots);
+        Options.getDefaults(BuildLanguageOptions.class), roots);
   }
 
   private void preparePackageLoadingWithCustomStarklarkSemanticsOptions(
-      StarlarkSemanticsOptions starlarkSemanticsOptions, Path... roots) {
+      BuildLanguageOptions starlarkSemanticsOptions, Path... roots) {
     PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
     packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
     packageOptions.showLoadingProgress = true;
@@ -450,7 +450,7 @@
                 ImmutableList.of(Root.fromPath(rootDirectory)),
                 BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
             packageOptions,
-            Options.getDefaults(StarlarkSemanticsOptions.class),
+            Options.getDefaults(BuildLanguageOptions.class),
             UUID.randomUUID(),
             ImmutableMap.<String, String>of(),
             tsgm);
@@ -963,7 +963,7 @@
   @Test
   public void testGlobAllowEmpty_starlarkOption() throws Exception {
     preparePackageLoadingWithCustomStarklarkSemanticsOptions(
-        Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=false")
+        Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=false")
             .getOptions(),
         rootDirectory);
 
@@ -1006,7 +1006,7 @@
   @Test
   public void testGlobDisallowEmpty_starlarkOption_wasNonEmptyAndBecomesEmpty() throws Exception {
     preparePackageLoadingWithCustomStarklarkSemanticsOptions(
-        Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+        Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
             .getOptions(),
         rootDirectory);
 
@@ -1065,7 +1065,7 @@
   @Test
   public void testGlobDisallowEmpty_starlarkOption_wasEmptyAndStaysEmpty() throws Exception {
     preparePackageLoadingWithCustomStarklarkSemanticsOptions(
-        Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+        Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
             .getOptions(),
         rootDirectory);
 
@@ -1129,7 +1129,7 @@
   public void testGlobDisallowEmpty_starlarkOption_wasEmptyDueToExcludeAndStaysEmpty()
       throws Exception {
     preparePackageLoadingWithCustomStarklarkSemanticsOptions(
-        Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+        Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
             .getOptions(),
         rootDirectory);
 
@@ -1190,7 +1190,7 @@
   @Test
   public void testGlobDisallowEmpty_starlarkOption_wasEmptyAndBecomesNonEmpty() throws Exception {
     preparePackageLoadingWithCustomStarklarkSemanticsOptions(
-        Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+        Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
             .getOptions(),
         rootDirectory);