commit 2707a886681e14fc22edca4c6c4bccca12018083
author Michael Staib <mstaib@google.com> Fri Sep 16 21:06:40 2016 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Mon Sep 19 07:35:12 2016 +0000
tree 9cd4e2e596c26e685f474c7fb6a4fcf9291a91e6
parent 8618b9d67d20a737908113fa89357ac321a9669b

Enable aspect invocations to be matched by output filters.

Currently aspects have no tag, i.e., they don't get checked against output
filters at all. This changes aspects to have a tag of the same form as the
rule they are attached to (i.e., the label of the target).

Since the default output filters match on ^//package[:/], this should cover
most uses of the output filter, while still allowing for finer control for
those who crave it.

--
MOS_MIGRATED_REVID=133425215

src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index d29e332..9274b75 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -36,11 +36,13 @@
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
+import com.google.devtools.build.lib.events.OutputFilter.RegexOutputFilter;
 import com.google.devtools.build.lib.packages.AspectDefinition;
 import com.google.devtools.build.lib.packages.AspectParameters;
 import com.google.devtools.build.lib.packages.NativeAspectClass;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.vfs.ModifiedFileSet;
+import java.util.regex.Pattern;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -226,6 +228,47 @@
   }
 
   @Test
+  public void aspectDependenciesDontShowDeprecationWarnings() throws Exception {
+    setRulesAvailableInTests(
+        new TestAspects.BaseRule(), new TestAspects.ExtraAttributeAspectRule());
+
+    pkg("extra", "base(name='extra', deprecation='bad aspect')");
+
+    pkg("a",
+        "rule_with_extra_deps_aspect(name='a', foo=[':b'])",
+        "base(name='b')");
+
+    getConfiguredTarget("//a:a");
+    assertContainsEventWithFrequency("bad aspect", 0);
+  }
+
+  @Test
+  public void ruleDependencyDeprecationWarningsAbsentDuringAspectEvaluations() throws Exception {
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.AspectRequiringRule());
+
+    pkg("a", "aspect(name='a', foo=['//b:b'])");
+    pkg("b", "aspect(name='b', bar=['//d:d'])");
+    pkg("d", "base(name='d', deprecation='bad rule')");
+
+    getConfiguredTarget("//a:a");
+    assertContainsEventWithFrequency("bad rule", 1);
+  }
+
+  @Test
+  public void aspectWarningsFilteredByOutputFiltersForAssociatedRules() throws Exception {
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.WarningAspectRule());
+    pkg("a", "warning_aspect(name='a', foo=['//b:b', '//c:c'])");
+    pkg("b", "base(name='b')");
+    pkg("c", "base(name='c')");
+
+    reporter.setOutputFilter(RegexOutputFilter.forPattern(Pattern.compile("^//b:")));
+
+    getConfiguredTarget("//a:a");
+    assertContainsEventWithFrequency("Aspect warning on //b:b", 1);
+    assertContainsEventWithFrequency("Aspect warning on //c:c", 0);
+  }
+
+  @Test
   public void sameTargetInDifferentAttributes() throws Exception {
     setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.AspectRequiringRule(),
         new TestAspects.SimpleRule());