Merge pull request grpc#6789 from jtattermusch/fix_make_options_propa…

…gation Fix run_tests.py propagation of make options under docker
roke001 · Jun 3, 2016 · 845a056 · 845a056
2 parents 84f7193 + fd3857b
commit 845a056
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
@@ -254,9 +254,7 @@ def _gcc44_make_options(self):
 
   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':