diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-13 08:42:22 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-13 08:42:22 -0700 |
| commit | 75cfb044f3c5582a50582c375b443ee4ab029c33 (patch) | |
| tree | 1e327d171b85a57d5bcea9488fc79ce83b971a84 /tools/run_tests | |
| parent | 143e7bf0cfcbfd60422f4e8f15e6b5c18259c8cd (diff) | |
| parent | 4d0b7427faecfdbb1635c2ab158c922d7511b865 (diff) | |
Merge github.com:grpc/grpc into no-worries-i-can-wait
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/python_tests.json | 13 | ||||
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 10 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 4 |
3 files changed, 8 insertions, 19 deletions
diff --git a/tools/run_tests/python_tests.json b/tools/run_tests/python_tests.json index 4da4c1b68b..77473db2ed 100755 --- a/tools/run_tests/python_tests.json +++ b/tools/run_tests/python_tests.json @@ -1,18 +1,5 @@ [ { - "module": "grpc._cython.cygrpc_test", - "pythonVersions": [ - "2.7", - "3.4" - ] - }, - { - "module": "grpc._cython.adapter_low_test", - "pythonVersions": [ - "2.7" - ] - }, - { "module": "grpc._adapter._c_test", "pythonVersions": [ "2.7" diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index eb20e6c288..0f6ed10d4f 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -1423,9 +1423,9 @@ ], "headers": [], "language": "c++", - "name": "qps_test", + "name": "qps_openloop_test", "src": [ - "test/cpp/qps/qps_test.cc" + "test/cpp/qps/qps_openloop_test.cc" ] }, { @@ -1441,9 +1441,9 @@ ], "headers": [], "language": "c++", - "name": "qps_test_openloop", + "name": "qps_test", "src": [ - "test/cpp/qps/qps_test_openloop.cc" + "test/cpp/qps/qps_test.cc" ] }, { @@ -9011,6 +9011,7 @@ "src/core/surface/server_create.c", "src/core/surface/surface_trace.c", "src/core/surface/surface_trace.h", + "src/core/surface/version.c", "src/core/transport/chttp2/alpn.c", "src/core/transport/chttp2/alpn.h", "src/core/transport/chttp2/bin_encoder.c", @@ -9412,6 +9413,7 @@ "src/core/surface/server_create.c", "src/core/surface/surface_trace.c", "src/core/surface/surface_trace.h", + "src/core/surface/version.c", "src/core/transport/chttp2/alpn.c", "src/core/transport/chttp2/alpn.h", "src/core/transport/chttp2/bin_encoder.c", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 5342419369..091ed872e2 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -696,7 +696,7 @@ { "flaky": false, "language": "c++", - "name": "qps_test", + "name": "qps_openloop_test", "platforms": [ "windows", "posix" @@ -705,7 +705,7 @@ { "flaky": false, "language": "c++", - "name": "qps_test_openloop", + "name": "qps_test", "platforms": [ "windows", "posix" |