From 3f344f33eda2fbbc7c3c1356f17a75da854e78a2 Mon Sep 17 00:00:00 2001
From: Chris Parsons <cparsons@google.com>
Date: Tue, 27 Oct 2015 18:40:06 +0000
Subject: Pass apple sdk information to ios_test test actions

--
MOS_MIGRATED_REVID=106418732
---
 .../devtools/build/lib/rules/objc/TestSupport.java  | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(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 94ce727e3a..06b8f7976c 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
@@ -226,20 +226,19 @@ public class TestSupport {
    * builder.
    */
   public Map<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> getExtraProviders() {
+    ObjcConfiguration configuration = ruleContext.getFragment(ObjcConfiguration.class);
+
+    ImmutableMap.Builder<String, String> envBuilder = ImmutableMap.builder();
+
+    envBuilder.putAll(configuration.getEnvironmentForDarwin());
+
     if (ruleContext.getConfiguration().isCodeCoverageEnabled()) {
-      return ImmutableMap.<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider>of(
-          TestEnvironmentProvider.class, new TestEnvironmentProvider(gcovEnv()));
+      envBuilder.put("COVERAGE_GCOV_PATH",
+          ruleContext.getHostPrerequisiteArtifact(":gcov").getExecPathString());
     }
-    return ImmutableMap.of();
-  }
 
-  /**
-   * Returns a map of extra environment variable names to their values used to point to gcov binary,
-   * which should be added to the test action environment, if coverage is enabled.
-   */
-  private ImmutableMap<String, String> gcovEnv() {
-    return ImmutableMap.of(
-        "COVERAGE_GCOV_PATH", ruleContext.getHostPrerequisiteArtifact(":gcov").getExecPathString());
+    return ImmutableMap.<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider>of(
+        TestEnvironmentProvider.class, new TestEnvironmentProvider(envBuilder.build()));
   }
 
   /**
-- 
cgit v1.2.3