diff options
| author |  Mark D. Roth <roth@google.com> | 2018-09-25 11:42:57 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-09-25 11:42:57 -0700 |
| commit | be1ce0c4ccbf17ebeee9b7b057d40ff4e12f3479 (patch) | |
| tree | f28e90b490cfea5b79d77f6f3a3183c0bb86af36 /tools/distrib | |
| parent | ccbad108e45afb7c4fb361202cc0bae5ad7e5da2 (diff) | |
Revert "Merge pull request #16600 from grpc/revert-16574-health_checking_service"
This reverts commit de11358660b6474ffea480d8d756c23e58a7cf07, reversing
changes made to 107d10ea73f77dc9bb498c9b91e1fcd0188dfb45.
Diffstat (limited to 'tools/distrib')
| -rwxr-xr-x | tools/distrib/check_nanopb_output.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tools/distrib/check_nanopb_output.sh b/tools/distrib/check_nanopb_output.sh index 6b98619c32..1c2ef9b768 100755 --- a/tools/distrib/check_nanopb_output.sh +++ b/tools/distrib/check_nanopb_output.sh @@ -16,6 +16,7 @@ set -ex readonly NANOPB_ALTS_TMP_OUTPUT="$(mktemp -d)" +readonly NANOPB_HEALTH_TMP_OUTPUT="$(mktemp -d)" readonly NANOPB_TMP_OUTPUT="$(mktemp -d)" readonly PROTOBUF_INSTALL_PREFIX="$(mktemp -d)" @@ -68,6 +69,23 @@ if ! diff -r "$NANOPB_TMP_OUTPUT" src/core/ext/filters/client_channel/lb_policy/ fi # +# checks for health.proto +# +readonly HEALTH_GRPC_OUTPUT_PATH='src/cpp/server/health' +# nanopb-compile the proto to a temp location +./tools/codegen/core/gen_nano_proto.sh \ + src/proto/grpc/health/v1/health.proto \ + "$NANOPB_HEALTH_TMP_OUTPUT" \ + "$HEALTH_GRPC_OUTPUT_PATH" +# compare outputs to checked compiled code +for NANOPB_OUTPUT_FILE in $NANOPB_HEALTH_TMP_OUTPUT/*.pb.*; do + if ! diff "$NANOPB_OUTPUT_FILE" "src/cpp/server/health/$(basename $NANOPB_OUTPUT_FILE)"; then + echo "Outputs differ: $NANOPB_HEALTH_TMP_OUTPUT vs $HEALTH_GRPC_OUTPUT_PATH" + exit 2 + fi +done + +# # Checks for handshaker.proto and transport_security_common.proto # readonly HANDSHAKER_GRPC_OUTPUT_PATH='src/core/tsi/alts/handshaker' |