diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-17 22:59:53 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-17 22:59:53 -0700 |
| commit | b5980be9a08678212e5dbd6549b923f545d83539 (patch) | |
| tree | e0318622c5a5576377537783608b60516b46c4cf /tools/run_tests | |
| parent | a14215a67841ea7920260c655c01e4570595a3db (diff) | |
| parent | f87a0984ab727e95b068237f3bb0689d9685c8ea (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 32 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 18 |
2 files changed, 27 insertions, 23 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index a21fa34024..3e6d077dca 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -938,20 +938,6 @@ ], "headers": [], "language": "c", - "name": "time_test", - "src": [ - "test/core/support/time_test.c" - ] - }, - { - "deps": [ - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "language": "c", "name": "timeout_encoding_test", "src": [ "test/core/transport/chttp2/timeout_encoding_test.c" @@ -1071,6 +1057,19 @@ ], "headers": [], "language": "c++", + "name": "auth_property_iterator_test", + "src": [ + "test/cpp/common/auth_property_iterator_test.cc" + ] + }, + { + "deps": [ + "gpr", + "grpc", + "grpc++" + ], + "headers": [], + "language": "c++", "name": "channel_arguments_test", "src": [ "test/cpp/client/channel_arguments_test.cc" @@ -10366,6 +10365,7 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", + "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", @@ -10414,6 +10414,7 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", + "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", @@ -10462,6 +10463,7 @@ "src/cpp/client/secure_channel_arguments.cc", "src/cpp/client/secure_credentials.cc", "src/cpp/client/secure_credentials.h", + "src/cpp/common/auth_property_iterator.cc", "src/cpp/common/call.cc", "src/cpp/common/completion_queue.cc", "src/cpp/common/create_auth_context.h", @@ -10537,6 +10539,7 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", + "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", @@ -10582,6 +10585,7 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", + "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 9ea5267387..a08765e99b 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -534,15 +534,6 @@ { "flaky": false, "language": "c", - "name": "time_test", - "platforms": [ - "windows", - "posix" - ] - }, - { - "flaky": false, - "language": "c", "name": "timeout_encoding_test", "platforms": [ "windows", @@ -615,6 +606,15 @@ { "flaky": false, "language": "c++", + "name": "auth_property_iterator_test", + "platforms": [ + "windows", + "posix" + ] + }, + { + "flaky": false, + "language": "c++", "name": "channel_arguments_test", "platforms": [ "windows", |