diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-01-19 16:33:30 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-01-19 16:33:30 -0800 |
| commit | e02cbebd025d94033994abab136ed980c3213d95 (patch) | |
| tree | 01920e20a91613ff51bc3162e2df4ee0f2e3106f /tools/run_tests/sanity | |
| parent | 2ef172b15bfb52bd90a80de712be009a5f0a5b92 (diff) | |
| parent | fffb692d37867f040b2b7bb2e982d5137dfb123e (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'tools/run_tests/sanity')
| -rwxr-xr-x | tools/run_tests/sanity/check_submodules.sh | 2 | ||||
| -rw-r--r-- | tools/run_tests/sanity/sanity_tests.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index eabeb809d4..57887d949d 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -44,7 +44,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules 44c25c892a6229b20db7cd9dc05584ea865896de third_party/benchmark (v0.1.0-343-g44c25c8) c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9 third_party/boringssl (c880e42) 886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7) - 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) + f8a0efe03aa69b3336d8e228b37d4ccb17324b88 third_party/gflags (v2.2.0) c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0) a428e42072765993ff674fda72863c9f1aa2d268 third_party/protobuf (v3.1.0-alpha-1) bcad91771b7f0bff28a1cac1981d7ef2b9bcef3c third_party/thrift (bcad917) diff --git a/tools/run_tests/sanity/sanity_tests.yaml b/tools/run_tests/sanity/sanity_tests.yaml index f29b700572..ce41da802d 100644 --- a/tools/run_tests/sanity/sanity_tests.yaml +++ b/tools/run_tests/sanity/sanity_tests.yaml @@ -12,6 +12,6 @@ - script: tools/distrib/check_trailing_newlines.sh - script: tools/distrib/check_nanopb_output.sh - script: tools/distrib/check_include_guards.py -- script: tools/distrib/pyformat_code.sh +- script: tools/distrib/yapf_code.sh - script: tools/distrib/python/check_grpcio_tools.py |