diff options
author | 2016-04-01 15:33:59 -0700 | |
---|---|---|
committer | 2016-04-01 15:33:59 -0700 | |
commit | b48dda25913fbf6fcb0a7c86ecc364beb31ff43b (patch) | |
tree | da2cca3c4881504230c8fd3d72ac0ce297034a5d /test/core/statistics | |
parent | 0b868c7c0713c93f2aa76460af1d03879256ba4d (diff) | |
parent | abcebb07983ae4b1824cb4481462cd4b234e149a (diff) |
Merge branch 'master' into subchannel_factory_create_lb_channel
Diffstat (limited to 'test/core/statistics')
-rw-r--r-- | test/core/statistics/census_log_tests.c | 2 | ||||
-rw-r--r-- | test/core/statistics/census_stub_test.c | 4 | ||||
-rw-r--r-- | test/core/statistics/hash_table_test.c | 2 | ||||
-rw-r--r-- | test/core/statistics/rpc_stats_test.c | 6 | ||||
-rw-r--r-- | test/core/statistics/trace_test.c | 6 | ||||
-rw-r--r-- | test/core/statistics/window_stats_test.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/test/core/statistics/census_log_tests.c b/test/core/statistics/census_log_tests.c index 92570d9af9..8646a2fdf1 100644 --- a/test/core/statistics/census_log_tests.c +++ b/test/core/statistics/census_log_tests.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/statistics/census_log.h" +#include "src/core/ext/census/census_log.h" #include <grpc/support/cpu.h> #include <grpc/support/log.h> #include <grpc/support/port_platform.h> diff --git a/test/core/statistics/census_stub_test.c b/test/core/statistics/census_stub_test.c index dbc7cf74b7..f9dddb6599 100644 --- a/test/core/statistics/census_stub_test.c +++ b/test/core/statistics/census_stub_test.c @@ -36,8 +36,8 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> -#include "src/core/lib/statistics/census_interface.h" -#include "src/core/lib/statistics/census_rpc_stats.h" +#include "src/core/ext/census/census_interface.h" +#include "src/core/ext/census/census_rpc_stats.h" #include "test/core/util/test_config.h" /* Tests census noop stubs in a simulated rpc flow */ diff --git a/test/core/statistics/hash_table_test.c b/test/core/statistics/hash_table_test.c index 6fc2d6086d..f63c1a366a 100644 --- a/test/core/statistics/hash_table_test.c +++ b/test/core/statistics/hash_table_test.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <string.h> -#include "src/core/lib/statistics/hash_table.h" +#include "src/core/ext/census/hash_table.h" #include <grpc/support/alloc.h> #include <grpc/support/log.h> diff --git a/test/core/statistics/rpc_stats_test.c b/test/core/statistics/rpc_stats_test.c index 715bd13931..14def4bfe1 100644 --- a/test/core/statistics/rpc_stats_test.c +++ b/test/core/statistics/rpc_stats_test.c @@ -39,9 +39,9 @@ #include <grpc/support/string.h> #include <grpc/support/thd.h> #include <grpc/support/time.h> -#include "src/core/lib/statistics/census_interface.h" -#include "src/core/lib/statistics/census_rpc_stats.h" -#include "src/core/lib/statistics/census_tracing.h" +#include "src/core/ext/census/census_interface.h" +#include "src/core/ext/census/census_rpc_stats.h" +#include "src/core/ext/census/census_tracing.h" #include "test/core/util/test_config.h" /* Ensure all possible state transitions are called without causing problem */ diff --git a/test/core/statistics/trace_test.c b/test/core/statistics/trace_test.c index 8dab8b6738..790507f2c6 100644 --- a/test/core/statistics/trace_test.c +++ b/test/core/statistics/trace_test.c @@ -41,9 +41,9 @@ #include <grpc/support/thd.h> #include <grpc/support/time.h> #include <grpc/support/useful.h> -#include "src/core/lib/statistics/census_interface.h" -#include "src/core/lib/statistics/census_tracing.h" -#include "src/core/lib/statistics/census_tracing.h" +#include "src/core/ext/census/census_interface.h" +#include "src/core/ext/census/census_tracing.h" +#include "src/core/ext/census/census_tracing.h" #include "test/core/util/test_config.h" /* Ensure all possible state transitions are called without causing problem */ diff --git a/test/core/statistics/window_stats_test.c b/test/core/statistics/window_stats_test.c index 5192ca53c7..5d71ba613d 100644 --- a/test/core/statistics/window_stats_test.c +++ b/test/core/statistics/window_stats_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/statistics/window_stats.h" +#include "src/core/ext/census/window_stats.h" #include <grpc/support/log.h> #include <grpc/support/time.h> #include <stdlib.h> |