Merge pull request #5380 from dgquintas/fix_nanopb_gens

cleanup gens/ directory after nanopb check

src/core/proto/grpc/lb/v0/load_balancer.pb.c

@@ -31,7 +31,7 @@
  *
  */
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.4-dev */
+/* Generated by nanopb-0.3.5-dev */
 
 #include "src/core/proto/grpc/lb/v0/load_balancer.pb.h"
 

src/core/proto/grpc/lb/v0/load_balancer.pb.h

@@ -31,7 +31,7 @@
  *
  */
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.4-dev */
+/* Generated by nanopb-0.3.5-dev */
 
 #ifndef PB_LOAD_BALANCER_PB_H_INCLUDED
 #define PB_LOAD_BALANCER_PB_H_INCLUDED
@@ -44,7 +44,6 @@
 extern "C" {
 #endif
 
-/* Enum definitions */
 /* Struct definitions */
 typedef struct _grpc_lb_v0_ClientStats {
     bool has_total_requests;
@@ -164,6 +163,7 @@ extern const pb_field_t grpc_lb_v0_Server_fields[5];
 #define grpc_lb_v0_LoadBalanceRequest_size       169
 #define grpc_lb_v0_InitialLoadBalanceRequest_size 131
 #define grpc_lb_v0_ClientStats_size              33
+#define grpc_lb_v0_LoadBalanceResponse_size      (165 + grpc_lb_v0_ServerList_size)
 #define grpc_lb_v0_InitialLoadBalanceResponse_size 156
 #define grpc_lb_v0_Server_size                   127
 

nanopb @ f8ac4637

-Subproject commit 5497a1dfc91a86965383cdd1652e348345400435
+Subproject commit f8ac463766281625ad710900479130c7fcb4d63b

tools/distrib/check_nanopb_output.sh

@@ -32,7 +32,7 @@ set -ex
 
 apt-get install -y autoconf automake libtool curl python-virtualenv
 
-readonly NANOPB_TMP_OUTPUT="${LOCAL_GIT_ROOT}/gens/src/proto/grpc/lb/v0"
+readonly NANOPB_TMP_OUTPUT="$(mktemp -d)"
 
 # install protoc version 3
 pushd third_party/protobuf
@@ -62,8 +62,7 @@ PATH="$PROTOC_PATH:$PATH" ./tools/codegen/core/gen_load_balancing_proto.sh \
   $NANOPB_TMP_OUTPUT
 
 # compare outputs to checked compiled code
-diff -rq $NANOPB_TMP_OUTPUT src/core/proto/grpc/lb/v0
-if [ $? != 0 ]; then
+if ! diff -r $NANOPB_TMP_OUTPUT src/core/proto/grpc/lb/v0; then
   echo "Outputs differ: $NANOPB_TMP_OUTPUT vs src/core/proto/grpc/lb/v0"
-  exit 1
+  exit 2
 fi

tools/run_tests/sanity/check_submodules.sh

@@ -44,7 +44,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
  9f897b25800d2f54f5c442ef01a60721aeca6d87 third_party/boringssl (version_for_cocoapods_1.0-67-g9f897b2)
  05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
  c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
- 5497a1dfc91a86965383cdd1652e348345400435 third_party/nanopb (nanopb-0.3.3-10-g5497a1d)
+ f8ac463766281625ad710900479130c7fcb4d63b third_party/nanopb (nanopb-0.3.4-29-gf8ac463)
  d5fb408ddc281ffcadeb08699e65bb694656d0bd third_party/protobuf (v3.0.0-beta-2)
  50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
 EOF