diff options
| author |  Austin Anderson <angerson@google.com> | 2018-09-10 16:22:20 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-10 16:26:57 -0700 |
| commit | 5b853d4b2ca622fb038733e435d964c8f5b78edd (patch) | |
| tree | eff55cd75be7cc70d1da6aa6bf6afc99efe3b897 /tensorflow/tools | |
| parent | 7b8ffbe4c1da2c53551645fd023df577c43fa16c (diff) | |
Replace global starter flags with call-specific flags
The earlier version of convenient default flags mistakenly applied --build_tests_only to normal "bazel build" calls, which broke pip.sh (and probably invalidated some other things). This resolves that problem by setting flags specific to "test" and "build" commands.
PiperOrigin-RevId: 212355193
Diffstat (limited to 'tensorflow/tools')
| -rwxr-xr-x | tensorflow/tools/ci_build/ci_parameterized_build.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tensorflow/tools/ci_build/ci_parameterized_build.sh b/tensorflow/tools/ci_build/ci_parameterized_build.sh index c8472102cb..cc09784c1d 100755 --- a/tensorflow/tools/ci_build/ci_parameterized_build.sh +++ b/tensorflow/tools/ci_build/ci_parameterized_build.sh @@ -127,17 +127,19 @@ NO_DOCKER_OPT_FLAG="--genrule_strategy=standalone" DO_DOCKER=1 -BAZEL_CMD="bazel test" -BAZEL_BUILD_ONLY_CMD="bazel build" -BAZEL_CLEAN_CMD="bazel clean" -# Default flags: +# Helpful flags: # --test_summary=detailed: Tell us more about which targets are being built # --keep_going: Don't stop at the first failure; tell us all the failures # --build_tests_only: Don't build targets depended on by tests if the test is # disabled. Also saves some compilation time. Otherwise, # tries to build everything. -DEFAULT_BAZEL_CONFIGS="--test_summary=detailed --build_tests_only --keep_going" +BAZEL_TEST_FLAGS="--test_summary=detailed --build_tests_only --keep_going" +BAZEL_BUILD_FLAGS="--keep_going" + +BAZEL_CMD="bazel test ${BAZEL_TEST_FLAGS}" +BAZEL_BUILD_ONLY_CMD="bazel build ${BAZEL_BUILD_FLAGS}" +BAZEL_CLEAN_CMD="bazel clean" PIP_CMD="${CI_BUILD_DIR}/builds/pip.sh" PIP_TEST_TUTORIALS_FLAG="--test_tutorials" @@ -393,7 +395,7 @@ fi EXTRA_ARGS="${EXTRA_ARGS} --distinct_host_configuration=false" if [[ ! -z "${TF_BAZEL_BUILD_ONLY}" ]] && - [[ "${TF_BAZEL_BUILD_ONLY}" != "0" ]];then + [[ "${TF_BAZEL_BUILD_ONLY}" != "0" ]];then BAZEL_CMD=${BAZEL_BUILD_ONLY_CMD} fi |