Skip to content
Snippets Groups Projects
Commit 828aefd6 authored by hvd's avatar hvd Committed by Copybara-Service
Browse files

Add a '_validation_transitive' helper output group which overrides transitive...

Add a '_validation_transitive' helper output group which overrides transitive validation output group propagation

PiperOrigin-RevId: 389148709
parent 8a582dce
No related merge requests found
......@@ -117,6 +117,10 @@ public final class OutputGroupInfo extends StructImpl
public static final String VALIDATION_TOP_LEVEL =
HIDDEN_OUTPUT_GROUP_PREFIX + "validation_top_level" + INTERNAL_SUFFIX;
/** Helper output group to override {@link #VALIDATION} outputs from dependencies */
public static final String VALIDATION_TRANSITIVE =
HIDDEN_OUTPUT_GROUP_PREFIX + "validation_transitive";
/**
* Temporary files created during building a rule, for example, .i, .d and .s files for C++
* compilation.
......
......@@ -357,10 +357,16 @@ public final class RuleConfiguredTargetBuilder {
* validation action output group itself.
*/
private void propagateTransitiveValidationOutputGroups() {
collectTransitiveValidationOutputGroups(
ruleContext,
unused -> true,
validationArtifacts -> addOutputGroup(OutputGroupInfo.VALIDATION, validationArtifacts));
if (outputGroupBuilders.containsKey(OutputGroupInfo.VALIDATION_TRANSITIVE)) {
addOutputGroup(
OutputGroupInfo.VALIDATION,
outputGroupBuilders.remove(OutputGroupInfo.VALIDATION_TRANSITIVE).build());
} else {
collectTransitiveValidationOutputGroups(
ruleContext,
unused -> true,
validationArtifacts -> addOutputGroup(OutputGroupInfo.VALIDATION, validationArtifacts));
}
}
/**
......
......@@ -305,6 +305,26 @@ java_test(
],
)
java_test(
name = "TransitiveValidationPropagationTest",
srcs = ["TransitiveValidationPropagationTest.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
"//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
"//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
"//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/util:filetype",
"//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
"//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:junit4",
"//third_party:truth",
],
)
java_test(
name = "PackageGroupBuildViewTest",
srcs = ["PackageGroupBuildViewTest.java"],
......
// Copyright 2021 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 static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames;
import static com.google.devtools.build.lib.packages.Attribute.attr;
import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil.NullAction;
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.FileTypeSet;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Tests for {@link OutputGroupInfo#VALIDATION_TRANSITIVE} output group */
@RunWith(JUnit4.class)
public final class TransitiveValidationPropagationTest extends BuildViewTestCase {
/** Fake native rule that outputs a single validation artifact */
public static final class ValidationOutputRule
implements RuleDefinition, RuleConfiguredTargetFactory {
@Override
public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
return builder
.addAttribute(attr("deps", LABEL_LIST).allowedFileTypes(FileTypeSet.NO_FILE).build())
.build();
}
@Override
public Metadata getMetadata() {
return RuleDefinition.Metadata.builder()
.name("validation_rule")
.ancestors(BaseRuleClasses.NativeBuildRule.class)
.factoryClass(ValidationOutputRule.class)
.build();
}
@Override
public ConfiguredTarget create(RuleContext ruleContext)
throws InterruptedException, RuleErrorException, ActionConflictException {
Artifact valid = ruleContext.createOutputArtifact();
ruleContext.registerAction(new NullAction(valid));
return new RuleConfiguredTargetBuilder(ruleContext)
.setFilesToBuild(NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER))
.addProvider(RunfilesProvider.EMPTY)
.addOutputGroup(OutputGroupInfo.VALIDATION, valid)
.build();
}
}
/**
* Fake native rule that disables transitive validation artifact propagation returning only a
* single validation artifact
*/
public static final class TransitiveValidationOverrideRule
implements RuleDefinition, RuleConfiguredTargetFactory {
@Override
public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
return builder.build();
}
@Override
public Metadata getMetadata() {
return RuleDefinition.Metadata.builder()
.name("transitive_validation_rule")
.ancestors(BaseRuleClasses.NativeBuildRule.class, ValidationOutputRule.class)
.factoryClass(TransitiveValidationOverrideRule.class)
.build();
}
@Override
public ConfiguredTarget create(RuleContext ruleContext)
throws InterruptedException, RuleErrorException, ActionConflictException {
Artifact valid = ruleContext.createOutputArtifact();
ruleContext.registerAction(new NullAction(valid));
return new RuleConfiguredTargetBuilder(ruleContext)
.setFilesToBuild(NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER))
.addProvider(RunfilesProvider.EMPTY)
.addOutputGroup(OutputGroupInfo.VALIDATION_TRANSITIVE, valid)
.build();
}
}
/** Make the test rule class provider understand our rules in addition to the standard ones. */
@Override
protected ConfiguredRuleClassProvider createRuleClassProvider() {
ConfiguredRuleClassProvider.Builder builder =
new ConfiguredRuleClassProvider.Builder()
.addRuleDefinition(new ValidationOutputRule())
.addRuleDefinition(new TransitiveValidationOverrideRule());
TestRuleClassProvider.addStandardRules(builder);
return builder.build();
}
@Test
public void testValidationOutputPropagation() throws Exception {
scratch.file(
"valid/BUILD",
"validation_rule(name = 'foo')",
"validation_rule(name = 'bar', deps = [':foo'])",
"validation_rule(name = 'baz')",
"validation_rule(name = 'top', deps = ['bar', 'baz'])",
"transitive_validation_rule(name = 'top_transitive', deps = ['bar', 'baz'])",
"");
List<String> topValid =
prettyArtifactNames(
OutputGroupInfo.get(getConfiguredTarget("//valid:top"))
.getOutputGroup(OutputGroupInfo.VALIDATION));
List<String> topTransitiveValid =
prettyArtifactNames(
OutputGroupInfo.get(getConfiguredTarget("//valid:top_transitive"))
.getOutputGroup(OutputGroupInfo.VALIDATION));
assertThat(topValid).containsExactly("valid/foo", "valid/bar", "valid/baz", "valid/top");
assertThat(topTransitiveValid).containsExactly("valid/top_transitive");
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment