diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-06-07 21:21:27 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-06-07 21:21:27 -0700 |
| commit | 533add5a8733a15f36bc03546dcab4312fd4365a (patch) | |
| tree | 0b112923b795436944e01920829da106ceb953a1 /tools/run_tests/run_tests.py | |
| parent | 8ba42bec907e3e9cebd2621127caac22aed30a0d (diff) | |
| parent | d30d4e279c4a63effaa6e912fc00bd4ad96054c7 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -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': |