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 /build.json | |
parent | 143e7bf0cfcbfd60422f4e8f15e6b5c18259c8cd (diff) | |
parent | 4d0b7427faecfdbb1635c2ab158c922d7511b865 (diff) |
Merge github.com:grpc/grpc into no-worries-i-can-wait
Diffstat (limited to 'build.json')
-rw-r--r-- | build.json | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build.json b/build.json index ed36aba0c3..283fe62349 100644 --- a/build.json +++ b/build.json @@ -287,6 +287,7 @@ "src/core/surface/server_chttp2.c", "src/core/surface/server_create.c", "src/core/surface/surface_trace.c", + "src/core/surface/version.c", "src/core/transport/chttp2/alpn.c", "src/core/transport/chttp2/bin_encoder.c", "src/core/transport/chttp2/frame_data.c", @@ -2280,11 +2281,11 @@ ] }, { - "name": "qps_test", + "name": "qps_openloop_test", "build": "test", "language": "c++", "src": [ - "test/cpp/qps/qps_test.cc" + "test/cpp/qps/qps_openloop_test.cc" ], "deps": [ "qps", @@ -2298,11 +2299,11 @@ ] }, { - "name": "qps_test_openloop", + "name": "qps_test", "build": "test", "language": "c++", "src": [ - "test/cpp/qps/qps_test_openloop.cc" + "test/cpp/qps/qps_test.cc" ], "deps": [ "qps", |