commit 845a0567e344d2d85ece37471e63199c045c2249
author Jan Tattermusch <jtattermusch@users.noreply.github.com> Fri Jun 03 18:31:03 2016 -0400
committer Jan Tattermusch <jtattermusch@users.noreply.github.com> Fri Jun 03 18:31:03 2016 -0400
tree 4eacddab09017ef0e5dd9d45a5fe934ae05d24c0
parent 84f71932eaf8b601355189896fc5b91449ac82d2
parent fd3857bbff5b87c74b0aa8d299638960d2122759

Merge pull request #6789 from jtattermusch/fix_make_options_propagation

Fix run_tests.py propagation of make options under docker

tools/run_tests/run_tests.py

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 0a5625c..f7282dd 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -254,9 +254,7 @@
 
   def _compiler_options(self, use_docker, compiler):
     """Returns docker distro and make options to use for given compiler."""
-    if _is_use_docker_child():
-      return ("already_under_docker", [])
-    if not use_docker:
+    if not use_docker and not _is_use_docker_child():
       _check_compiler(compiler, ['default'])
 
     if compiler == 'gcc4.9' or compiler == 'default':