diff options
| author |  janakr <janakr@google.com> | 2018-06-22 10:34:52 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-22 10:36:54 -0700 |
| commit | f017ec33cfc57817826f5f615afcf100834dd5cd (patch) | |
| tree | 4ad3cec5c6f290f1110c870a81a8154d736ea27b /src/main/java/com/google/devtools/build/lib | |
| parent | 39a0a38f1364b5e4056632c731df4b3fe64c13bb (diff) | |
Add some debugging info to ArtifactFactory, and allow tests to access the ArtifactResolverSupplier in SkyframeExecutor.
PiperOrigin-RevId: 201705857
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java | 6 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java b/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java index 11b2992f6e..dad4779b81 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java @@ -171,7 +171,11 @@ public class ArtifactFactory implements ArtifactResolver { sourceArtifactRoots, "Not initialized for %s %s %s", execPath, root, owner); return getArtifact( Preconditions.checkNotNull( - sourceArtifactRoots.get(root), "%s has no ArtifactRoot (%s)", root, execPath), + sourceArtifactRoots.get(root), + "%s has no ArtifactRoot (%s) in %s", + root, + execPath, + sourceArtifactRoots), execPath, owner, null); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index fc95c3b39d..1dc33282fb 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -810,6 +810,11 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { } @VisibleForTesting + public ArtifactResolverSupplier getArtifactResolverSupplierForTesting() { + return artifactFactory; + } + + @VisibleForTesting @Nullable public WorkspaceStatusAction getLastWorkspaceStatusAction() throws InterruptedException { WorkspaceStatusValue workspaceStatusValue = |