Prefix startup dots with "Connecting to local Bazel server..." message.
RELNOTES: None.
PiperOrigin-RevId: 188744724
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 0b6ec47..b495e7b 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -833,6 +833,10 @@
BlazeServerStartup *server_startup;
server_pid = StartServer(workspace_layout, &server_startup);
+ fprintf(stderr, "Starting local %s server and connecting to it...",
+ globals->options->product_name.c_str());
+ fflush(stderr);
+
// Give the server two minutes to start up. That's enough to connect with a
// debugger.
auto try_until_time(std::chrono::system_clock::now() +
@@ -842,10 +846,8 @@
auto next_attempt_time(std::chrono::system_clock::now() +
std::chrono::milliseconds(100));
if (server->Connect()) {
- if (had_to_wait && !globals->options->client_debug) {
- fputc('\n', stderr);
- fflush(stderr);
- }
+ fputc('\n', stderr);
+ fflush(stderr);
delete server_startup;
return;
}
diff --git a/src/test/shell/integration/bazel_command_log_test.sh b/src/test/shell/integration/bazel_command_log_test.sh
index 1955908..ca7a08d 100755
--- a/src/test/shell/integration/bazel_command_log_test.sh
+++ b/src/test/shell/integration/bazel_command_log_test.sh
@@ -32,16 +32,15 @@
# different sandbox_root result in different startup options
clean_log=$(\
- sed\
- -e '/^Sending SIGTERM to previous B(l)?aze(l)? server/d'\
- -e "/^INFO: Reading 'startup' options from /d"\
- -e '/^INFO: $TEST_TMPDIR defined: output root default is/d'\
- -e '/^OpenJDK 64-Bit Server VM warning: ignoring option UseSeparateVSpacesInYoungGen; support was removed in 8.0/d'\
- -e '/^Extracting B(l)?aze(l)? installation\.\.\.$/d'\
- -e '/Waiting for response from B(l)?aze(l)? server/d'\
- -e '/^\.*$/d'\
- -e '/^Killed non-responsive server process/d'\
- -e '/server needs to be killed, because the startup options are different/d'\
+ sed \
+ -e "/^INFO: Reading 'startup' options from /d" \
+ -e '/^INFO: \$TEST_TMPDIR defined: output root default is/d' \
+ -e '/^OpenJDK 64-Bit Server VM warning: ignoring option UseSeparateVSpacesInYoungGen; support was removed in 8.0/d' \
+ -e '/^Starting local Bazel server and connecting to it\.\.\.\.*$/d' \
+ -e '/^Starting local Blaze server and connecting to it\.\.\.\.*$/d' \
+ -e '/^Killed non-responsive server process/d' \
+ -e '/server needs to be killed, because the startup options are different/d' \
+ -e '/^WARNING: Waiting for server process to terminate (waited 5 seconds, waiting at most 60)$/d' \
$TEST_log)
echo "$clean_log" > $TEST_log
