From 3b63a4e67c547a656000dfd4e9d61f68a21b92d8 Mon Sep 17 00:00:00 2001 From: janakr Date: Thu, 14 Sep 2017 09:55:40 +0200 Subject: 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 --- .../devtools/build/lib/analysis/BlazeDirectoriesTest.java | 15 +++++++++------ .../lib/analysis/actions/TemplateExpansionActionTest.java | 4 ++-- .../build/lib/analysis/config/BuildConfigurationTest.java | 6 +++--- .../build/lib/analysis/util/AnalysisTestCase.java | 6 +++++- .../build/lib/analysis/util/BuildViewTestCase.java | 6 +++++- .../build/lib/analysis/util/ConfigurationTestCase.java | 6 +++++- .../google/devtools/build/lib/exec/BlazeExecutorTest.java | 4 ++-- .../build/lib/packages/util/PackageLoadingTestCase.java | 5 ++++- .../build/lib/pkgcache/BuildFileModificationTest.java | 6 +++++- .../build/lib/pkgcache/IncrementalLoadingTest.java | 4 ++-- .../build/lib/pkgcache/LoadingPhaseRunnerTest.java | 4 ++-- .../devtools/build/lib/pkgcache/PackageCacheTest.java | 6 +++++- .../devtools/build/lib/rules/ExternalPackageUtilTest.java | 5 ++++- .../lib/rules/repository/RepositoryDelegatorTest.java | 5 +++-- .../build/lib/runtime/BuildEventStreamerTest.java | 13 ++++++++----- .../build/lib/skyframe/ArtifactFunctionTestCase.java | 5 +++-- .../lib/skyframe/ContainingPackageLookupFunctionTest.java | 5 ++++- .../devtools/build/lib/skyframe/FileFunctionTest.java | 4 +++- .../build/lib/skyframe/FilesetEntryFunctionTest.java | 13 +++++++++---- .../build/lib/skyframe/FilesystemValueCheckerTest.java | 6 ++++-- .../devtools/build/lib/skyframe/GlobFunctionTest.java | 11 +++++++---- .../lib/skyframe/LocalRepositoryLookupFunctionTest.java | 5 ++++- .../build/lib/skyframe/PackageLookupFunctionTest.java | 5 ++++- .../RecursiveFilesystemTraversalFunctionTest.java | 5 ++++- .../build/lib/skyframe/TimestampBuilderTestCase.java | 8 ++++++-- .../build/lib/standalone/StandaloneSpawnStrategyTest.java | 4 +++- 26 files changed, 115 insertions(+), 51 deletions(-) (limited to 'src/test/java/com') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java index 28a4a8c470..a622ce99dc 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java @@ -34,17 +34,20 @@ public class BlazeDirectoriesTest extends FoundationTestCase { Path installBase = fs.getPath("/my/install"); Path outputBase = fs.getPath("/my/output"); Path workspace = fs.getPath("/my/ws"); - BlazeDirectories directories = new BlazeDirectories(installBase, outputBase, workspace, "foo"); - assertThat(outputBase.getChild("ws")).isEqualTo(directories.getExecRoot()); + BlazeDirectories directories = + new BlazeDirectories(new ServerDirectories(installBase, outputBase), workspace, "foo"); + assertThat(outputBase.getRelative("execroot/ws")).isEqualTo(directories.getExecRoot()); workspace = null; - directories = new BlazeDirectories(installBase, outputBase, workspace, "foo"); - assertThat(outputBase.getChild(BlazeDirectories.DEFAULT_EXEC_ROOT)) + directories = + new BlazeDirectories(new ServerDirectories(installBase, outputBase), workspace, "foo"); + assertThat(outputBase.getRelative("execroot/" + BlazeDirectories.DEFAULT_EXEC_ROOT)) .isEqualTo(directories.getExecRoot()); workspace = fs.getPath("/"); - directories = new BlazeDirectories(installBase, outputBase, workspace, "foo"); - assertThat(outputBase.getChild(BlazeDirectories.DEFAULT_EXEC_ROOT)) + directories = + new BlazeDirectories(new ServerDirectories(installBase, outputBase), workspace, "foo"); + assertThat(outputBase.getRelative("execroot/" + BlazeDirectories.DEFAULT_EXEC_ROOT)) .isEqualTo(directories.getExecRoot()); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java index b68b4bff05..3f099f6646 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java @@ -26,6 +26,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction.Substitution; import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction.Template; import com.google.devtools.build.lib.analysis.config.BinTools; @@ -67,8 +68,7 @@ public class TemplateExpansionActionTest extends FoundationTestCase { substitutions.add(Substitution.of("%value%", "bar")); directories = new BlazeDirectories( - scratch.resolve("/install"), - scratch.resolve("/base"), + new ServerDirectories(scratch.resolve("/install"), scratch.resolve("/base")), scratch.resolve("/workspace"), "mock-product-name"); binTools = BinTools.empty(directories); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java index 6330a41306..abda893c45 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java @@ -48,8 +48,8 @@ public class BuildConfigurationTest extends ConfigurationTestCase { } BuildConfiguration config = create("--cpu=piii"); - String outputDirPrefix = outputBase - + "/" + config.getMainRepositoryName() + "/blaze-out/.*piii-fastbuild"; + String outputDirPrefix = + outputBase + "/execroot/" + config.getMainRepositoryName() + "/blaze-out/.*piii-fastbuild"; assertThat(config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()) .matches(outputDirPrefix); @@ -71,7 +71,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase { assertThat(config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()) .matches( outputBase - + "/" + + "/execroot/" + config.getMainRepositoryName() + "/blaze-out/.*k8-fastbuild-test"); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 0cdc4a3975..4517b9f083 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -30,6 +30,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.InputFileConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleDefinition; +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; @@ -144,7 +145,10 @@ public abstract class AnalysisTestCase extends FoundationTestCase { analysisMock = getAnalysisMock(); pkgLocator = new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)); directories = - new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), + rootDirectory, + analysisMock.getProductName()); workspaceStatusActionFactory = new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories); 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 3d0b1d2317..aa2bf35295 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 @@ -65,6 +65,7 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.RunfilesSupport; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.SourceManifestAction; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; @@ -199,7 +200,10 @@ public abstract class BuildViewTestCase extends FoundationTestCase { public final void initializeSkyframeExecutor() throws Exception { analysisMock = getAnalysisMock(); directories = - new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), + rootDirectory, + analysisMock.getProductName()); binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); mockToolsConfig = new MockToolsConfig(rootDirectory, false); analysisMock.setupMockClient(mockToolsConfig); 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() diff --git a/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java b/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java index 05c65a7e1d..1912960ac7 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java @@ -20,6 +20,7 @@ import com.google.common.collect.Iterables; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.actions.SpawnActionContext; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.config.BinTools; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.Reporter; @@ -48,8 +49,7 @@ public class BlazeExecutorTest { InMemoryFileSystem fs = new InMemoryFileSystem(); directories = new BlazeDirectories( - fs.getPath("/install"), - fs.getPath("/base"), + new ServerDirectories(fs.getPath("/install"), fs.getPath("/base")), fs.getPath("/workspace"), "mock-product-name"); binTools = BinTools.empty(directories); diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java index 0814dacafc..e4f1d5177e 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java @@ -21,6 +21,7 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.RuleDefinition; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; @@ -107,7 +108,9 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { SequencedSkyframeExecutor.create( packageFactory, new BlazeDirectories( - outputBase, outputBase, rootDirectory, loadingMock.getProductName()), + new ServerDirectories(outputBase, outputBase), + rootDirectory, + loadingMock.getProductName()), null, /* BinTools */ null, /* workspaceStatusActionFactory */ ruleClassProvider.getBuildInfoFactories(), diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java index 6310b97c99..fb7581b24f 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; 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.util.AnalysisMock; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.packages.NoSuchPackageException; @@ -73,7 +74,10 @@ public class BuildFileModificationTest extends FoundationTestCase { analysisMock = AnalysisMock.get(); ruleClassProvider = analysisMock.createRuleClassProvider(); BlazeDirectories directories = - new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), + rootDirectory, + analysisMock.getProductName()); skyframeExecutor = SequencedSkyframeExecutor.create( analysisMock diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java index 9eb5b2061a..2afdf03977 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.Reporter; @@ -468,8 +469,7 @@ public class IncrementalLoadingTest { .getPackageFactoryBuilderForTesting() .build(loadingMock.createRuleClassProvider(), fs), new BlazeDirectories( - fs.getPath("/install"), - fs.getPath("/output"), + new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")), workspace, loadingMock.getProductName()), null, /* BinTools */ diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java index ad13b5dbbf..5849ce6c1c 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.BuildView; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.TargetParsingException; @@ -614,8 +615,7 @@ public class LoadingPhaseRunnerTest { storedErrors = new StoredEventHandler(); BlazeDirectories directories = new BlazeDirectories( - fs.getPath("/install"), - fs.getPath("/output"), + new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")), workspace, analysisMock.getProductName()); skyframeExecutor = diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java index 635be58e2c..1cffeb741d 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; 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.util.AnalysisMock; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.cmdline.Label; @@ -79,7 +80,10 @@ public class PackageCacheTest extends FoundationTestCase { analysisMock = AnalysisMock.get(); ruleClassProvider = analysisMock.createRuleClassProvider(); BlazeDirectories directories = - new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), + rootDirectory, + analysisMock.getProductName()); PackageFactory.BuilderForTesting packageFactoryBuilder = analysisMock.getPackageFactoryBuilderForTesting(); if (!doPackageLoadingChecks) { diff --git a/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java index b6a0037169..3b9b3a527a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java @@ -21,6 +21,7 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; 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.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; @@ -85,7 +86,9 @@ public class ExternalPackageUtilTest extends BuildViewTestCase { new AtomicReference<>(ImmutableSet.of()); BlazeDirectories directories = new BlazeDirectories( - rootDirectory, outputBase, rootDirectory, analysisMock.getProductName()); + new ServerDirectories(rootDirectory, outputBase), + rootDirectory, + analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java index 849a3b712d..87cca162f3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; @@ -74,8 +75,8 @@ public class RepositoryDelegatorTest extends FoundationTestCase { ImmutableMap.of(), null, new AtomicBoolean(true)); AtomicReference pkgLocator = new AtomicReference<>( new PathPackageLocator(root, ImmutableList.of(root))); - BlazeDirectories directories = new BlazeDirectories(root, root, root, - TestConstants.PRODUCT_NAME); + BlazeDirectories directories = + new BlazeDirectories(new ServerDirectories(root, root), root, TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java index 5e6116aafe..2c5a263fc2 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java @@ -29,6 +29,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.EventReportingArtifacts; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.config.FragmentOptions; @@ -613,11 +614,13 @@ public class BuildEventStreamerTest extends FoundationTestCase { ImmutableSet.of(ProgressEvent.INITIAL_PROGRESS_UPDATE)); BuildConfiguration configuration = new BuildConfiguration( - new BlazeDirectories(outputBase, outputBase, rootDirectory, "productName"), - ImmutableMap., - BuildConfiguration.Fragment>of(), - BuildOptions.of(ImmutableList.>of( - BuildConfiguration.Options.class)), + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), rootDirectory, "productName"), + ImmutableMap + ., BuildConfiguration.Fragment>of(), + BuildOptions.of( + ImmutableList.>of( + BuildConfiguration.Options.class)), "workspace"); BuildEvent firstWithConfiguration = new GenericConfigurationEvent(testId("first"), configuration); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index c01285e969..127261d16a 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction; import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy; @@ -75,8 +76,8 @@ abstract class ArtifactFunctionTestCase { setupRoot(new CustomInMemoryFs()); AtomicReference pkgLocator = new AtomicReference<>(new PathPackageLocator( root.getFileSystem().getPath("/outputbase"), ImmutableList.of(root))); - BlazeDirectories directories = new BlazeDirectories(root, root, root, - TestConstants.PRODUCT_NAME); + BlazeDirectories directories = + new BlazeDirectories(new ServerDirectories(root, root), root, TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, 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.of()); BlazeDirectories directories = new BlazeDirectories( - rootDirectory, outputBase, rootDirectory, analysisMock.getProductName()); + new ServerDirectories(rootDirectory, outputBase), + rootDirectory, + analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index 103211f76e..2daf071529 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java @@ -30,6 +30,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; 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.clock.BlazeClock; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; @@ -121,7 +122,8 @@ public class FileFunctionTest { private SequentialBuildDriver makeDriver(ExternalFileAction externalFileAction) { AtomicReference pkgLocatorRef = new AtomicReference<>(pkgLocator); BlazeDirectories directories = - new BlazeDirectories(pkgRoot, outputBase, pkgRoot, TestConstants.PRODUCT_NAME); + new BlazeDirectories( + new ServerDirectories(pkgRoot, outputBase), pkgRoot, TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocatorRef, externalFileAction, directories); differencer = new RecordingDifferencer(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java index 8c18bd038a..d9068a060e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java @@ -31,6 +31,7 @@ import com.google.devtools.build.lib.actions.FilesetTraversalParams.PackageBound import com.google.devtools.build.lib.actions.FilesetTraversalParamsFactory; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; @@ -84,10 +85,14 @@ public final class FilesetEntryFunctionTest extends FoundationTestCase { new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); AtomicReference> deletedPackages = new AtomicReference<>(ImmutableSet.of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( - pkgLocator, - ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, - new BlazeDirectories(outputBase, outputBase, rootDirectory, TestConstants.PRODUCT_NAME)); + ExternalFilesHelper externalFilesHelper = + new ExternalFilesHelper( + pkgLocator, + ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), + rootDirectory, + TestConstants.PRODUCT_NAME)); Map skyFunctions = new HashMap<>(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java index 2bd2ba9f44..80e3bdef61 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java @@ -33,6 +33,7 @@ import com.google.devtools.build.lib.actions.ArtifactOwner; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.actions.util.TestAction; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; @@ -102,8 +103,9 @@ public class FilesystemValueCheckerTest { AtomicReference pkgLocator = new AtomicReference<>(new PathPackageLocator( fs.getPath("/output_base"), ImmutableList.of(pkgRoot))); - BlazeDirectories directories = new BlazeDirectories(pkgRoot, pkgRoot, pkgRoot, - TestConstants.PRODUCT_NAME); + BlazeDirectories directories = + new BlazeDirectories( + new ServerDirectories(pkgRoot, pkgRoot), pkgRoot, TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories); skyFunctions.put(SkyFunctions.FILE_STATE, new FileStateFunction( diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java index 8c938ee699..bfa4e9d292 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java @@ -25,6 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; 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.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; @@ -122,10 +123,12 @@ public abstract class GlobFunctionTest { private Map createFunctionMap() { AtomicReference> deletedPackages = new AtomicReference<>(ImmutableSet.of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( - pkgLocator, - ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, - new BlazeDirectories(root, root, root, TestConstants.PRODUCT_NAME)); + ExternalFilesHelper externalFilesHelper = + new ExternalFilesHelper( + pkgLocator, + ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, + new BlazeDirectories( + new ServerDirectories(root, root), root, TestConstants.PRODUCT_NAME)); Map skyFunctions = new HashMap<>(); skyFunctions.put(SkyFunctions.GLOB, new GlobFunction(alwaysUseDirListing())); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java index 610eb728ef..3508a7fdb2 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java @@ -19,6 +19,7 @@ import static com.google.devtools.build.skyframe.EvaluationResultSubjectFactory. import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; 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; @@ -68,7 +69,9 @@ public class LocalRepositoryLookupFunctionTest extends FoundationTestCase { deletedPackages = new AtomicReference<>(ImmutableSet.of()); BlazeDirectories directories = new BlazeDirectories( - rootDirectory, outputBase, rootDirectory, analysisMock.getProductName()); + new ServerDirectories(rootDirectory, outputBase), + rootDirectory, + analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java index 5404d8e5ef..9acccb342d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java @@ -22,6 +22,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; @@ -86,7 +87,9 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { deletedPackages = new AtomicReference<>(ImmutableSet.of()); BlazeDirectories directories = new BlazeDirectories( - rootDirectory, outputBase, rootDirectory, analysisMock.getProductName()); + new ServerDirectories(rootDirectory, outputBase), + rootDirectory, + analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index b11543eefd..a3fd71d508 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java @@ -31,6 +31,7 @@ import com.google.devtools.build.lib.actions.FilesetTraversalParams.PackageBound 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.util.AnalysisMock; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; @@ -90,7 +91,9 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe new AtomicReference<>(ImmutableSet.of()); BlazeDirectories directories = new BlazeDirectories( - rootDirectory, outputBase, rootDirectory, analysisMock.getProductName()); + new ServerDirectories(rootDirectory, outputBase), + rootDirectory, + analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories); 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 pkgLocator = new AtomicReference<>(new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); AtomicReference 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, diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java index 0ca75c3931..46616f6131 100644 --- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnActionContext; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.events.PrintingEventHandler; import com.google.devtools.build.lib.events.Reporter; @@ -106,7 +107,8 @@ public class StandaloneSpawnStrategyTest { outputBase.createDirectory(); BlazeDirectories directories = - new BlazeDirectories(outputBase, outputBase, workspaceDir, "mock-product-name"); + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), workspaceDir, "mock-product-name"); // This call implicitly symlinks the integration bin tools into the exec root. IntegrationMock.get().getIntegrationBinTools(directories, TestConstants.WORKSPACE_NAME); OptionsParser optionsParser = OptionsParser.newOptionsParser(ExecutionOptions.class); -- cgit v1.2.3