diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-31 11:08:13 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-31 11:08:13 -0700 |
| commit | 31efd7e864fd11711c3335b9897dbab4ad1ecfae (patch) | |
| tree | 890deeb2bf3dffe116ae167187873fcc8d1efe7d /tools/distrib | |
| parent | 64a12c55dfe4bdbdb65b2c508a06f4335f100a98 (diff) | |
| parent | 2b9012362ca03181eefaec22238c6100e77bb736 (diff) | |
Merge github.com:grpc/grpc into copyright-fix
Diffstat (limited to 'tools/distrib')
| -rwxr-xr-x | tools/distrib/check_include_guards.py | 2 | ||||
| -rwxr-xr-x | tools/distrib/check_nanopb_output.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/distrib/check_include_guards.py b/tools/distrib/check_include_guards.py index 463e316885..6406fe6ae7 100755 --- a/tools/distrib/check_include_guards.py +++ b/tools/distrib/check_include_guards.py @@ -167,7 +167,7 @@ argp.add_argument('--precommit', args = argp.parse_args() KNOWN_BAD = set([ - 'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h', + 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h', ]) diff --git a/tools/distrib/check_nanopb_output.sh b/tools/distrib/check_nanopb_output.sh index 85da9315be..4f68e4c596 100755 --- a/tools/distrib/check_nanopb_output.sh +++ b/tools/distrib/check_nanopb_output.sh @@ -60,7 +60,7 @@ PATH="$PROTOC_PATH:$PATH" ./tools/codegen/core/gen_load_balancing_proto.sh \ $NANOPB_TMP_OUTPUT # compare outputs to checked compiled code -if ! diff -r $NANOPB_TMP_OUTPUT src/core/lib/proto/grpc/lb/v0; then - echo "Outputs differ: $NANOPB_TMP_OUTPUT vs src/core/lib/proto/grpc/lb/v0" +if ! diff -r $NANOPB_TMP_OUTPUT src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0; then + echo "Outputs differ: $NANOPB_TMP_OUTPUT vs src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0" exit 2 fi |