aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/run_tests/run_tests.py')
-rwxr-xr-xtools/run_tests/run_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index f7282dddb8..1c0c32d3c0 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -157,7 +157,7 @@ class CLanguage(object):
'windows': ['all'],
'mac': ['all'],
'posix': ['all'],
- 'linux': ['poll', 'legacy']
+ 'linux': ['poll', 'epoll', 'legacy'],
}
for target in binaries:
polling_strategies = (POLLING_STRATEGIES[self.platform]
@@ -890,7 +890,7 @@ for l in languages:
language_make_options=[]
if any(language.make_options() for language in languages):
- if not 'gcov' in args.config and len(languages) != 1:
+ if len(languages) != 1:
print 'languages with custom make options cannot be built simultaneously with other languages'
sys.exit(1)
else: