From c091046b10e018586fdb87360b9e045ac6be34e8 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 17 May 2018 06:34:21 -0700
Subject: [PATCH] cleanup in run_c_cpp_test.sh

---
 tools/internal_ci/linux/grpc_microbenchmark_diff.sh         | 4 ++--
 tools/internal_ci/linux/grpc_trickle_diff.sh                | 2 +-
 .../linux/run_if_c_cpp_modified.sh}                         | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename tools/{jenkins/run_c_cpp_test.sh => internal_ci/linux/run_if_c_cpp_modified.sh} (85%)

diff --git a/tools/internal_ci/linux/grpc_microbenchmark_diff.sh b/tools/internal_ci/linux/grpc_microbenchmark_diff.sh
index 45add1b02da..9834aaa0534 100755
--- a/tools/internal_ci/linux/grpc_microbenchmark_diff.sh
+++ b/tools/internal_ci/linux/grpc_microbenchmark_diff.sh
@@ -25,9 +25,9 @@ cd $(dirname $0)/../../..
 source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc
 
 tools/run_tests/start_port_server.py
-tools/jenkins/run_c_cpp_test.sh tools/profiling/bloat/bloat_diff.py \
+tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/bloat/bloat_diff.py \
   -d origin/$ghprbTargetBranch || FAILED="true"
-tools/jenkins/run_c_cpp_test.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \
+tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \
   -d origin/$ghprbTargetBranch \
   -b $BENCHMARKS_TO_RUN || FAILED="true"
 
diff --git a/tools/internal_ci/linux/grpc_trickle_diff.sh b/tools/internal_ci/linux/grpc_trickle_diff.sh
index 624031afa78..4ed1b73f9e8 100755
--- a/tools/internal_ci/linux/grpc_trickle_diff.sh
+++ b/tools/internal_ci/linux/grpc_trickle_diff.sh
@@ -25,7 +25,7 @@ cd $(dirname $0)/../../..
 source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc
 
 tools/run_tests/start_port_server.py
-tools/jenkins/run_c_cpp_test.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \
+tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \
   -d origin/$ghprbTargetBranch \
   -b bm_fullstack_trickle \
   -l 4 \
diff --git a/tools/jenkins/run_c_cpp_test.sh b/tools/internal_ci/linux/run_if_c_cpp_modified.sh
similarity index 85%
rename from tools/jenkins/run_c_cpp_test.sh
rename to tools/internal_ci/linux/run_if_c_cpp_modified.sh
index 4798cfee82b..736d7594234 100755
--- a/tools/jenkins/run_c_cpp_test.sh
+++ b/tools/internal_ci/linux/run_if_c_cpp_modified.sh
@@ -13,13 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# This script is invoked by a Jenkins pull request job and executes all
+# This script is invoked by a pull request job and executes all
 # args passed to this script if the pull request affect C/C++ code
 set -ex
 
 # Enter the gRPC repo root
-cd $(dirname $0)/../..
+cd $(dirname $0)/../../..
 
+# TODO(jtattermusch): the "ghprbTargetBranch" is Jenkins specific and probably
+# does not work on kokoro?
 AFFECTS_C_CPP=`python -c 'import os; \
                import sys; \
                sys.path.insert(0, "tools/run_tests/python_utils"); \