aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar ruperts <ruperts@google.com>2018-03-12 10:48:36 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-03-12 10:50:28 -0700
commit5f8c94a8828d47347ea706d6f947c572d3f6a866 (patch)
tree61f4816fff99abdd929a083e7e3c7be2bb80795f /src/test
parent4d7342bc701dc845f3046b005818d727dc6dd247 (diff)
Prefix startup dots with "Connecting to local Bazel server..." message.
RELNOTES: None. PiperOrigin-RevId: 188744724
Diffstat (limited to 'src/test')
-rwxr-xr-xsrc/test/shell/integration/bazel_command_log_test.sh19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/test/shell/integration/bazel_command_log_test.sh b/src/test/shell/integration/bazel_command_log_test.sh
index 195590857e..ca7a08da71 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 @@ function strip_lines_from_bazel_cc() {
# 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