Skip to content

Commit

Permalink
review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jtattermusch committed Sep 22, 2023
1 parent af651d8 commit b8a99c3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tools/bazelify_tests/grpc_run_bazel_distribtest_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ REPORT_SUITE_NAME="$(echo ${TEST_TARGET} | sed 's|^.*[:/]||')"
tar -xopf ${ARCHIVE_WITH_SUBMODULES}
cd grpc

# Remove the override the "do not detect toolchain" setting that was set
# by the from .bazelrc configuration for the remote build.
# Override the "do not detect toolchain" setting that was set
# by the .bazelrc configuration for the remote build.
# TODO(jtattermusch): find a better solution to avoid breaking toolchain detection.
export BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=0

Expand Down
4 changes: 2 additions & 2 deletions tools/bazelify_tests/grpc_run_simple_command_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ shift
tar -xopf ${ARCHIVE_WITH_SUBMODULES}
cd grpc

# Remove the override the "do not detect toolchain" setting that was set
# by the from .bazelrc configuration for the remote build.
# Override the "do not detect toolchain" setting that was set
# by the .bazelrc configuration for the remote build.
# TODO(jtattermusch): find a better solution to avoid breaking toolchain detection.
export BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

set -ex

# Test that builds that need xDS do not build with --define=grpc_no_xds=true
# Ensure that tests that require XDS do not build with --define=grpc_no_xds=true
EXIT_CODE=0
bazel build //test/cpp/end2end/xds:xds_end2end_test --define=grpc_no_xds=true || EXIT_CODE=$?
if [ $EXIT_CODE -eq 0 ]; then
echo "Building xds_end2end_test succeeded even with --define=grpc_no_xds=true"
echo "FAILED: Building xds_end2end_test succeeded even with --define=grpc_no_xds=true"
exit 1
fi

0 comments on commit b8a99c3

Please sign in to comment.