From ee4be22415300fa354862648893023c257638983 Mon Sep 17 00:00:00 2001 From: Dmitry Shevchenko Date: Fri, 18 Mar 2016 19:12:39 +0000 Subject: Adds mcov tool label to IosTest. Adds source files to IosTest runfiles so that mcov/clang has access to them during coverage run. -- MOS_MIGRATED_REVID=117572134 --- .../com/google/devtools/build/lib/rules/objc/TestSupport.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java index 265c637b5e..b1c5050b64 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction.Su import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; +import com.google.devtools.build.lib.rules.test.InstrumentedFilesProvider; import com.google.devtools.build.lib.rules.test.TestEnvironmentProvider; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.FileType; @@ -219,7 +220,9 @@ public class TestSupport { /** * Adds all files needed to run this test to the passed Runfiles builder. */ - public TestSupport addRunfiles(Builder runfilesBuilder) throws InterruptedException { + public TestSupport addRunfiles( + Builder runfilesBuilder, InstrumentedFilesProvider instrumentedFilesProvider) + throws InterruptedException { runfilesBuilder .addArtifact(testBundleIpa()) .addArtifacts(testHarnessIpa().asSet()) @@ -235,6 +238,11 @@ public class TestSupport { runfilesBuilder.addTransitiveArtifacts(labDeviceRunfiles()); } + if (ruleContext.getConfiguration().isCodeCoverageEnabled()) { + runfilesBuilder.addArtifact(ruleContext.getHostPrerequisiteArtifact(IosTest.MCOV_TOOL_ATTR)); + runfilesBuilder.addTransitiveArtifacts(instrumentedFilesProvider.getInstrumentedFiles()); + } + return this; } -- cgit v1.2.3