diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
3 files changed, 20 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index ec330247dc..ebb660ae96 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -1827,6 +1827,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { SkyKey key = TargetPatternPhaseValue.key(ImmutableList.copyOf(targetPatterns), relativeWorkingDirectory.getPathString(), options.compileOneDependency, options.buildTestsOnly, determineTests, + ImmutableList.copyOf(options.buildTagFilterList), TestFilter.forOptions(options, eventHandler, ruleClassNames)); EvaluationResult<TargetPatternPhaseValue> evalResult; eventBus.post(new LoadingPhaseStartedEvent(packageProgress)); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java index 60600caa1a..7a87ba202b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.packages.TargetUtils; import com.google.devtools.build.lib.pkgcache.CompileOneDependencyTransformer; import com.google.devtools.build.lib.pkgcache.FilteringPolicies; -import com.google.devtools.build.lib.pkgcache.LoadingOptions; import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner; import com.google.devtools.build.lib.pkgcache.TargetProvider; import com.google.devtools.build.lib.pkgcache.TestFilter; @@ -73,8 +72,7 @@ final class TargetPatternPhaseFunction implements SkyFunction { } // Determine targets to build: - ResolvedTargets<Target> targets = getTargetsToBuild(env, - options.getTargetPatterns(), options.getOffset(), options.getCompileOneDependency()); + ResolvedTargets<Target> targets = getTargetsToBuild(env, options); // If the --build_tests_only option was specified or we want to run tests, we need to determine // the list of targets to test. For that, we remove manual tests and apply the command-line @@ -185,16 +183,14 @@ final class TargetPatternPhaseFunction implements SkyFunction { /** * Interpret the command-line arguments. * - * @param targetPatterns the list of command-line target patterns specified by the user - * @param compileOneDependency if true, enables alternative interpretation of targetPatterns; see - * {@link LoadingOptions#compileOneDependency} + * @param options the command-line arguments in structured form */ private static ResolvedTargets<Target> getTargetsToBuild( - Environment env, List<String> targetPatterns, String offset, boolean compileOneDependency) - throws InterruptedException { + Environment env, TargetPatternList options) throws InterruptedException { List<SkyKey> patternSkyKeys = new ArrayList<>(); for (TargetPatternSkyKeyOrException keyOrException : - TargetPatternValue.keys(targetPatterns, FilteringPolicies.FILTER_MANUAL, offset)) { + TargetPatternValue.keys(options.getTargetPatterns(), FilteringPolicies.FILTER_MANUAL, + options.getOffset())) { try { patternSkyKeys.add(keyOrException.getSkyKey()); } catch (TargetParsingException e) { @@ -231,8 +227,10 @@ final class TargetPatternPhaseFunction implements SkyFunction { } } - ResolvedTargets<Target> result = builder.build(); - if (compileOneDependency) { + ResolvedTargets<Target> result = builder + .filter(TargetUtils.tagFilter(options.getBuildTargetFilter())) + .build(); + if (options.getCompileOneDependency()) { TargetProvider targetProvider = new EnvironmentBackedRecursivePackageProvider(env); try { return new CompileOneDependencyTransformer(targetProvider) diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java index ca8881386f..7238ddbb94 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java @@ -24,12 +24,10 @@ import com.google.devtools.build.lib.pkgcache.TestFilter; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; - import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Objects; - import javax.annotation.Nullable; /** @@ -131,6 +129,7 @@ public final class TargetPatternPhaseValue implements SkyValue { @ThreadSafe public static SkyKey key(ImmutableList<String> targetPatterns, String offset, boolean compileOneDependency, boolean buildTestsOnly, boolean determineTests, + ImmutableList<String> buildTargetFilter, @Nullable TestFilter testFilter) { return SkyKey.create( SkyFunctions.TARGET_PATTERN_PHASE, @@ -140,6 +139,7 @@ public final class TargetPatternPhaseValue implements SkyValue { compileOneDependency, buildTestsOnly, determineTests, + buildTargetFilter, testFilter)); } @@ -154,16 +154,18 @@ public final class TargetPatternPhaseValue implements SkyValue { private final boolean compileOneDependency; private final boolean buildTestsOnly; private final boolean determineTests; + private final ImmutableList<String> buildTargetFilter; @Nullable private final TestFilter testFilter; public TargetPatternList(ImmutableList<String> targetPatterns, String offset, boolean compileOneDependency, boolean buildTestsOnly, boolean determineTests, - @Nullable TestFilter testFilter) { + ImmutableList<String> buildTargetFilter, @Nullable TestFilter testFilter) { this.targetPatterns = Preconditions.checkNotNull(targetPatterns); this.offset = Preconditions.checkNotNull(offset); this.compileOneDependency = compileOneDependency; this.buildTestsOnly = buildTestsOnly; this.determineTests = determineTests; + this.buildTargetFilter = Preconditions.checkNotNull(buildTargetFilter); this.testFilter = testFilter; if (buildTestsOnly || determineTests) { Preconditions.checkNotNull(testFilter); @@ -190,6 +192,10 @@ public final class TargetPatternPhaseValue implements SkyValue { return determineTests; } + public ImmutableList<String> getBuildTargetFilter() { + return buildTargetFilter; + } + public TestFilter getTestFilter() { return testFilter; } @@ -228,6 +234,7 @@ public final class TargetPatternPhaseValue implements SkyValue { && other.compileOneDependency == compileOneDependency && other.buildTestsOnly == buildTestsOnly && other.determineTests == determineTests + && other.buildTargetFilter.equals(buildTargetFilter) && Objects.equals(other.testFilter, testFilter); } } |