diff options
5 files changed, 9 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java index b5be2e40e5..84acbdf725 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java @@ -28,6 +28,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.util.ActionTester; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.exec.BinTools; import com.google.devtools.build.lib.exec.util.TestExecutorBuilder; import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -54,6 +55,7 @@ public abstract class FileWriteActionTestCase extends BuildViewTestCase { @Before public final void createExecutorAndContext() throws Exception { + BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); executor = new TestExecutorBuilder(fileSystem, directories, binTools).build(); context = new ActionExecutionContext( diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java index 8678d50a30..4ef9f570ac 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.util.ActionTester; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.exec.BinTools; import com.google.devtools.build.lib.exec.util.TestExecutorBuilder; import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -166,6 +167,7 @@ public class ParamFileWriteActionTest extends BuildViewTestCase { } }; + BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); Executor executor = new TestExecutorBuilder(fileSystem, directories, binTools).build(); return new ActionExecutionContext( executor, diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 6def1f8b07..b749ec40f2 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -95,7 +95,6 @@ import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.events.StoredEventHandler; -import com.google.devtools.build.lib.exec.BinTools; import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.packages.AspectClass; import com.google.devtools.build.lib.packages.AspectDescriptor; @@ -183,7 +182,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected TimestampGranularityMonitor tsgm; protected BlazeDirectories directories; protected ActionKeyContext actionKeyContext; - protected BinTools binTools; // Note that these configurations are virtual (they use only VFS) protected BuildConfigurationCollection masterConfig; @@ -214,7 +212,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase { rootDirectory, analysisMock.getProductName()); actionKeyContext = new ActionKeyContext(); - binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); mockToolsConfig = new MockToolsConfig(rootDirectory, false); analysisMock.setupMockClient(mockToolsConfig); analysisMock.setupMockWorkspaceFiles(directories.getEmbeddedBinariesRoot()); diff --git a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java index 8d0456067d..856f000ccd 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java @@ -85,6 +85,7 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { ExecutionOptions executionOptions = ExecutionOptions.DEFAULTS; Path tmpDirRoot = TestStrategy.getTmpRoot(rootDirectory, outputBase, executionOptions); + BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); TestedStandaloneTestStrategy standaloneTestStrategy = new TestedStandaloneTestStrategy(executionOptions, binTools, tmpDirRoot); @@ -142,6 +143,7 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { ExecutionOptions executionOptions = Options.getDefaults(ExecutionOptions.class); executionOptions.testOutput = TestOutputFormat.ERRORS; Path tmpDirRoot = TestStrategy.getTmpRoot(rootDirectory, outputBase, executionOptions); + BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); TestedStandaloneTestStrategy standaloneTestStrategy = new TestedStandaloneTestStrategy(executionOptions, binTools, tmpDirRoot); @@ -242,6 +244,7 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { ExecutionOptions executionOptions = Options.getDefaults(ExecutionOptions.class); executionOptions.testOutput = TestOutputFormat.ALL; Path tmpDirRoot = TestStrategy.getTmpRoot(rootDirectory, outputBase, executionOptions); + BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); TestedStandaloneTestStrategy standaloneTestStrategy = new TestedStandaloneTestStrategy(executionOptions, binTools, tmpDirRoot); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java index 7751cb1375..dbf62828a2 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java @@ -30,6 +30,7 @@ import com.google.devtools.build.lib.analysis.util.ActionTester; import com.google.devtools.build.lib.analysis.util.ActionTester.ActionCombinationFactory; import com.google.devtools.build.lib.analysis.util.AnalysisTestUtil; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.exec.BinTools; import com.google.devtools.build.lib.exec.util.TestExecutorBuilder; import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.PathFragment; @@ -75,6 +76,7 @@ public class LtoBackendActionTest extends BuildViewTestCase { @Before public final void createExecutorAndContext() throws Exception { + BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); executor = new TestExecutorBuilder(fileSystem, directories, binTools).build(); context = new ActionExecutionContext( |