diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
6 files changed, 29 insertions, 14 deletions
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() |