aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2017-04-26 01:22:18 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2017-04-26 01:26:40 -0700
commit0f3b87aef244ca92527f34754ee74b3c1608f38f (patch)
tree49cd1110fa482cbf08424d79c244a69530c34ce7 /tools
parentb864e7c41c6d0363e23093fb090625f260994962 (diff)
Fix C/C++ test filtering
Diffstat (limited to 'tools')
-rwxr-xr-xtools/jenkins/run_c_cpp_test.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/jenkins/run_c_cpp_test.sh b/tools/jenkins/run_c_cpp_test.sh
index a7e574518e..afa2e780f7 100755
--- a/tools/jenkins/run_c_cpp_test.sh
+++ b/tools/jenkins/run_c_cpp_test.sh
@@ -35,10 +35,12 @@ set -ex
# Enter the gRPC repo root
cd $(dirname $0)/../..
-AFFECTS_C_CPP=`python -c 'import sys; \
+AFFECTS_C_CPP=`python -c 'import os; \
+ import sys; \
sys.path.insert(0, "tools/run_tests/python_utils"); \
import filter_pull_request_tests as filter; \
- print(filter.affects_c_cpp("origin/$ghprbTargetBranch"))'`
+ github_target_branch = os.environ.get("ghprbTargetBranch"); \
+ print(filter.affects_c_cpp("origin/%s" % github_target_branch))'`
if [ $AFFECTS_C_CPP == "False" ] ; then
echo "This pull request does not affect C/C++. Tests do not need to be run."