From 4f96118724648ce5c74bdcca386a7012f41f50ff Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 9 Jul 2020 13:56:00 +0200
Subject: [PATCH] move routeguide c++ distribtest under cmake_pkgconfig

---
 .../cpp/run_distrib_test_cmake_pkgconfig.sh   | 12 +++++-
 .../cpp/run_distrib_test_routeguide.sh        | 37 -------------------
 .../artifacts/distribtest_targets.py          |  1 -
 3 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100755 test/distrib/cpp/run_distrib_test_routeguide.sh

diff --git a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
index 3d02f6e43ef..e0c04ea813d 100755
--- a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
+++ b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
@@ -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
diff --git a/test/distrib/cpp/run_distrib_test_routeguide.sh b/test/distrib/cpp/run_distrib_test_routeguide.sh
deleted file mode 100755
index a81692d920c..00000000000
--- a/test/distrib/cpp/run_distrib_test_routeguide.sh
+++ /dev/null
@@ -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
-
diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py
index 7147f46d307..8f22537c4a0 100644
--- a/tools/run_tests/artifacts/distribtest_targets.py
+++ b/tools/run_tests/artifacts/distribtest_targets.py
@@ -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'),