aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2015-09-15 14:09:17 +0000
committerGravatar John Field <jfield@google.com>2015-09-15 20:27:54 +0000
commit4f7288ede042b1e9e01b196de56ee16fec7b1440 (patch)
treebf7a688f903568cc11182386f312b3ef8ee559e7 /src/main
parent5584e381e674d9fea1469f332460019c0fd5dbf6 (diff)
Only collect source files from attributes that don't have instrumentation data.
This fixes a recent regression in coverage; it's currently collecting too many files for instrumentation for non-compiled languages. -- MOS_MIGRATED_REVID=103089788
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java b/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java
index 8b343f3a1e..e61cafa1f8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java
@@ -84,6 +84,9 @@ public final class InstrumentedFilesCollector {
if (shouldIncludeLocalSources(ruleContext)) {
NestedSetBuilder<Artifact> localSourcesBuilder = NestedSetBuilder.stableOrder();
for (TransitiveInfoCollection dep : prereqs) {
+ if (dep.getProvider(InstrumentedFilesProvider.class) != null) {
+ continue;
+ }
for (Artifact artifact : dep.getProvider(FileProvider.class).getFilesToBuild()) {
if (artifact.isSourceArtifact() &&
spec.instrumentedFileTypes.matches(artifact.getFilename())) {