diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-03 18:31:03 -0400 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-03 18:31:03 -0400 |
| commit | 845a0567e344d2d85ece37471e63199c045c2249 (patch) | |
| tree | 4eacddab09017ef0e5dd9d45a5fe934ae05d24c0 | |
| parent | 84f71932eaf8b601355189896fc5b91449ac82d2 (diff) | |
| parent | fd3857bbff5b87c74b0aa8d299638960d2122759 (diff) | |
Merge pull request #6789 from jtattermusch/fix_make_options_propagation
Fix run_tests.py propagation of make options under docker
| -rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 0a5625c3f5..f7282dddb8 100755 --- a/tools/run_tests/run_tests.py +++ b/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': |