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/TimestampBuilderTestCase.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/TimestampBuilderTestCase.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 1143d3ca23..b243828490 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -48,6 +48,7 @@ import com.google.devtools.build.lib.actions.util.DummyExecutor; import com.google.devtools.build.lib.actions.util.TestAction; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredTarget; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.TopLevelArtifactContext; import com.google.devtools.build.lib.buildtool.SkyframeBuilder; import com.google.devtools.build.lib.clock.BlazeClock; @@ -158,8 +159,11 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); AtomicReference<TimestampGranularityMonitor> tsgmRef = new AtomicReference<>(tsgm); - BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory, - TestConstants.PRODUCT_NAME); + BlazeDirectories directories = + new BlazeDirectories( + new ServerDirectories(rootDirectory, outputBase), + rootDirectory, + TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, |