diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java index 643ee3591b9b5b..65f487cbd739e8 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java @@ -42,7 +42,7 @@ public abstract class ActionOwner { /* label= */ null, Location.BUILTIN, /* targetKind= */ "empty target kind", - /* mnemonic= */ "system", + /* buildConfigurationMnemonic= */ "system", /* configurationChecksum= */ "system", /* buildConfigurationEvent= */ null, /* isToolConfiguration= */ false, @@ -78,7 +78,7 @@ public static ActionOwner createDummy( @Nullable Label label, Location location, String targetKind, - String mnemonic, + String buildConfigurationMnemonic, String configurationChecksum, @Nullable BuildConfigurationEvent buildConfigurationEvent, boolean isToolConfiguration, @@ -90,7 +90,10 @@ public static ActionOwner createDummy( location, targetKind, BuildConfigurationInfo.AutoBuildConfigurationInfo.create( - mnemonic, configurationChecksum, buildConfigurationEvent, isToolConfiguration), + buildConfigurationMnemonic, + configurationChecksum, + buildConfigurationEvent, + isToolConfiguration), executionPlatform, aspectDescriptors, execProperties); @@ -112,7 +115,7 @@ public static ActionOwner createDummy( public abstract BuildConfigurationInfo getBuildConfigurationInfo(); /** Returns the mnemonic for the configuration for this {@link ActionOwner}. */ - public final String getMnemonic() { + public final String getBuildConfigurationMnemonic() { return getBuildConfigurationInfo().getMnemonic(); } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java b/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java index 45e0fe26b574a3..e2d55004a5fdde 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java @@ -527,7 +527,8 @@ void actionStarted(ActionStartedEvent event) { getActionState(action, actionId, event.getNanoTimeStart()); - if (action.getOwner() != null && action.getOwner().getMnemonic().equals("TestRunner")) { + if (action.getOwner() != null + && action.getOwner().getBuildConfigurationMnemonic().equals("TestRunner")) { Label owner = action.getOwner().getLabel(); if (owner != null) { Set testActionsForOwner = testActions.get(owner); @@ -601,7 +602,8 @@ void actionCompletion(ActionCompletionEvent event) { checkNotNull(activeActions.remove(actionId), "%s not active after %s", actionId, event); - if (action.getOwner() != null && action.getOwner().getMnemonic().equals("TestRunner")) { + if (action.getOwner() != null + && action.getOwner().getBuildConfigurationMnemonic().equals("TestRunner")) { Label owner = action.getOwner().getLabel(); if (owner != null) { Set testActionsForOwner = testActions.get(owner); @@ -748,7 +750,8 @@ private String describeActionProgress(ActionState action, int desiredWidth) { protected String describeAction( ActionState actionState, long nanoTime, int desiredWidth, Set toSkip) { ActionExecutionMetadata action = actionState.action; - if (action.getOwner() != null && action.getOwner().getMnemonic().equals("TestRunner")) { + if (action.getOwner() != null + && action.getOwner().getBuildConfigurationMnemonic().equals("TestRunner")) { Label owner = action.getOwner().getLabel(); if (owner != null) { Set allRelatedActions = testActions.get(owner);