diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
| commit | e0d581b6ad1023635598d9de95bd951cd04b0354 (patch) | |
| tree | a0601b1315a1dc7b499998a95adba61322825f3c /test/core/end2end/cq_verifier.c | |
| parent | 658b6087cc07f8706d270ee0e31f28bbf732ec3d (diff) | |
| parent | 3e5d61670e23b040ed47b2df1e4c87ee2cfec4aa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# include/grpc++/client_context.h
# include/grpc++/server_context.h
# src/cpp/client/client_context.cc
# src/cpp/server/server_context.cc
# vsprojects/Grpc.mak
Diffstat (limited to 'test/core/end2end/cq_verifier.c')
| -rw-r--r-- | test/core/end2end/cq_verifier.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/core/end2end/cq_verifier.c b/test/core/end2end/cq_verifier.c index ab7559d7e7..c9a0c8ba61 100644 --- a/test/core/end2end/cq_verifier.c +++ b/test/core/end2end/cq_verifier.c @@ -259,7 +259,8 @@ void cq_verify(cq_verifier *v) { } void cq_verify_empty(cq_verifier *v) { - gpr_timespec deadline = gpr_time_add(gpr_now(), gpr_time_from_seconds(1)); + gpr_timespec deadline = + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(1)); grpc_event ev; GPR_ASSERT(v->expect.next == &v->expect && "expectation queue must be empty"); |