From 261b58ca804e9703d79e46990e86f48a094d0637 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Fri, 18 Sep 2015 17:15:48 -0700
Subject: [PATCH] using tty option is not ok on jenkins
---
tools/jenkins/build_docker_and_run_tests.sh | 2 +-
tools/run_tests/run_tests.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/jenkins/build_docker_and_run_tests.sh b/tools/jenkins/build_docker_and_run_tests.sh
index f554b65f70..fa6bd44e18 100755
--- a/tools/jenkins/build_docker_and_run_tests.sh
+++ b/tools/jenkins/build_docker_and_run_tests.sh
@@ -57,7 +57,7 @@ docker run \
-e "config=$config" \
-e "arch=$arch" \
-e CCACHE_DIR=/tmp/ccache \
- -it \
+ -i $TTY_FLAG \
-v "$git_root:/var/local/jenkins/grpc" \
-v /tmp/ccache:/tmp/ccache \
-w /var/local/git/grpc \
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 1491b1c41c..f7e9805393 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -484,6 +484,8 @@ if args.use_docker:
env['RUN_TESTS_COMMAND'] = run_tests_cmd
if args.xml_report:
env['XML_REPORT'] = args.xml_report
+ if not args.travis:
+ env['TTY_FLAG'] = '-t' # enables Ctrl-C when not on Jenkins.
subprocess.check_call(['tools/jenkins/build_docker_and_run_tests.sh'],
shell=True,
--
GitLab