diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-09-15 15:20:26 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-09-15 15:20:26 -0700 |
| commit | fd2f7331fa97f735879a8759ac9fc8591969011b (patch) | |
| tree | da031f982ee5d1d21fd71e6c4bc9d80365c7d6e2 /test/core/util/test_config.h | |
| parent | 1928d496a237c3850365e2557ae41ae73125fc80 (diff) | |
| parent | 9ed4be48955e3b65b0540f70060b7191d8c1eef1 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into core_creds_plugin
Diffstat (limited to 'test/core/util/test_config.h')
| -rw-r--r-- | test/core/util/test_config.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h index ccef8620c1..15b71747fb 100644 --- a/test/core/util/test_config.h +++ b/test/core/util/test_config.h @@ -54,15 +54,17 @@ extern double g_fixture_slowdown_factor; (GRPC_TEST_SLOWDOWN_BUILD_FACTOR * GRPC_TEST_SLOWDOWN_MACHINE_FACTOR * \ g_fixture_slowdown_factor) -#define GRPC_TIMEOUT_SECONDS_TO_DEADLINE(x) \ - gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), \ - gpr_time_from_millis(GRPC_TEST_SLOWDOWN_FACTOR * 1e3 * (x), \ - GPR_TIMESPAN)) +#define GRPC_TIMEOUT_SECONDS_TO_DEADLINE(x) \ + gpr_time_add( \ + gpr_now(GPR_CLOCK_MONOTONIC), \ + gpr_time_from_millis((long)(GRPC_TEST_SLOWDOWN_FACTOR * 1e3 * (x)), \ + GPR_TIMESPAN)) -#define GRPC_TIMEOUT_MILLIS_TO_DEADLINE(x) \ - gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), \ - gpr_time_from_micros(GRPC_TEST_SLOWDOWN_FACTOR * 1e3 * (x), \ - GPR_TIMESPAN)) +#define GRPC_TIMEOUT_MILLIS_TO_DEADLINE(x) \ + gpr_time_add( \ + gpr_now(GPR_CLOCK_MONOTONIC), \ + gpr_time_from_micros((long)(GRPC_TEST_SLOWDOWN_FACTOR * 1e3 * (x)), \ + GPR_TIMESPAN)) #ifndef GRPC_TEST_CUSTOM_PICK_PORT #define GRPC_TEST_PICK_PORT |