diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-02 08:44:20 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-02 08:44:20 -0800 |
| commit | e5b0a504167fbc6277d034709aa29ea07fa09a00 (patch) | |
| tree | 6c6c080621452edeaead91ba48a1857810829699 /tools/run_tests | |
| parent | ba92ab53bf50c8e12c90e62bbd0935008d696fa3 (diff) | |
| parent | 392e2131e17bd2a028d5b91b7a99aee26bbfbf19 (diff) | |
Merge pull request #14015 from vjpai/alarm
Remove alarm from core, implement in C++ layer only
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 25 | ||||
| -rw-r--r-- | tools/run_tests/generated/tests.json | 26 |
2 files changed, 4 insertions, 47 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 06992cbda8..f414768220 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -11,23 +11,6 @@ "headers": [], "is_filegroup": false, "language": "c", - "name": "alarm_test", - "src": [ - "test/core/surface/alarm_test.cc" - ], - "third_party": false, - "type": "target" - }, - { - "deps": [ - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "is_filegroup": false, - "language": "c", "name": "algorithm_test", "src": [ "test/core/compression/algorithm_test.cc" @@ -2452,9 +2435,9 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "alarm_cpp_test", + "name": "alarm_test", "src": [ - "test/cpp/common/alarm_cpp_test.cc" + "test/cpp/common/alarm_test.cc" ], "third_party": false, "type": "target" @@ -8518,7 +8501,6 @@ "src/core/lib/slice/slice_hash_table.cc", "src/core/lib/slice/slice_intern.cc", "src/core/lib/slice/slice_string_helpers.cc", - "src/core/lib/surface/alarm.cc", "src/core/lib/surface/api_trace.cc", "src/core/lib/surface/byte_buffer.cc", "src/core/lib/surface/byte_buffer_reader.cc", @@ -8671,7 +8653,6 @@ "src/core/lib/slice/slice_hash_table.h", "src/core/lib/slice/slice_internal.h", "src/core/lib/slice/slice_string_helpers.h", - "src/core/lib/surface/alarm_internal.h", "src/core/lib/surface/api_trace.h", "src/core/lib/surface/call.h", "src/core/lib/surface/call_test_only.h", @@ -8814,7 +8795,6 @@ "src/core/lib/slice/slice_hash_table.h", "src/core/lib/slice/slice_internal.h", "src/core/lib/slice/slice_string_helpers.h", - "src/core/lib/surface/alarm_internal.h", "src/core/lib/surface/api_trace.h", "src/core/lib/surface/call.h", "src/core/lib/surface/call_test_only.h", @@ -10066,6 +10046,7 @@ "src/cpp/client/create_channel_posix.cc", "src/cpp/client/credentials_cc.cc", "src/cpp/client/generic_stub.cc", + "src/cpp/common/alarm.cc", "src/cpp/common/channel_arguments.cc", "src/cpp/common/channel_filter.cc", "src/cpp/common/channel_filter.h", diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 7c7de0a94b..87c0e260b3 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -10,30 +10,6 @@ "posix", "windows" ], - "cpu_cost": 0.1, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "alarm_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], "cpu_cost": 1.0, "exclude_configs": [], "exclude_iomgrs": [], @@ -2902,7 +2878,7 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "alarm_cpp_test", + "name": "alarm_test", "platforms": [ "linux", "mac", |