diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-07-12 09:35:02 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-07-12 09:35:02 -0700 |
| commit | 5e28249f99a935045f799b4c96fa35c974c04e4b (patch) | |
| tree | 575268907163688939dad1483df7163ae061132a | |
| parent | ed334f0f3ead942c23f474c7d241a66b9cf8dafa (diff) | |
| parent | 609dc2d360a15e0fd5fb9d73f21054b53abb2a27 (diff) | |
Merge branch 'delayed-write' into grand-unified-closures
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index aff3afce12..b18b8a2b67 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1546,6 +1546,7 @@ static void fail_pending_writes(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream_global *stream_global, grpc_error *error) { error = removal_error(error, stream_global); + stream_global->send_message = NULL; grpc_chttp2_complete_closure_step( exec_ctx, transport_global, stream_global, &stream_global->send_initial_metadata_finished, GRPC_ERROR_REF(error)); diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 37aee8277e..714543290b 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -206,12 +206,6 @@ class CLanguage(object): return sorted(out) def make_targets(self): - test_regex = self.args.regex - if self.platform != 'windows' and self.args.regex != '.*': - # use the regex to minimize the number of things to build - return [os.path.basename(target['name']) - for target in get_c_tests(False, self.test_lang) - if re.search(test_regex, '/' + target['name'])] if self.platform == 'windows': # don't build tools on windows just yet return ['buildtests_%s' % self.make_target] |