Error out if loading phase error encountered even if we skip analysis. Also change error messages in these cases to not assume there was an execution phase.

--
MOS_MIGRATED_REVID=129723717

1 files changed, 1 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 8d45c93362..b1539f8766 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -1022,7 +1022,7 @@ public class BuildViewTest extends BuildViewTestBase {
     AnalysisResult result = update(defaultFlags().with(Flag.KEEP_GOING), "//a", "//b");
     assertThat(result.hasError()).isTrue();
     assertThat(result.getError())
-        .contains("execution phase succeeded, but there were loading phase errors");
+        .contains("command succeeded, but there were loading phase errors");
   }
 
   @Test