commit 0588ba0445560ea9503ed623d1f231cb65aa20c8
author ulfjack <ulfjack@google.com> Thu Feb 15 10:40:26 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Feb 15 10:42:33 2018 -0800
tree cdd8ff1ce527ae1d4802137ba0275a8f79509241
parent cb314a2e36031c8a5f1dd26bb3b94f1b8f1cb901

Remove BinTools from BuildViewTestCase

The BVTC is primarily intended for analysis tests, and those should not have
access to BinTools. However, there are a few subclasses that misuse it for
integration tests, and those need to create their own BinTools instances now.

PiperOrigin-RevId: 185862672

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

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 8d04560..856f000 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 @@
 
     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 @@
     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 @@
     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);