Merge pull request #6789 from jtattermusch/fix_make_options_propagation

Fix run_tests.py propagation of make options under docker
pull/6787/head
Jan Tattermusch 9 years ago
commit 845a0567e3
  1. 4
      tools/run_tests/run_tests.py

@ -254,9 +254,7 @@ class CLanguage(object):
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':

Loading…
Cancel
Save