diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-08-26 16:14:37 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-08-26 18:42:42 +0000 |
| commit | 8cb36d6bee170da857df3e50e72c8dcfceb5b7ff (patch) | |
| tree | 9c9310435370714bd3be073cc6317d93883e2e23 /src/test/java/com | |
| parent | 4c10f3f86f7a0530e83d4b2062b48676afafe2c0 (diff) | |
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
Diffstat (limited to 'src/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java | 7 |
1 files changed, 4 insertions, 3 deletions
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<UUID> buildId) { + ArtifactFactory artifactFactory, ArtifactOwner artifactOwner, Supplier<UUID> 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); } |