diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java | 12 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java index af48c30e64..97e42840cb 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java +++ b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.devtools.build.skyframe; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.collect.nestedset.NestedSet; @@ -126,8 +127,15 @@ public class ErrorInfo { @Override public String toString() { - return String.format("<ErrorInfo exception=%s rootCauses=%s cycles=%s>", - exception, rootCauses, cycles); + return MoreObjects.toStringHelper(this) + .add("exception", exception) + .add("rootCauses", rootCauses) + .add("cycles", cycles) + .add("isCatastrophic", isCatastrophic) + .add("rootCauseOfException", rootCauseOfException) + .add("isDirectlyTransient", isDirectlyTransient) + .add("isTransitivelyTransient", isTransitivelyTransient) + .toString(); } /** diff --git a/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java b/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java index c6123769aa..632f23d13f 100644 --- a/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java +++ b/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java @@ -27,7 +27,7 @@ import javax.annotation.Nullable; * batch requests ordered alphabetically by sky key string representation. */ public class DeterministicHelper extends NotifyingHelper { - static final MemoizingEvaluator.GraphTransformerForTesting MAKE_DETERMINISTIC = + public static final MemoizingEvaluator.GraphTransformerForTesting MAKE_DETERMINISTIC = makeTransformer(Listener.NULL_LISTENER, /*deterministic=*/ true); public static MemoizingEvaluator.GraphTransformerForTesting makeTransformer( |