From b2574bfb68c6fa8817e268fb90f94dae79297aba Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 17 May 2017 09:01:28 -0700 Subject: [PATCH 1/2] Fix runtests --force_default_poller on linux --- tools/run_tests/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 1a16b093259..830c356d913 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1459,7 +1459,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') From 9883e0b4d2556ba224664411d248e06cd29c30cf Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 18 May 2017 11:00:27 +0200 Subject: [PATCH 2/2] fix run_tests.py on Windows and for non-C langs --- tools/run_tests/run_tests.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 830c356d913..568774cecea 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)