diff options
| author |  Yue Gan <yueg@google.com> | 2016-09-14 11:39:35 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-09-14 11:42:26 +0000 |
| commit | 3617a54ae64fb5ca5a8ed7782c5d3f0c4b57140b (patch) | |
| tree | bf360e18ba6ba26ab35140fecda46bfc9cb0bdca /src/test | |
| parent | 15e5cdc3e4e1c931673427e1be216eee633eda57 (diff) | |
fix test for Darwin
--
MOS_MIGRATED_REVID=133113385
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/shell/integration/bazel_command_log_test.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/shell/integration/bazel_command_log_test.sh b/src/test/shell/integration/bazel_command_log_test.sh index a94d6b39f6..431c648842 100755 --- a/src/test/shell/integration/bazel_command_log_test.sh +++ b/src/test/shell/integration/bazel_command_log_test.sh @@ -32,6 +32,8 @@ function tear_down() { function strip_lines_from_bazel_cc() { # sed can't redirect back to its input file (it'll only generate an empty # file). In newer versions of gnu sed there is a -i option to edit in place. + + # different sandbox_root result in different startup options clean_log=$(\ sed\ -e '/^Sending SIGTERM to previous B(l)?aze(l)? server/d'\ @@ -41,6 +43,8 @@ function strip_lines_from_bazel_cc() { -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'\ $TEST_log) echo "$clean_log" > $TEST_log @@ -69,8 +73,6 @@ function test_batch_mode_with_logging_flag() { # strip extra lines printed by bazel.cc strip_lines_from_bazel_cc - # different sandbox_root result in different startup options - sed -i "/server needs to be killed, because the startup options are different/d" $TEST_log # compare $TEST_log with command.log assert_equals "" "$(diff $TEST_log $log 2>&1)" |