Skip to content
Snippets Groups Projects
Commit 711bbe63 authored by Craig Tiller's avatar Craig Tiller
Browse files

Exclude qps_test from tsan runs

The TSAN deadlock detector has some problems that prevents this test
from running successfully.

Issue #2994 has been filed to re-enable these in the future.
parent 39d97a78
No related branches found
No related tags found
No related merge requests found
...@@ -2488,6 +2488,9 @@ ...@@ -2488,6 +2488,9 @@
"gpr", "gpr",
"grpc++_test_config" "grpc++_test_config"
], ],
"exclude_configs": [
"tsan"
],
"platforms": [ "platforms": [
"mac", "mac",
"linux", "linux",
......
...@@ -6,6 +6,7 @@ ${json.dumps([{"name": tgt.name, ...@@ -6,6 +6,7 @@ ${json.dumps([{"name": tgt.name,
"language": tgt.language, "language": tgt.language,
"platforms": tgt.platforms, "platforms": tgt.platforms,
"ci_platforms": tgt.ci_platforms, "ci_platforms": tgt.ci_platforms,
"exclude_configs": tgt.get("exclude_configs", []),
"flaky": tgt.flaky} "flaky": tgt.flaky}
for tgt in targets for tgt in targets
if tgt.get('run', True) and tgt.build == 'test'], if tgt.get('run', True) and tgt.build == 'test'],
......
...@@ -123,20 +123,19 @@ class CLanguage(object): ...@@ -123,20 +123,19 @@ class CLanguage(object):
def __init__(self, make_target, test_lang): def __init__(self, make_target, test_lang):
self.make_target = make_target self.make_target = make_target
self.platform = platform_string() self.platform = platform_string()
with open('tools/run_tests/tests.json') as f: self.test_lang = test_lang
js = json.load(f)
self.binaries = [tgt
for tgt in js
if tgt['language'] == test_lang and
platform_string() in tgt['platforms']]
self.ci_binaries = [tgt
for tgt in js
if tgt['language'] == test_lang and
platform_string() in tgt['ci_platforms']]
def test_specs(self, config, travis): def test_specs(self, config, travis):
out = [] out = []
for target in (self.ci_binaries if travis else self.binaries): with open('tools/run_tests/tests.json') as f:
js = json.load(f)
platforms_str = 'ci_platforms' if travis else 'platforms'
binaries = [tgt
for tgt in js
if tgt['language'] == self.test_lang and
config.build_config not in tgt['exclude_configs'] and
platform_string() in tgt[platforms_str]]
for target in binaries:
if travis and target['flaky']: if travis and target['flaky']:
continue continue
if self.platform == 'windows': if self.platform == 'windows':
......
This diff is collapsed.
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