Skip to content
Snippets Groups Projects
Commit 8ca00556 authored by Jan Tattermusch's avatar Jan Tattermusch Committed by GitHub
Browse files

Merge pull request #11185 from ctiller/informed_run_tests

Fix runtests --force_default_poller on linux
parents aaefea25 9883e0b4
No related branches found
No related tags found
No related merge requests found
...@@ -1440,6 +1440,9 @@ def _has_epollexclusive(): ...@@ -1440,6 +1440,9 @@ def _has_epollexclusive():
return True return True
except subprocess.CalledProcessError, e: except subprocess.CalledProcessError, e:
return False 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) # returns a list of things that failed (or an empty list on success)
...@@ -1459,7 +1462,7 @@ def _build_and_run( ...@@ -1459,7 +1462,7 @@ def _build_and_run(
suite_name=args.report_suite_name) suite_name=args.report_suite_name)
return [] 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') print('\n\nOmitting EPOLLEXCLUSIVE tests\n\n')
_POLLING_STRATEGIES[platform_string()].remove('epollex') _POLLING_STRATEGIES[platform_string()].remove('epollex')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment