From 1b4ab01f79190f0fb59fc40445e9b2228abd5562 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 6 Nov 2017 15:30:45 -0800 Subject: [PATCH] No Clang on end2end generated files --- test/core/end2end/end2end_nosec_tests.cc | 8 +++----- test/core/end2end/end2end_tests.cc | 8 +++----- .../grpc_clang_format/clang_format_all_the_things.sh | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/test/core/end2end/end2end_nosec_tests.cc b/test/core/end2end/end2end_nosec_tests.cc index ca63864a9ef..3236feea56e 100644 --- a/test/core/end2end/end2end_nosec_tests.cc +++ b/test/core/end2end/end2end_nosec_tests.cc @@ -130,13 +130,11 @@ extern void simple_metadata(grpc_end2end_test_config config); extern void simple_metadata_pre_init(void); extern void simple_request(grpc_end2end_test_config config); extern void simple_request_pre_init(void); -extern void stream_compression_compressed_payload( - grpc_end2end_test_config config); +extern void stream_compression_compressed_payload(grpc_end2end_test_config config); extern void stream_compression_compressed_payload_pre_init(void); extern void stream_compression_payload(grpc_end2end_test_config config); extern void stream_compression_payload_pre_init(void); -extern void stream_compression_ping_pong_streaming( - grpc_end2end_test_config config); +extern void stream_compression_ping_pong_streaming(grpc_end2end_test_config config); extern void stream_compression_ping_pong_streaming_pre_init(void); extern void streaming_error_response(grpc_end2end_test_config config); extern void streaming_error_response_pre_init(void); @@ -213,7 +211,7 @@ void grpc_end2end_tests_pre_init(void) { write_buffering_at_end_pre_init(); } -void grpc_end2end_tests(int argc, char** argv, +void grpc_end2end_tests(int argc, char **argv, grpc_end2end_test_config config) { int i; diff --git a/test/core/end2end/end2end_tests.cc b/test/core/end2end/end2end_tests.cc index 5920b532f1f..ca9443b642d 100644 --- a/test/core/end2end/end2end_tests.cc +++ b/test/core/end2end/end2end_tests.cc @@ -132,13 +132,11 @@ extern void simple_metadata(grpc_end2end_test_config config); extern void simple_metadata_pre_init(void); extern void simple_request(grpc_end2end_test_config config); extern void simple_request_pre_init(void); -extern void stream_compression_compressed_payload( - grpc_end2end_test_config config); +extern void stream_compression_compressed_payload(grpc_end2end_test_config config); extern void stream_compression_compressed_payload_pre_init(void); extern void stream_compression_payload(grpc_end2end_test_config config); extern void stream_compression_payload_pre_init(void); -extern void stream_compression_ping_pong_streaming( - grpc_end2end_test_config config); +extern void stream_compression_ping_pong_streaming(grpc_end2end_test_config config); extern void stream_compression_ping_pong_streaming_pre_init(void); extern void streaming_error_response(grpc_end2end_test_config config); extern void streaming_error_response_pre_init(void); @@ -216,7 +214,7 @@ void grpc_end2end_tests_pre_init(void) { write_buffering_at_end_pre_init(); } -void grpc_end2end_tests(int argc, char** argv, +void grpc_end2end_tests(int argc, char **argv, grpc_end2end_test_config config) { int i; diff --git a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh index d36e9e57ea5..f9011b65b47 100755 --- a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh +++ b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh @@ -29,7 +29,7 @@ for dir in $DIRS do for glob in $GLOB do - files="$files `find ${CLANG_FORMAT_ROOT}/$dir -name $glob -and -not -name '*.generated.*' -and -not -name '*.pb.h' -and -not -name '*.pb.c' -and -not -name '*.pb.cc' -and -not -name end2end_tests.c -and -not -name end2end_nosec_tests.c -and -not -name public_headers_must_be_c89.c`" + files="$files `find ${CLANG_FORMAT_ROOT}/$dir -name $glob -and -not -name '*.generated.*' -and -not -name '*.pb.h' -and -not -name '*.pb.c' -and -not -name '*.pb.cc' -and -not -name end2end_tests.cc -and -not -name end2end_nosec_tests.cc -and -not -name public_headers_must_be_c89.c`" done done