diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-06-13 23:00:07 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-13 23:00:07 -0700 |
| commit | f92460e539405bbca98af3547edd3150d0fcca40 (patch) | |
| tree | dea35a54d1f6db8135df398c6e5a328ba3489609 /grpc.gyp | |
| parent | 19ac7c0baf298be51c0dbfa7d5bcd1f45eec7c78 (diff) | |
| parent | 9a2c0a8641d1837185a60436adf9419209f89fbe (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2635,6 +2635,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', |