commit 0256f6963b36d5f6ab13b53787b0bff2b4bee0ce
author Roy Williams <royw@fb.com> Thu Oct 03 13:23:29 2013 -0700
committer Michael Bolin <mbolin@fb.com> Tue Oct 08 13:54:10 2013 -0700
tree 77c16184f9126a9cb17e16a987f0956a95038f2f
parent bc8c6933876209e68359771df13be20d55a15299

Don't attempt to write to the distributed cache on an ABI cache hit.

src/com/facebook/buck/rules/BuildRuleSuccess.java

diff --git a/src/com/facebook/buck/rules/BuildRuleSuccess.java b/src/com/facebook/buck/rules/BuildRuleSuccess.java
index d298927..385ada0 100644
--- a/src/com/facebook/buck/rules/BuildRuleSuccess.java
+++ b/src/com/facebook/buck/rules/BuildRuleSuccess.java
@@ -60,7 +60,6 @@
      */
     MATCHING_DEPS_ABI_AND_RULE_KEY_NO_DEPS(
         Property.SHOULD_INITIALIZE_FROM_DISK_AFTER_BUILDING,
-        Property.SHOULD_UPLOAD_RESULTING_ARTIFACT,
         Property.SHOULD_WRITE_RECORDED_METADATA_TO_DISK
         ),
 

test/com/facebook/buck/rules/AbstractCachingBuildRuleTest.java

diff --git a/test/com/facebook/buck/rules/AbstractCachingBuildRuleTest.java b/test/com/facebook/buck/rules/AbstractCachingBuildRuleTest.java
index 2b6f3ed..8617c7b 100644
--- a/test/com/facebook/buck/rules/AbstractCachingBuildRuleTest.java
+++ b/test/com/facebook/buck/rules/AbstractCachingBuildRuleTest.java
@@ -239,8 +239,6 @@
     buckEventBus.register(listener);
 
     BuildContext buildContext = createMock(BuildContext.class);
-    ArtifactCache artifactCache = createMock(ArtifactCache.class);
-    expect(buildContext.getArtifactCache()).andReturn(artifactCache);
 
     BuildInfoRecorder buildInfoRecorder = createMock(BuildInfoRecorder.class);
     expect(buildContext.createBuildInfoRecorder(
@@ -272,7 +270,6 @@
 
     // These methods should be invoked after the rule is built locally.
     buildInfoRecorder.writeMetadataToDisk();
-    buildInfoRecorder.performUploadToArtifactCache(artifactCache, buckEventBus);
 
     expect(buildContext.createOnDiskBuildInfoFor(buildTarget)).andReturn(onDiskBuildInfo);
     expect(buildContext.getExecutor()).andReturn(MoreExecutors.sameThreadExecutor());