Add dynamic config support for top-level configuration hooks.

PiperOrigin-RevId: 155223580

3 files changed, 156 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 164e3a510e..21988605e5 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -330,6 +330,32 @@ public class BuildViewTest extends BuildViewTestBase {
   }
 
   @Test
+  public void topLevelConfigurationHook() throws Exception {
+    setConfigFragmentsAvailableInTests(TestConfigFragments.FragmentWithTopLevelConfigHook1Factory);
+    scratch.file(
+        "package/BUILD",
+        "sh_binary(name = 'binary', srcs = ['binary.sh'])");
+    ConfiguredTarget ct = Iterables.getOnlyElement(update("//package:binary").getTargetsToBuild());
+    BuildConfiguration.Options options =
+        ct.getConfiguration().getOptions().get(BuildConfiguration.Options.class);
+    assertThat(options.testArguments).containsExactly("CONFIG HOOK 1");
+  }
+
+  @Test
+  public void topLevelComposedConfigurationHooks() throws Exception {
+    setConfigFragmentsAvailableInTests(
+        TestConfigFragments.FragmentWithTopLevelConfigHook1Factory,
+        TestConfigFragments.FragmentWithTopLevelConfigHook2Factory);
+    scratch.file(
+        "package/BUILD",
+        "sh_binary(name = 'binary', srcs = ['binary.sh'])");
+    ConfiguredTarget ct = Iterables.getOnlyElement(update("//package:binary").getTargetsToBuild());
+    BuildConfiguration.Options options =
+        ct.getConfiguration().getOptions().get(BuildConfiguration.Options.class);
+    assertThat(options.testArguments).containsExactly("CONFIG HOOK 1", "CONFIG HOOK 2");
+  }
+
+  @Test
   public void testGetDirectPrerequisites() throws Exception {
     scratch.file(
         "package/BUILD",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java b/src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java
new file mode 100644
index 0000000000..e0b862c851
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java
@@ -0,0 +1,113 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.analysis;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
+import com.google.devtools.build.lib.analysis.config.BuildOptions;
+import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
+import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
+import com.google.devtools.build.lib.analysis.config.FragmentOptions;
+import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
+import com.google.devtools.build.lib.analysis.config.PatchTransition;
+import com.google.devtools.build.lib.packages.Target;
+
+/**
+ * Grab bag file for test configuration fragments and fragment factories.
+ */
+public class TestConfigFragments {
+  /**
+   * A {@link PatchTransition} that appends a given value to
+   * {@link BuildConfiguration.Options#testArguments}.
+   */
+  private static class TestArgTransition implements PatchTransition {
+
+    private final String patchMessage;
+
+    TestArgTransition(String patchMessage) {
+      this.patchMessage = patchMessage;
+    }
+
+    @Override
+    public boolean defaultsToSelf() {
+      throw new UnsupportedOperationException(
+          "dynamic configurations don't use global transition tables");
+    }
+
+    @Override
+    public BuildOptions apply(BuildOptions options) {
+      BuildOptions toOptions = options.clone();
+      BuildConfiguration.Options coreOptions =
+          toOptions.get(BuildConfiguration.Options.class);
+      coreOptions.testArguments = new ImmutableList.Builder<String>()
+          .addAll(coreOptions.testArguments).add(patchMessage).build();
+      return toOptions;
+    }
+  }
+
+  /**
+   * A {@link ConfigurationFragmentFactory} that trivially returns a given fragment.
+   */
+  private static class SimpleFragmentFactory implements ConfigurationFragmentFactory {
+    private final BuildConfiguration.Fragment fragment;
+
+    public SimpleFragmentFactory(BuildConfiguration.Fragment fragment) {
+      this.fragment = fragment;
+    }
+
+    @Override
+    public BuildConfiguration.Fragment create(ConfigurationEnvironment env,
+        BuildOptions buildOptions) throws InvalidConfigurationException {
+      return fragment;
+    }
+
+    @Override
+    public Class<? extends BuildConfiguration.Fragment> creates() {
+      return fragment.getClass();
+    }
+
+    @Override
+    public ImmutableSet<Class<? extends FragmentOptions>> requiredOptions() {
+      return ImmutableSet.<Class<? extends FragmentOptions>>of();
+    }
+  }
+
+  /**
+   * Factory for a test fragment with a top-level configuration hook.
+   */
+  public static SimpleFragmentFactory FragmentWithTopLevelConfigHook1Factory =
+      new SimpleFragmentFactory(new BuildConfiguration.Fragment() {
+        @Override
+        public PatchTransition topLevelConfigurationHook(Target toTarget) {
+          return new TestArgTransition("CONFIG HOOK 1");
+        }
+      });
+
+  /**
+   * Factory for a test fragment with a top-level configuration hook.
+   */
+  public static SimpleFragmentFactory FragmentWithTopLevelConfigHook2Factory =
+      // The anonymous class definition for the BuildConfiguration.Fragment needs to be different
+      // than the one of its peer above. This is because Bazel indexes configuration fragments
+      // by class name. So we need to make sure all fragment definitions retain distinct class
+      // names (i.e. "TestConfigFragments$1", "TestConfigFragments$2", etc).
+      new SimpleFragmentFactory(new BuildConfiguration.Fragment() {
+        @Override
+        public PatchTransition topLevelConfigurationHook(Target toTarget) {
+          return new TestArgTransition("CONFIG HOOK 2");
+        }
+      });
+}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index a7ddfa9228..5b49663020 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFactory;
+import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.buildtool.BuildRequest.BuildRequestOptions;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
@@ -164,6 +165,10 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
   protected void useRuleClassProvider(ConfiguredRuleClassProvider ruleClassProvider)
       throws Exception {
     this.ruleClassProvider = ruleClassProvider;
+    useConfigurationFactory(
+        new ConfigurationFactory(
+            ruleClassProvider.getConfigurationCollectionFactory(),
+            ruleClassProvider.getConfigurationFragments()));
     PackageFactory pkgFactory =
         analysisMock
             .getPackageFactoryForTesting()
@@ -504,4 +509,16 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
     update();
   }
 
+  /**
+   * Makes custom configuration fragments available in tests.
+   */
+  protected final void setConfigFragmentsAvailableInTests(
+      ConfigurationFragmentFactory... factories) throws Exception {
+    ConfiguredRuleClassProvider.Builder builder = new ConfiguredRuleClassProvider.Builder();
+    TestRuleClassProvider.addStandardRules(builder);
+    for (ConfigurationFragmentFactory factory : factories) {
+      builder.addConfigurationFragment(factory);
+    }
+    useRuleClassProvider(builder.build());
+  }
 }