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/skyframe/ContainingPackageLookupFunctionTest.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/skyframe/ContainingPackageLookupFunctionTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java index bcbeb54f31..5862dfce20 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java @@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.RepositoryName; @@ -76,7 +77,9 @@ public class ContainingPackageLookupFunctionTest extends FoundationTestCase { deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); BlazeDirectories directories = new BlazeDirectories( - rootDirectory, outputBase, rootDirectory, analysisMock.getProductName()); + new ServerDirectories(rootDirectory, outputBase), + rootDirectory, + analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, |