diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-01 15:27:24 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-01 15:27:24 -0800 |
| commit | 3a63d4c005c1dba4f021a7ecfc7f1481fb703527 (patch) | |
| tree | 49ecd51acc3feafb09437ab45dfb74dd493ff568 /tools/run_tests/run_tests.py | |
| parent | 27ffc9b551f4df23598b8b9819012bfc57a3da88 (diff) | |
| parent | d505b53e4cfcac42a17b1a94f006c44bb91a1009 (diff) | |
Merge github.com:grpc/grpc into bwest
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index c182288679..9d76725810 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -235,6 +235,9 @@ class CLanguage(object): if polling_strategy == 'poll-cv': timeout_scaling *= 5 + if polling_strategy in target.get('excluded_poll_engines', []): + continue + # Scale overall test timeout if running under various sanitizers. config = self.args.config if ('asan' in config |