From 8cb36d6bee170da857df3e50e72c8dcfceb5b7ff Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Fri, 26 Aug 2016 16:14:37 +0000 Subject: Remove all references to (incorrect) BlazeDirectories.buildDataDirectory root The buildDataDirectory is calculated off of the incorrect execroot. More progress towards #1681. -- MOS_MIGRATED_REVID=131407798 --- .../google/devtools/build/lib/analysis/util/AnalysisTestUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java index d046a234d0..664a516101 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java @@ -286,13 +286,14 @@ public final class AnalysisTestUtil { @Override public WorkspaceStatusAction createWorkspaceStatusAction( - ArtifactFactory artifactFactory, ArtifactOwner artifactOwner, Supplier buildId) { + ArtifactFactory artifactFactory, ArtifactOwner artifactOwner, Supplier buildId, + String workspaceName) { Artifact stableStatus = artifactFactory.getDerivedArtifact( new PathFragment("build-info.txt"), - directories.getBuildDataDirectory(), artifactOwner); + directories.getBuildDataDirectory(workspaceName), artifactOwner); Artifact volatileStatus = artifactFactory.getConstantMetadataArtifact( new PathFragment("build-changelist.txt"), - directories.getBuildDataDirectory(), artifactOwner); + directories.getBuildDataDirectory(workspaceName), artifactOwner); return new DummyWorkspaceStatusAction(key, stableStatus, volatileStatus); } -- cgit v1.2.3