diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-05-18 11:10:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-18 11:10:17 +0200 |
commit | 8ca0055633a663a3a1f832221191a160f500dea2 (patch) | |
tree | 611ffc0aa5374ceda0e74d8717c45bf9adb0df95 | |
parent | aaefea25b132cd150a01155fb9c8aae4bf773cd7 (diff) | |
parent | 9883e0b4d2556ba224664411d248e06cd29c30cf (diff) |
Merge pull request #11185 from ctiller/informed_run_tests
Fix runtests --force_default_poller on linux
-rwxr-xr-x | tools/run_tests/run_tests.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 1a16b09325..568774cece 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1440,6 +1440,9 @@ def _has_epollexclusive(): return True except subprocess.CalledProcessError, e: return False + except OSError, e: + # For languages other than C and Windows the binary won't exist + return False # returns a list of things that failed (or an empty list on success) @@ -1459,7 +1462,7 @@ def _build_and_run( suite_name=args.report_suite_name) return [] - if not args.travis and not _has_epollexclusive() and 'epollex' in _POLLING_STRATEGIES[platform_string()]: + if not args.travis and not _has_epollexclusive() and platform_string() in _POLLING_STRATEGIES and 'epollex' in _POLLING_STRATEGIES[platform_string()]: print('\n\nOmitting EPOLLEXCLUSIVE tests\n\n') _POLLING_STRATEGIES[platform_string()].remove('epollex') |