From 9ac1f287eab0ce2fa0e3c685cd218832091f19e9 Mon Sep 17 00:00:00 2001 From: John Cater Date: Mon, 4 Dec 2017 19:34:53 -0800 Subject: Added execution platform to the ActionExecutionMetadata. Part of #4128. Change-Id: Id822d3ae6f8daf7c92a75bd8bd28590d4f625845 PiperOrigin-RevId: 177905460 --- src/test/java/com/google/devtools/build/lib/BUILD | 2 ++ .../com/google/devtools/build/lib/actions/ResourceManagerTest.java | 7 +++++++ .../java/com/google/devtools/build/lib/exec/util/FakeOwner.java | 7 +++++++ 3 files changed, 16 insertions(+) (limited to 'src/test/java/com/google/devtools') diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index c511698e3b..53a3c6b060 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -326,6 +326,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:packages", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/analysis/platform", "//src/main/java/com/google/devtools/build/lib/clock", "//src/main/java/com/google/devtools/build/lib/collect", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", @@ -382,6 +383,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:runtime", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/analysis/platform", "//src/main/java/com/google/devtools/build/lib/clock", "//src/main/java/com/google/devtools/build/lib/collect", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", diff --git a/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java b/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java index 947b5572a6..fe4776826f 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.ResourceManager.ResourceHandle; +import com.google.devtools.build.lib.analysis.platform.PlatformInfo; import com.google.devtools.build.lib.testutil.TestThread; import com.google.devtools.build.lib.testutil.TestUtils; import java.util.concurrent.CyclicBarrier; @@ -573,5 +574,11 @@ public class ResourceManagerTest { public MiddlemanType getActionType() { throw new IllegalStateException(); } + + @Nullable + @Override + public PlatformInfo getExecutionPlatform() { + throw new IllegalStateException(); + } } } diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java b/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java index 37e45153c9..caf7b5120c 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java +++ b/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java @@ -22,6 +22,7 @@ import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.RunfilesSupplier; +import com.google.devtools.build.lib.analysis.platform.PlatformInfo; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.AspectDescriptor; import javax.annotation.Nullable; @@ -152,4 +153,10 @@ public final class FakeOwner implements ActionExecutionMetadata { public boolean shouldReportPathPrefixConflict(ActionAnalysisMetadata action) { throw new UnsupportedOperationException(); } + + @Nullable + @Override + public PlatformInfo getExecutionPlatform() { + throw new IllegalStateException(); + } } -- cgit v1.2.3