diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:55:54 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:55:54 -0700 |
| commit | a4b89fed1c801cdb31a154c7e1c09e5650898e8a (patch) | |
| tree | d0a00563db8df1da5d69dee362664a85112f20cb /test/core/util/test_config.c | |
| parent | aaa03d74ceae4d48e31f4ba0619e359acd21505a (diff) | |
| parent | c86b1dd59d1e61b9377f2dca0741061b2e5de1da (diff) | |
Merge github.com:grpc/grpc into you-complete-me
Conflicts:
src/core/iomgr/resolve_address_posix.c
src/core/surface/server.c
Diffstat (limited to 'test/core/util/test_config.c')
| -rw-r--r-- | test/core/util/test_config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c index be69fcf675..20ab67ec15 100644 --- a/test/core/util/test_config.c +++ b/test/core/util/test_config.c @@ -50,8 +50,9 @@ static int seed(void) { return _getpid(); } void grpc_test_init(int argc, char **argv) { gpr_log(GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f", - GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, GRPC_TEST_SLOWDOWN_BUILD_FACTOR, - GRPC_TEST_SLOWDOWN_FACTOR); + (double)GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, + (double)GRPC_TEST_SLOWDOWN_BUILD_FACTOR, + (double)GRPC_TEST_SLOWDOWN_FACTOR); /* seed rng with pid, so we don't end up with the same random numbers as a concurrently running test binary */ srand(seed()); |