Merge pull request #2783 from ctiller/tracing-takes-time

Allow fixtures to specify slowdown factors, use it for grpc_trace tests
pull/2754/head^2
Nicolas Noble 9 years ago
commit 0a6012688a
  1. 1
      test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
  2. 2
      test/core/util/test_config.c
  3. 5
      test/core/util/test_config.h

@ -148,6 +148,7 @@ int main(int argc, char **argv) {
/* force tracing on, with a value to force many
code paths in trace.c to be taken */
gpr_setenv("GRPC_TRACE", "doesnt-exist,http,all");
g_fixture_slowdown_factor = 10.0;
grpc_test_init(argc, argv);
grpc_init();

@ -38,6 +38,8 @@
#include <stdlib.h>
#include <signal.h>
double g_fixture_slowdown_factor = 1.0;
#if GPR_GETPID_IN_UNISTD_H
#include <unistd.h>
static int seed(void) { return getpid(); }

@ -48,8 +48,11 @@ extern "C" {
#define GRPC_TEST_SLOWDOWN_MACHINE_FACTOR 1.0
#endif
extern double g_fixture_slowdown_factor;
#define GRPC_TEST_SLOWDOWN_FACTOR \
(GRPC_TEST_SLOWDOWN_BUILD_FACTOR * GRPC_TEST_SLOWDOWN_MACHINE_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), \

Loading…
Cancel
Save