diff options
author | David Garcia Quintas <dgq@google.com> | 2018-06-11 15:52:42 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2018-06-11 15:52:42 -0700 |
commit | 32c04931db9ef88159a59c18b47288c445faa00d (patch) | |
tree | e29c48dde7d51a06f2d02a26b8576b7b63055079 /grpc.gyp | |
parent | dd8bc8cfb468807c5b4576aa8816b0cc0c7aeef7 (diff) | |
parent | b12b813ed8cba02ee56689034069aaae2e455a3f (diff) |
Merge branch 'master' of github.com:grpc/grpc into nanopb_build_cleanup
Diffstat (limited to 'grpc.gyp')
-rw-r--r-- | grpc.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2636,6 +2636,7 @@ 'test/core/end2end/tests/max_message_length.cc', 'test/core/end2end/tests/negative_deadline.cc', 'test/core/end2end/tests/network_status_change.cc', + 'test/core/end2end/tests/no_error_on_hotpath.cc', 'test/core/end2end/tests/no_logging.cc', 'test/core/end2end/tests/no_op.cc', 'test/core/end2end/tests/payload.cc', @@ -2726,6 +2727,7 @@ 'test/core/end2end/tests/max_message_length.cc', 'test/core/end2end/tests/negative_deadline.cc', 'test/core/end2end/tests/network_status_change.cc', + 'test/core/end2end/tests/no_error_on_hotpath.cc', 'test/core/end2end/tests/no_logging.cc', 'test/core/end2end/tests/no_op.cc', 'test/core/end2end/tests/payload.cc', |