From 2ce76b33e36827ea265ce86fb5688ba23a70021b Mon Sep 17 00:00:00 2001 From: ncteisen Date: Thu, 7 Jun 2018 19:23:07 -0700 Subject: Enforce max function length at 800 --- tools/distrib/run_clang_tidy.py | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/distrib') diff --git a/tools/distrib/run_clang_tidy.py b/tools/distrib/run_clang_tidy.py index 337e6b43c8..3dbce0b2e6 100755 --- a/tools/distrib/run_clang_tidy.py +++ b/tools/distrib/run_clang_tidy.py @@ -28,6 +28,7 @@ GRPC_CHECKS = [ 'modernize-use-nullptr', 'google-build-namespaces', 'google-build-explicit-make-pair', + 'readability-function-size', ] extra_args = [ -- cgit v1.2.3 From eb2aa9cb3b47eb3d7980952844b32082c3e5e651 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Thu, 7 Jun 2018 21:25:53 -0700 Subject: Tighten the bar and refactor and offender: --- .clang-tidy | 6 ++++++ test/core/transport/status_conversion_test.cc | 25 +++++++++++++++++++------ tools/distrib/run_clang_tidy.py | 9 --------- 3 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 .clang-tidy (limited to 'tools/distrib') diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 0000000000..b8f74e973f --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,6 @@ +--- +Checks: 'modernize-use-nullptr,google-build-namespaces,google-build-explicit-make-pair,readability-function-size' +WarningsAsErrors: 'modernize-use-nullptr,google-build-namespaces,google-build-explicit-make-pair,readability-function-size' +CheckOptions: + - key: readability-function-size.StatementThreshold + value: '450' diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 1ed6ccfba6..f7b3c62a40 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -33,12 +33,7 @@ #define HTTP2_STATUS_TO_GRPC_STATUS(a, b) \ GPR_ASSERT(grpc_http2_status_to_grpc_status(a) == (b)) -int main(int argc, char** argv) { - int i; - - grpc_test_init(argc, argv); - grpc_init(); - +static void test_grpc_status_to_http2_error() { GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_OK, GRPC_HTTP2_NO_ERROR); GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_CANCELLED, GRPC_HTTP2_CANCEL); GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNKNOWN, GRPC_HTTP2_INTERNAL_ERROR); @@ -65,7 +60,9 @@ int main(int argc, char** argv) { GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNAVAILABLE, GRPC_HTTP2_REFUSED_STREAM); GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_DATA_LOSS, GRPC_HTTP2_INTERNAL_ERROR); +} +static void test_grpc_status_to_http2_status() { GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_OK, 200); GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_CANCELLED, 200); GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNKNOWN, 200); @@ -83,7 +80,9 @@ int main(int argc, char** argv) { GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_INTERNAL, 200); GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNAVAILABLE, 200); GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_DATA_LOSS, 200); +} +static void test_http2_error_to_grpc_status() { const grpc_millis before_deadline = GRPC_MILLIS_INF_FUTURE; HTTP2_ERROR_TO_GRPC_STATUS(GRPC_HTTP2_NO_ERROR, before_deadline, GRPC_STATUS_INTERNAL); @@ -144,7 +143,9 @@ int main(int argc, char** argv) { GRPC_STATUS_RESOURCE_EXHAUSTED); HTTP2_ERROR_TO_GRPC_STATUS(GRPC_HTTP2_INADEQUATE_SECURITY, after_deadline, GRPC_STATUS_PERMISSION_DENIED); +} +static void test_http2_status_to_grpc_status() { HTTP2_STATUS_TO_GRPC_STATUS(200, GRPC_STATUS_OK); HTTP2_STATUS_TO_GRPC_STATUS(400, GRPC_STATUS_INVALID_ARGUMENT); HTTP2_STATUS_TO_GRPC_STATUS(401, GRPC_STATUS_UNAUTHENTICATED); @@ -157,6 +158,18 @@ int main(int argc, char** argv) { HTTP2_STATUS_TO_GRPC_STATUS(500, GRPC_STATUS_UNKNOWN); HTTP2_STATUS_TO_GRPC_STATUS(503, GRPC_STATUS_UNAVAILABLE); HTTP2_STATUS_TO_GRPC_STATUS(504, GRPC_STATUS_DEADLINE_EXCEEDED); +} + +int main(int argc, char** argv) { + int i; + + grpc_test_init(argc, argv); + grpc_init(); + + test_grpc_status_to_http2_error(); + test_grpc_status_to_http2_status(); + test_http2_error_to_grpc_status(); + test_http2_status_to_grpc_status(); /* check all status values can be converted */ for (i = 0; i <= 999; i++) { diff --git a/tools/distrib/run_clang_tidy.py b/tools/distrib/run_clang_tidy.py index 3dbce0b2e6..7ad1c160ba 100755 --- a/tools/distrib/run_clang_tidy.py +++ b/tools/distrib/run_clang_tidy.py @@ -24,13 +24,6 @@ sys.path.append( os.path.dirname(sys.argv[0]), '..', 'run_tests', 'python_utils')) import jobset -GRPC_CHECKS = [ - 'modernize-use-nullptr', - 'google-build-namespaces', - 'google-build-explicit-make-pair', - 'readability-function-size', -] - extra_args = [ '-x', 'c++', @@ -58,8 +51,6 @@ args = argp.parse_args() cmdline = [ clang_tidy, - '--checks=-*,%s' % ','.join(GRPC_CHECKS), - '--warnings-as-errors=%s' % ','.join(GRPC_CHECKS) ] + ['--extra-arg-before=%s' % arg for arg in extra_args] if args.fix: -- cgit v1.2.3