move routeguide c++ distribtest under cmake_pkgconfig

pull/23412/head
Jan Tattermusch 5 years ago
parent b843ddb2f4
commit 4f96118724
  1. 12
      test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
  2. 37
      test/distrib/cpp/run_distrib_test_routeguide.sh
  3. 1
      tools/run_tests/artifacts/distribtest_targets.py

@ -78,8 +78,16 @@ cmake \
make -j4 install
popd
# Build helloworld example using Makefiles and pkg-config
cd examples/cpp/helloworld
# Build helloworld example using Makefile and pkg-config
pushd examples/cpp/helloworld
export PKG_CONFIG_PATH=/usr/local/grpc/lib/pkgconfig
export PATH=$PATH:/usr/local/grpc/bin
make
popd
# Build route_guide example using Makefile and pkg-config
pushd examples/cpp/route_guide
export PKG_CONFIG_PATH=/usr/local/grpc/lib/pkgconfig
export PATH=$PATH:/usr/local/grpc/bin
make
popd

@ -1,37 +0,0 @@
#!/bin/bash
# Copyright 2016 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -ex
# change to grpc repo root
cd "$(dirname "$0")/../../.."
cd third_party/protobuf && ./autogen.sh && \
./configure && make -j4 && make install && ldconfig
cd ../.. && make -j4 && make install
cd examples/cpp/helloworld
make
make clean
cd ../../../examples/cpp/route_guide
make
make clean

@ -296,7 +296,6 @@ class CppDistribTest(object):
def targets():
"""Gets list of supported targets"""
return [
CppDistribTest('linux', 'x64', 'jessie', 'routeguide'),
CppDistribTest('linux', 'x64', 'jessie', 'cmake_as_submodule'),
CppDistribTest('linux', 'x64', 'stretch', 'cmake'),
CppDistribTest('linux', 'x64', 'stretch', 'cmake_as_externalproject'),

Loading…
Cancel
Save