Make client-provided options an rc source

The client provides information about whether the terminal is a tty, and
which width the output should be formatted for. Passing this information
as explicit command-line arguments has the disadvantage that it overrides
any setting in configuration files. While usually there is no one-size-fits-all
value for terminal width, it doesn't make sense either to have an option
where the user cannot set a default. Fix this by providing the client options
as least imported rc-source.

This is a roll-forward of commit 044adedc70de040475443e52eb1a3c692159790e

--
MOS_MIGRATED_REVID=120338148

1 files changed, 82 insertions, 0 deletions

diff --git a/src/test/shell/integration/rc_options_test.sh b/src/test/shell/integration/rc_options_test.sh
new file mode 100755
index 0000000000..e34914175d
--- /dev/null
+++ b/src/test/shell/integration/rc_options_test.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# Copyright 2016 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# An end-to-end test for Bazel's option handling
+
+# Load test environment
+source $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/testenv.sh \
+  || { echo "testenv.sh not found!" >&2; exit 1; }
+
+create_and_cd_client
+put_bazel_on_path
+write_default_bazelrc
+
+#### SETUP #############################################################
+
+set -e
+
+function set_up() {
+  mkdir -p pkg
+  # have test with a long name, to be able to test line breaking in the output
+  cat > pkg/xxxxxxxxxxxxxxxxxxxxxxxxxtrue.sh <<EOF
+#!/bin/sh
+exit 0
+EOF
+  chmod 755 pkg/xxxxxxxxxxxxxxxxxxxxxxxxxtrue.sh
+  cat > pkg/BUILD <<EOF
+sh_test(
+  name = "xxxxxxxxxxxxxxxxxxxxxxxxxtrue",
+  srcs = ["xxxxxxxxxxxxxxxxxxxxxxxxxtrue.sh"],
+)
+EOF
+}
+
+#### TESTS #############################################################
+
+function test_terminal_columns_honored() {
+  setup_bazelrc
+  cat >>$TEST_TMPDIR/bazelrc <<EOF
+build --terminal_columns=6
+EOF
+  bazel test --curses=yes --color=yes pkg:xxxxxxxxxxxxxxxxxxxxxxxxxtrue \
+      2>$TEST_log || fail "bazel test failed"
+  # the lines are wrapped to 6 characters
+  expect_log '^xxxx'
+  expect_not_log '^xxxxxxx'
+}
+
+function test_options_override() {
+  setup_bazelrc
+  cat >>$TEST_TMPDIR/bazelrc <<EOF
+build --terminal_columns=6
+EOF
+  bazel test --curses=yes --color=yes --terminal_columns=10 \
+      pkg:xxxxxxxxxxxxxxxxxxxxxxxxxtrue 2>$TEST_log || fail "bazel test failed"
+  # the lines are wrapped to 10 characters
+  expect_log '^xxxxxxxx'
+  expect_not_log '^xxxxxxxxxxx'
+}
+
+function test_terminal_columns_default() {
+  setup_bazelrc
+  bazel test --curses=yes --color=yes pkg:xxxxxxxxxxxxxxxxxxxxxxxxxtrue \
+      2>$TEST_log || fail "bazel test failed"
+  # default terminal columns should be large enough to not wrap
+  # this short example
+  expect_not_log '^xxx'
+}
+
+run_suite "Integration tests for rc options handling"