diff options
Diffstat (limited to 'src/test/shell')
| -rwxr-xr-x | src/test/shell/integration/bazel_command_log_test.sh | 1 | ||||
| -rwxr-xr-x | src/test/shell/integration/client_test.sh | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/test/shell/integration/bazel_command_log_test.sh b/src/test/shell/integration/bazel_command_log_test.sh index ca7a08da71..0730056a22 100755 --- a/src/test/shell/integration/bazel_command_log_test.sh +++ b/src/test/shell/integration/bazel_command_log_test.sh @@ -38,6 +38,7 @@ function strip_lines_from_bazel_cc() { -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 '/^\.*$/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' \ diff --git a/src/test/shell/integration/client_test.sh b/src/test/shell/integration/client_test.sh index 0fddd39f0f..24b04255ed 100755 --- a/src/test/shell/integration/client_test.sh +++ b/src/test/shell/integration/client_test.sh @@ -30,15 +30,15 @@ function tear_down() { function test_client_debug() { # Test that --client_debug sends log statements to stderr. bazel --client_debug version >&$TEST_log || fail "'bazel version' failed" - expect_log "Debug logging active" + expect_log "Debug logging requested" bazel --client_debug --batch version >&$TEST_log || fail "'bazel version' failed" - expect_log "Debug logging active" + expect_log "Debug logging requested" # Test that --client_debug is off by default. bazel version >&$TEST_log || fail "'bazel version' failed" - expect_not_log "Debug logging active" + expect_not_log "Debug logging requested" bazel --batch version >&$TEST_log || fail "'bazel version' failed" - expect_not_log "Debug logging active" + expect_not_log "Debug logging requested" } function test_client_debug_change_does_not_restart_server() { |