diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-06 08:38:50 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-06 08:38:50 -0700 |
| commit | d925c93047d94456e5efb475d07a9c74f3de672d (patch) | |
| tree | fa46677dae0e8f7518c5555d773e8060ec58d20b /tools/run_tests/run_tests.py | |
| parent | 115ae4004ca40835202138a8a295c796a4762f7e (diff) | |
| parent | 37e26d922fc443b67df50abd8b11288eba2920cd (diff) | |
Merge github.com:grpc/grpc into error
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 f6e4e8d157..cbf77ae0c7 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': |