diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-18 16:12:06 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-18 16:12:06 -0700 |
| commit | 3ab6f4dc11a4936463a5588b105aad14f5a78a40 (patch) | |
| tree | 8d68c1b852d0f82610568c738fc6feacfbc13bbb /tools/run_tests | |
| parent | 55977aa487fedda9dbdccf36d7a6a7c83377b018 (diff) | |
| parent | 58270d546137c3e7335e34a44bf272c4a460f40a (diff) | |
Merge branch 'revert-5841-revert-5723-backoff_lib' of github.com:grpc/grpc into backoff2
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 17 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 23 |
2 files changed, 39 insertions, 1 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index ae227005ad..0f54d5625b 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -411,6 +411,20 @@ ], "headers": [], "language": "c", + "name": "gpr_backoff_test", + "src": [ + "test/core/support/backoff_test.c" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util" + ], + "headers": [], + "language": "c", "name": "gpr_cmdline_test", "src": [ "test/core/support/cmdline_test.c" @@ -3746,6 +3760,7 @@ "include/grpc/support/tls_pthread.h", "include/grpc/support/useful.h", "src/core/profiling/timers.h", + "src/core/support/backoff.h", "src/core/support/block_annotate.h", "src/core/support/env.h", "src/core/support/load_file.h", @@ -3807,6 +3822,8 @@ "src/core/profiling/timers.h", "src/core/support/alloc.c", "src/core/support/avl.c", + "src/core/support/backoff.c", + "src/core/support/backoff.h", "src/core/support/block_annotate.h", "src/core/support/cmdline.c", "src/core/support/cpu_iphone.c", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 2be7d8a48a..784dfd865b 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -466,6 +466,27 @@ "flaky": false, "gtest": false, "language": "c", + "name": "gpr_backoff_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": "gpr_cmdline_test", "platforms": [ "linux", @@ -2295,7 +2316,7 @@ "mac", "posix" ], - "cpu_cost": 10, + "cpu_cost": 0.5, "exclude_configs": [], "flaky": false, "gtest": false, |