diff options
| author |  Robbie Shade <robbie.shade@gmail.com> | 2015-08-13 18:03:24 -0400 |
|---|---|---|
| committer | Robbie Shade <robbie.shade@gmail.com> | 2015-08-13 18:03:24 -0400 |
| commit | 3544fd26a075213882aed48f43f83277b26aa60f (patch) | |
| tree | a1515dd423e86f4ea65106fd7d0945dab094aebd /tools/run_tests | |
| parent | 6d9e1849ee830fad9d04b2dd837f386a949bb436 (diff) | |
| parent | ed48bf8f71efce4a9037a74ae9ab2c83a3e9b4a7 (diff) | |
Merge remote-tracking branch 'upstream/master' into add_udp_server_2
Conflicts:
Makefile
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 15 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 17 |
2 files changed, 0 insertions, 32 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 610a529296..983b8c6f65 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -230,18 +230,6 @@ ], "headers": [], "language": "c", - "name": "gpr_cancellable_test", - "src": [ - "test/core/support/cancellable_test.c" - ] - }, - { - "deps": [ - "gpr", - "gpr_test_util" - ], - "headers": [], - "language": "c", "name": "gpr_cmdline_test", "src": [ "test/core/support/cmdline_test.c" @@ -12101,7 +12089,6 @@ "include/grpc/support/atm_gcc_atomic.h", "include/grpc/support/atm_gcc_sync.h", "include/grpc/support/atm_win32.h", - "include/grpc/support/cancellable_platform.h", "include/grpc/support/cmdline.h", "include/grpc/support/cpu.h", "include/grpc/support/histogram.h", @@ -12140,7 +12127,6 @@ "include/grpc/support/atm_gcc_atomic.h", "include/grpc/support/atm_gcc_sync.h", "include/grpc/support/atm_win32.h", - "include/grpc/support/cancellable_platform.h", "include/grpc/support/cmdline.h", "include/grpc/support/cpu.h", "include/grpc/support/histogram.h", @@ -12164,7 +12150,6 @@ "include/grpc/support/tls_pthread.h", "include/grpc/support/useful.h", "src/core/support/alloc.c", - "src/core/support/cancellable.c", "src/core/support/cmdline.c", "src/core/support/cpu_iphone.c", "src/core/support/cpu_linux.c", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index e3e0bf881f..da393d7cbe 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -221,23 +221,6 @@ ], "flaky": false, "language": "c", - "name": "gpr_cancellable_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "flaky": false, - "language": "c", "name": "gpr_cmdline_test", "platforms": [ "linux", |