From 3b9e1522bc20ead42f40870f9dabb72b1545c7df Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 26 Mar 2018 11:03:30 -0700 Subject: Simplified ActionContextConsumer by having it operate on a new class which holds a variety of strategy/context maps. PiperOrigin-RevId: 190491357 --- .../com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java') diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java b/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java index 70bd8e6772..db3214f88f 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java +++ b/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.exec.util; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.actions.ActionContext; @@ -28,6 +27,7 @@ import com.google.devtools.build.lib.exec.BinTools; import com.google.devtools.build.lib.exec.BlazeExecutor; import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.exec.FileWriteStrategy; +import com.google.devtools.build.lib.exec.SpawnActionContextMaps; import com.google.devtools.build.lib.exec.SymlinkTreeStrategy; import com.google.devtools.build.lib.runtime.CommonCommandOptions; import com.google.devtools.build.lib.testutil.TestConstants; @@ -107,8 +107,7 @@ public class TestExecutorBuilder { bus, BlazeClock.instance(), optionsParser, - strategies, - ImmutableMap.copyOf(spawnStrategyMap), + SpawnActionContextMaps.createStub(strategies, spawnStrategyMap), ImmutableList.of()); } } -- cgit v1.2.3