diff options
author | ccalvarin <ccalvarin@google.com> | 2017-08-14 21:09:07 +0200 |
---|---|---|
committer | Irina Iancu <elenairina@google.com> | 2017-08-16 11:04:41 +0200 |
commit | 1cbe62a09b37f2db76e11ebb18fb46616076ef87 (patch) | |
tree | f02a66fc345507f3eb3ab3bbe404fdcb161cbabc /src/test/shell/integration/loading_phase_tests.sh | |
parent | fc6412ca67a9d98c1b6b0c8b237c119e543bc266 (diff) |
Send Bazel startup options to server.
Send the startup options tagged with their origin so that the server has correct information about the command line as the client received it.
Removes the unconditional stderr printing of all bazelrc startup options in the bazel client. Instead, the startup options are sent to the server and the same informational printing is gated on the --announce_rc option. This avoids unconditional log spam to stderr early in startup. If the server is unreachable or there are errors parsing startup options, the message is still printed to stderr.
Fixes https://github.com/bazelbuild/bazel/issues/2530.
RELNOTES: --announce_rc now controls whether bazelrc startup options are printed to stderr.
PiperOrigin-RevId: 165211007
Diffstat (limited to 'src/test/shell/integration/loading_phase_tests.sh')
-rwxr-xr-x | src/test/shell/integration/loading_phase_tests.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/shell/integration/loading_phase_tests.sh b/src/test/shell/integration/loading_phase_tests.sh index 5c13b8fb18..33d3539b56 100755 --- a/src/test/shell/integration/loading_phase_tests.sh +++ b/src/test/shell/integration/loading_phase_tests.sh @@ -110,13 +110,14 @@ function test_bazelrc_option() { cp ${bazelrc} ${new_workspace_dir}/.${PRODUCT_NAME}rc echo "build --cpu=armeabi-v7a" >>.${PRODUCT_NAME}rc # default bazelrc - $PATH_TO_BAZEL_BIN info >/dev/null 2>$TEST_log + $PATH_TO_BAZEL_BIN info --announce_rc >/dev/null 2>$TEST_log expect_log "Reading.*$(pwd)/.${PRODUCT_NAME}rc: .*--cpu=armeabi-v7a" cp .${PRODUCT_NAME}rc foo echo "build --cpu=armeabi-v7a" >>foo # non-default bazelrc - $PATH_TO_BAZEL_BIN --${PRODUCT_NAME}rc=foo info >/dev/null 2>$TEST_log + $PATH_TO_BAZEL_BIN --${PRODUCT_NAME}rc=foo info --announce_rc >/dev/null \ + 2>$TEST_log expect_log "Reading.*$(pwd)/foo: .*--cpu=armeabi-v7a" } |