diff options
| -rw-r--r-- | include/grpc++/impl/sync_no_cxx11.h | 2 | ||||
| -rw-r--r-- | test/core/security/oauth2_utils.c | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_interops_build.sh | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/grpc++/impl/sync_no_cxx11.h b/include/grpc++/impl/sync_no_cxx11.h index fda668957e..5869b04c76 100644 --- a/include/grpc++/impl/sync_no_cxx11.h +++ b/include/grpc++/impl/sync_no_cxx11.h @@ -87,7 +87,7 @@ class condition_variable { ~condition_variable() { gpr_cv_destroy(&cv_); } void wait(lock_guard<mutex> &mu) { mu.locked = false; - gpr_cv_wait(&cv_, &mu.mu_.mu_, gpr_inf_future(GPR_CLOCK_REALTIME); + gpr_cv_wait(&cv_, &mu.mu_.mu_, gpr_inf_future(GPR_CLOCK_REALTIME)); mu.locked = true; } void notify_one() { gpr_cv_signal(&cv_); } diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index bd4d44ac48..990855ac6a 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -86,7 +86,7 @@ char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { while (!request.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&request.pollset, &worker, - gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_inf_future(GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock(GRPC_POLLSET_MU(&request.pollset)); diff --git a/tools/run_tests/run_interops_build.sh b/tools/run_tests/run_interops_build.sh index bbe36eed62..23441a5300 100755 --- a/tools/run_tests/run_interops_build.sh +++ b/tools/run_tests/run_interops_build.sh @@ -31,10 +31,11 @@ set -e -#clean up any old docker files +#clean up any old docker files and start mirroring repository if not started already sudo docker rmi -f grpc/cxx || true sudo docker rmi -f grpc/base || true sudo docker rmi -f 0.0.0.0:5000/grpc/base || true +sudo docker run -d -e GCS_BUCKET=docker-interop-images -e STORAGE_PATH=/admin/docker_images -p 5000:5000 google/docker-registry || true #prepare building by pulling down base images and necessary files sudo docker pull 0.0.0.0:5000/grpc/base |