diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-16 16:50:59 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-16 16:50:59 -0700 |
| commit | 47f18378b507a90ae971c9c9cb4d81a7643f8fe8 (patch) | |
| tree | e8fd527c3b08769821d79ea3a56570219457b654 /tools/run_tests/tests.json | |
| parent | 1ada6ad8e57e9033f9cc9a6b0082e27a413e9584 (diff) | |
| parent | c9af31dad084f3fb58a7523e0bcf917a1d98cf3e (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'tools/run_tests/tests.json')
| -rw-r--r-- | tools/run_tests/tests.json | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index a00b9d945c..9ea5267387 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -687,6 +687,15 @@ { "flaky": false, "language": "c++", + "name": "fixed_size_thread_pool_test", + "platforms": [ + "windows", + "posix" + ] + }, + { + "flaky": false, + "language": "c++", "name": "generic_end2end_test", "platforms": [ "windows", @@ -777,15 +786,6 @@ { "flaky": false, "language": "c++", - "name": "thread_pool_test", - "platforms": [ - "windows", - "posix" - ] - }, - { - "flaky": false, - "language": "c++", "name": "thread_stress_test", "platforms": [ "windows", |