commit 39969b1c517307962b03d300059df633e9f4c4de
author janakr <janakr@google.com> Sun Mar 03 16:25:48 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Sun Mar 03 16:27:30 2019 -0800
tree 4603a8417655cac4af14a2d18881359b217ca096
parent 51175bea260f528e4ba60681d6cd83dfb9fbefa2

Unshare FileArtifactValues associated with constant-metadata Artifacts: they can't really be used across servers.

PiperOrigin-RevId: 236567498

src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
index b2f3384..f82e696 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
@@ -89,7 +89,10 @@
     Runfiles runfiles = new Runfiles.Builder("workspace").addArtifact(artifact).build();
     RunfilesSupplier supplier = new RunfilesSupplierImpl(PathFragment.create("runfiles"), runfiles);
     FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
-    mockCache.put(artifact, FileArtifactValue.createNormalFile(FAKE_DIGEST, 0));
+    mockCache.put(
+        artifact,
+        FileArtifactValue.createNormalFile(
+            FAKE_DIGEST, /*proxy=*/ null, 0L, /*isShareable=*/ true));
 
     expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
         ArtifactPathResolver.IDENTITY, true);
@@ -151,8 +154,14 @@
         new Runfiles.Builder("workspace").addArtifact(artifact1).addArtifact(artifact2).build();
     RunfilesSupplier supplier = new RunfilesSupplierImpl(PathFragment.create("runfiles"), runfiles);
     FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
-    mockCache.put(artifact1, FileArtifactValue.createNormalFile(FAKE_DIGEST, 1));
-    mockCache.put(artifact2, FileArtifactValue.createNormalFile(FAKE_DIGEST, 2));
+    mockCache.put(
+        artifact1,
+        FileArtifactValue.createNormalFile(
+            FAKE_DIGEST, /*proxy=*/ null, 1L, /*isShareable=*/ true));
+    mockCache.put(
+        artifact2,
+        FileArtifactValue.createNormalFile(
+            FAKE_DIGEST, /*proxy=*/ null, 12L, /*isShareable=*/ true));
 
     expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
         ArtifactPathResolver.IDENTITY, true);
@@ -175,7 +184,10 @@
             .build();
     RunfilesSupplier supplier = new RunfilesSupplierImpl(PathFragment.create("runfiles"), runfiles);
     FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
-    mockCache.put(artifact, FileArtifactValue.createNormalFile(FAKE_DIGEST, 1));
+    mockCache.put(
+        artifact,
+        FileArtifactValue.createNormalFile(
+            FAKE_DIGEST, /*proxy=*/ null, 1L, /*isShareable=*/ true));
 
     expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
         ArtifactPathResolver.IDENTITY, true);
@@ -196,7 +208,10 @@
             .build();
     RunfilesSupplier supplier = new RunfilesSupplierImpl(PathFragment.create("runfiles"), runfiles);
     FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
-    mockCache.put(artifact, FileArtifactValue.createNormalFile(FAKE_DIGEST, 1));
+    mockCache.put(
+        artifact,
+        FileArtifactValue.createNormalFile(
+            FAKE_DIGEST, /*proxy=*/ null, 1L, /*isShareable=*/ true));
 
     expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
         ArtifactPathResolver.IDENTITY, true);