diff options
| author |  janakr <janakr@google.com> | 2017-09-14 09:55:40 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-14 18:47:27 +0200 |
| commit | 3b63a4e67c547a656000dfd4e9d61f68a21b92d8 (patch) | |
| tree | fa84bb33fd9741aa5a59de627909e0f5dd984e5f /src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java | |
| parent | aa437e01b1879f0e1ba0452ce6137d80586258da (diff) | |
Remove deepExecRoot from BlazeDirectories. It is now the default. Also inline constructor that did ServerDirectories creation inline: don't pollute production code for tests' convenience.
PiperOrigin-RevId: 168652349
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index 22f6ff8b73..ba5c5ae6a1 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -23,6 +23,7 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.config.BinTools; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection; @@ -100,7 +101,10 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)); final PackageFactory pkgFactory; BlazeDirectories directories = - new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), + rootDirectory, + analysisMock.getProductName()); pkgFactory = analysisMock .getPackageFactoryBuilderForTesting() |