From d4f3e05fef5163f14577065b7b32c98500e8cdca Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 31 Jul 2020 10:21:02 +0200 Subject: [PATCH] switch C++ interop tests to cmake --- .../interoptest/grpc_interop_cxx/build_interop.sh | 7 ++++--- tools/run_tests/run_interop_tests.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh index ec1da444097..54c0fa89c86 100755 --- a/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh @@ -32,8 +32,9 @@ cd /var/local/git/grpc mkdir -p /usr/local/share/grpc cp etc/roots.pem /usr/local/share/grpc/roots.pem -# build C++ interop client & server +# build C++ interop client, interop server and http2 interop client +mkdir -p cmake/build +cd cmake/build +cmake -DgRPC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release ../.. make interop_client interop_server -j4 - -# build C++ http2 client make http2_client -j4 diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 32e247553b0..0ee4d5d72fc 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -97,16 +97,16 @@ class CXXLanguage: self.safename = 'cxx' def client_cmd(self, args): - return ['bins/opt/interop_client'] + args + return ['cmake/build/interop_client'] + args def client_cmd_http2interop(self, args): - return ['bins/opt/http2_client'] + args + return ['cmake/build/http2_client'] + args def cloud_to_prod_env(self): return {} def server_cmd(self, args): - return ['bins/opt/interop_server'] + args + return ['cmake/build/interop_server'] + args def global_env(self): return {}