diff options
| author |  Mark D. Roth <roth@google.com> | 2016-08-02 14:07:00 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-08-02 14:07:00 -0700 |
| commit | 85c1168d1798db92bc2fb063c3fd8c5162535401 (patch) | |
| tree | d1bd9eaa5b403fefee736f854877b39c8b90e965 /tools/run_tests | |
| parent | 657a15bcd5763320c8dd63e7582ea467dd4021a4 (diff) | |
| parent | 5c3877e70f97e12242326fe628a2ced2d97995be (diff) | |
Merge remote-tracking branch 'upstream/master' into filter_api
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 22 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 21 |
2 files changed, 43 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 009cede78c..f3fc87f2b3 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -149,6 +149,22 @@ ], "headers": [], "language": "c", + "name": "census_resource_test", + "src": [ + "test/core/census/resource_test.c" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", "name": "channel_create_test", "src": [ "test/core/surface/channel_create_test.c" @@ -5528,11 +5544,13 @@ "headers": [ "include/grpc/census.h", "src/core/ext/census/aggregation.h", + "src/core/ext/census/base_resources.h", "src/core/ext/census/census_interface.h", "src/core/ext/census/census_rpc_stats.h", "src/core/ext/census/gen/census.pb.h", "src/core/ext/census/grpc_filter.h", "src/core/ext/census/mlog.h", + "src/core/ext/census/resource.h", "src/core/ext/census/rpc_metric_id.h" ], "language": "c", @@ -5540,6 +5558,8 @@ "src": [ "include/grpc/census.h", "src/core/ext/census/aggregation.h", + "src/core/ext/census/base_resources.c", + "src/core/ext/census/base_resources.h", "src/core/ext/census/census_interface.h", "src/core/ext/census/census_rpc_stats.h", "src/core/ext/census/context.c", @@ -5554,6 +5574,8 @@ "src/core/ext/census/mlog.h", "src/core/ext/census/operation.c", "src/core/ext/census/placeholders.c", + "src/core/ext/census/resource.c", + "src/core/ext/census/resource.h", "src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/tracing.c" ], diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 3483d56fa4..11fb460dd5 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -182,6 +182,27 @@ "flaky": false, "gtest": false, "language": "c", + "name": "census_resource_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "flaky": false, + "gtest": false, + "language": "c", "name": "channel_create_test", "platforms": [ "linux", |