diff options
| author |  dslomov <dslomov@google.com> | 2017-12-13 05:55:07 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-13 05:56:34 -0800 |
| commit | a3b8e3972379f7e32f7c72c298ee20d8127f9aff (patch) | |
| tree | dc1a64ec5513b329e81d3bd631cf92c468c47228 /src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java | |
| parent | 75eca48099370df836388a6afe0279d597673f33 (diff) | |
Implement --(no)expand_test_suites flag.
--noexpand_test_suites flag will suppress expansion of test_suite
targets into constituent tests, so that command-line aspects can analyze
test_suite targets.
RELNOTES: Added --(no)expand_test_suites flag.
PiperOrigin-RevId: 178892829
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 5a005827b0..75d38b81d3 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 @@ -98,7 +98,7 @@ final class TargetPatternPhaseFunction implements SkyFunction { Map<Label, SkyKey> testExpansionKeys = new LinkedHashMap<>(); if (targets != null) { for (Target target : targets.getTargets()) { - if (TargetUtils.isTestSuiteRule(target)) { + if (TargetUtils.isTestSuiteRule(target) && options.isExpandTestSuites()) { Label label = target.getLabel(); SkyKey testExpansionKey = TestSuiteExpansionValue.key(ImmutableSet.of(label)); testExpansionKeys.put(label, testExpansionKey); @@ -172,7 +172,7 @@ final class TargetPatternPhaseFunction implements SkyFunction { boolean preExpansionError = targets.hasError(); ResolvedTargets.Builder<Target> expandedTargetsBuilder = ResolvedTargets.builder(); for (Target target : targets.getTargets()) { - if (TargetUtils.isTestSuiteRule(target)) { + if (TargetUtils.isTestSuiteRule(target) && options.isExpandTestSuites()) { SkyKey expansionKey = Preconditions.checkNotNull(testExpansionKeys.get(target.getLabel())); TestSuiteExpansionValue testExpansion = |