Blaze now passes an extra flag to JavaBuilder, --testonly, to

mark compilations of test code.

We plan to use this for Error Prone checks that need to distinguish
between test and production code, such as enforcing
@VisibleForTesting.

PiperOrigin-RevId: 155231021

2 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
index e7b9c7c1cd..0e98955657 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
@@ -35,8 +35,10 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration.StrictDe
 import com.google.devtools.build.lib.collect.ImmutableIterable;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
+import com.google.devtools.build.lib.packages.AttributeMap;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
 import com.google.devtools.build.lib.rules.test.InstrumentedFilesCollector;
+import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -222,6 +224,10 @@ public final class JavaCompilationHelper {
     builder.setTargetLabel(
         attributes.getTargetLabel() == null
             ? ruleContext.getLabel() : attributes.getTargetLabel());
+    AttributeMap attributeMap = ruleContext.attributes();
+    if (attributeMap.has("testonly", Type.BOOLEAN)) {
+      builder.setTestOnly(attributeMap.get("testonly", Type.BOOLEAN));
+    }
     getAnalysisEnvironment().registerAction(builder.build());
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 2e3a7ca0f6..d11345aa80 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -523,6 +523,7 @@ public final class JavaCompileAction extends SpawnAction {
     private final List<String> processorFlags = new ArrayList<>();
     private String ruleKind;
     private Label targetLabel;
+    private boolean testOnly = false;
 
     /**
      * Creates a Builder from an owner and a build configuration.
@@ -736,6 +737,9 @@ public final class JavaCompileAction extends SpawnAction {
           result.add("@" + targetLabel);
         }
       }
+      if (testOnly) {
+        result.add("--testonly");
+      }
 
       if (!classpathEntries.isEmpty()) {
         result.addJoinExecPaths(
@@ -974,5 +978,10 @@ public final class JavaCompileAction extends SpawnAction {
       this.targetLabel = targetLabel;
       return this;
     }
+    
+    public Builder setTestOnly(boolean testOnly) {
+      this.testOnly = testOnly;
+      return this;
+    }
   }
 }