From 4f7288ede042b1e9e01b196de56ee16fec7b1440 Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Tue, 15 Sep 2015 14:09:17 +0000 Subject: 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 --- .../devtools/build/lib/rules/test/InstrumentedFilesCollector.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main') 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 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())) { -- cgit v1.2.3