diff options
| author |  Michael Lumish <mlumish@google.com> | 2016-01-07 08:39:00 -0800 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2016-01-07 08:39:00 -0800 |
| commit | bbaad2a7e4d15977b86d5c8a0ca477ab3658f38c (patch) | |
| tree | 8ae9090c0c8ea5198fa774c55fa3d6617aa06db8 /templates | |
| parent | 848ee629dd663c03ce9667ead0a8f63e71605a95 (diff) | |
| parent | 9577b310955b688c0e4104487402c15da86bee8d (diff) | |
Merge pull request #4606 from ctiller/clangfmt
Actually making the clang format test properly fail sanity.
Diffstat (limited to 'templates')
4 files changed, 4 insertions, 8 deletions
diff --git a/templates/test/core/end2end/end2end_defs.include b/templates/test/core/end2end/end2end_defs.include index e95bd4a8b6..1b13bba94c 100644 --- a/templates/test/core/end2end/end2end_defs.include +++ b/templates/test/core/end2end/end2end_defs.include @@ -1,7 +1,7 @@ <%def name="end2end_selector(tests)"> /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/templates/test/core/end2end/end2end_nosec_tests.c.template b/templates/test/core/end2end/end2end_nosec_tests.c.template index b70b724d50..3719ded75d 100644 --- a/templates/test/core/end2end/end2end_nosec_tests.c.template +++ b/templates/test/core/end2end/end2end_nosec_tests.c.template @@ -1,5 +1,4 @@ %YAML 1.2 --- | - <%namespace file="end2end_defs.include" import="*"/> + <%namespace file="end2end_defs.include" import="*"/>\ ${end2end_selector(k for k, v in core_end2end_tests.iteritems() if not v)} - diff --git a/templates/test/core/end2end/end2end_tests.c.template b/templates/test/core/end2end/end2end_tests.c.template index ecb1565e23..e6a49f2795 100644 --- a/templates/test/core/end2end/end2end_tests.c.template +++ b/templates/test/core/end2end/end2end_tests.c.template @@ -1,5 +1,4 @@ %YAML 1.2 --- | - <%namespace file="end2end_defs.include" import="*"/> + <%namespace file="end2end_defs.include" import="*"/>\ ${end2end_selector(core_end2end_tests.keys())} - diff --git a/templates/test/core/surface/public_headers_must_be_c89.c.template b/templates/test/core/surface/public_headers_must_be_c89.c.template index aff4ac5bcc..e132256cb8 100644 --- a/templates/test/core/surface/public_headers_must_be_c89.c.template +++ b/templates/test/core/surface/public_headers_must_be_c89.c.template @@ -54,6 +54,4 @@ #include <${hdr}> % endfor - int main(int argc, char **argv) { - return 0; - } + int main(int argc, char **argv) { return 0; } |