diff options
| author |  jingwen <jingwen@google.com> | 2018-07-09 07:42:16 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-09 07:43:43 -0700 |
| commit | ee62862c3dd52634ac5ec722b98b8a0c994e7155 (patch) | |
| tree | 7af1711f8e877fb7cf942bbab80097758a36b44f /src/test/shell | |
| parent | 6fd4e0edd4de22dec9eda13dc0b29214f2ca117e (diff) | |
Sync jmmv@'s table styles for the docs.bazel.build site.
Sources:
https://github.com/bazelbuild/bazel-blog/commit/846478d6943162f4c4d7d50001069e0ca7b2ec28
https://github.com/bazelbuild/bazel-blog/commit/aacaa25314678c08772372b3d46697f7963bb201
RELNOTES: None.
PiperOrigin-RevId: 203763253
Diffstat (limited to 'src/test/shell')
| -rwxr-xr-x | src/test/shell/integration/bazel_command_log_test.sh | 18 | ||||
| -rwxr-xr-x | src/test/shell/testenv.sh | 2 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/test/shell/integration/bazel_command_log_test.sh b/src/test/shell/integration/bazel_command_log_test.sh index 3e7443c353..91294daa89 100755 --- a/src/test/shell/integration/bazel_command_log_test.sh +++ b/src/test/shell/integration/bazel_command_log_test.sh @@ -46,29 +46,12 @@ function strip_lines_from_bazel_cc() { echo "$clean_log" > $TEST_log } -function strip_protobuf_unsafe_warning() { - # TODO: Protobuf triggers illegal reflective access warning in JDK 9. - # Remove this workaround when protobuf fixes this. - # See https://github.com/google/protobuf/issues/3781 - clean_log=$(\ - sed \ - -e "/^WARNING: An illegal reflective access operation has occurred/d" \ - -e "/^WARNING: Illegal reflective access by com\.google\.protobuf\.UnsafeUtil /d" \ - -e "/^WARNING: Please consider reporting this to the maintainers of com\.google\.protobuf\.UnsafeUtil/d" \ - -e "/^WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations/d" \ - -e "/^WARNING: All illegal access operations will be denied in a future release/d" \ - $TEST_log) - - echo "$clean_log" > $TEST_log -} - function test_batch_mode() { # capture stdout/stderr in $TEST_log bazel --batch info >&$TEST_log || fail "Expected success" # strip extra lines printed by bazel.cc strip_lines_from_bazel_cc - strip_protobuf_unsafe_warning # compare $TEST_log with command.log assert_equals "" "$(diff $TEST_log $log 2>&1)" @@ -85,7 +68,6 @@ function test_batch_mode_with_logging_flag() { # strip extra lines printed by bazel.cc strip_lines_from_bazel_cc - strip_protobuf_unsafe_warning # compare $TEST_log with command.log assert_equals "" "$(diff $TEST_log $log 2>&1)" diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index c4a0c5599d..b2f6e24147 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -115,7 +115,7 @@ if [ "${MACHINE_TYPE}" = 's390x' ]; then fi # Requires //third_party/protobuf:protoc -protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/3.6.0/protoc" +protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/3.4.0/protoc" if [ -z ${RUNFILES_MANIFEST_ONLY+x} ]; then junit_jar="${BAZEL_RUNFILES}/third_party/junit/junit-*.jar" |