From 0d65c784db24aaa5b3db7996e971b1898cec3bf1 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 14 Jan 2015 14:24:31 -0800
Subject: [PATCH] Filter out ssl tests in the sans: they dont work yet
---
tools/run_tests/run_tests.py | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 428f6c41b4..2c27cd777a 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -29,13 +29,23 @@ class ValgrindConfig(object):
return ['valgrind', binary]
+# SanConfig: compile with CONFIG=config, filter out incompatible binaries
+class SanConfig(object):
+ def __init__(self, config):
+ self.build_config = config
+
+ def run_command(self, binary):
+ if '_ssl_' in binary:
+ return None
+ return [binary]
+
# different configurations we can run under
_CONFIGS = {
'dbg': SimpleConfig('dbg'),
'opt': SimpleConfig('opt'),
- 'tsan': SimpleConfig('tsan'),
- 'msan': SimpleConfig('msan'),
- 'asan': SimpleConfig('asan'),
+ 'tsan': SanConfig('tsan'),
+ 'msan': SanConfig('msan'),
+ 'asan': SanConfig('asan'),
'gcov': SimpleConfig('gcov'),
'valgrind': ValgrindConfig('dbg'),
}
@@ -81,14 +91,15 @@ def _build_and_run(check_cancelled):
return 1
# run all the tests
- if not jobset.run((
- config.run_command(x)
- for config in run_configs
- for filt in filters
- for x in itertools.chain.from_iterable(itertools.repeat(
- glob.glob('bins/%s/%s_test' % (
- config.build_config, filt)),
- runs_per_test))), check_cancelled):
+ if not jobset.run(itertools.ifilter(
+ lambda x: x is not None, (
+ config.run_command(x)
+ for config in run_configs
+ for filt in filters
+ for x in itertools.chain.from_iterable(itertools.repeat(
+ glob.glob('bins/%s/%s_test' % (
+ config.build_config, filt)),
+ runs_per_test)))), check_cancelled):
return 2
return 0
--
GitLab