diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-01-29 21:01:47 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-01-29 21:01:47 -0800 |
| commit | 44c02738ed5352dfa908bd3e96f99f2348ccc2d5 (patch) | |
| tree | cce7e7ecfeca428206a6449c0641a3506b302f77 /test/core/end2end | |
| parent | a0935d9e3661b073f5f630b1b2333ed63d55a1cb (diff) | |
| parent | b24b50094c2eb6d617847ff957afcc58ac5c569c (diff) | |
Merge github.com:google/grpc into async-api
Conflicts:
test/core/echo/echo_test.c
Diffstat (limited to 'test/core/end2end')
4 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/tests/cancel_after_accept.c b/test/core/end2end/tests/cancel_after_accept.c index 8db0e3e408..3a71daa9a4 100644 --- a/test/core/end2end/tests/cancel_after_accept.c +++ b/test/core/end2end/tests/cancel_after_accept.c @@ -150,7 +150,7 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, } void grpc_end2end_tests(grpc_end2end_test_config config) { - int i; + unsigned i; for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { test_cancel_after_accept(config, cancellation_modes[i]); diff --git a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c b/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c index 9dbc8dcf79..b258dd4251 100644 --- a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c +++ b/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c @@ -158,7 +158,7 @@ static void test_cancel_after_accept_and_writes_closed( } void grpc_end2end_tests(grpc_end2end_test_config config) { - int i; + unsigned i; for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { test_cancel_after_accept_and_writes_closed(config, cancellation_modes[i]); diff --git a/test/core/end2end/tests/cancel_after_invoke.c b/test/core/end2end/tests/cancel_after_invoke.c index 08b3d69bfd..12de361383 100644 --- a/test/core/end2end/tests/cancel_after_invoke.c +++ b/test/core/end2end/tests/cancel_after_invoke.c @@ -133,7 +133,7 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, } void grpc_end2end_tests(grpc_end2end_test_config config) { - int i; + unsigned i; for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { test_cancel_after_invoke(config, cancellation_modes[i]); diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.c b/test/core/end2end/tests/cancel_in_a_vacuum.c index 42294fc4ba..6b5194fb07 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.c +++ b/test/core/end2end/tests/cancel_in_a_vacuum.c @@ -123,7 +123,7 @@ static void test_cancel_in_a_vacuum(grpc_end2end_test_config config, } void grpc_end2end_tests(grpc_end2end_test_config config) { - int i; + unsigned i; for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { test_cancel_in_a_vacuum(config, cancellation_modes[i]); |