switch C++ interop tests to cmake

pull/23703/head
Jan Tattermusch 5 years ago
parent 965e54010a
commit d4f3e05fef
  1. 7
      tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh
  2. 6
      tools/run_tests/run_interop_tests.py

@ -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

@ -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 {}

Loading…
Cancel
Save