Skip to content
Snippets Groups Projects
Commit bf25e240 authored by Mark D. Roth's avatar Mark D. Roth
Browse files

Fix test name conflict in import. Also use low-thread-count variant for asan.

parent 9c6b5951
No related branches found
No related tags found
No related merge requests found
...@@ -91,7 +91,7 @@ print yaml.dump({ ...@@ -91,7 +91,7 @@ print yaml.dump({
'boringssl': True, 'boringssl': True,
'defaults': 'boringssl', 'defaults': 'boringssl',
'cpu_cost': guess_cpu(scenario_json, False), 'cpu_cost': guess_cpu(scenario_json, False),
'exclude_configs': ['tsan'], 'exclude_configs': ['tsan', 'asan'],
'timeout_seconds': 6*60 'timeout_seconds': 6*60
} }
for scenario_json in scenario_config.CXXLanguage().scenarios() for scenario_json in scenario_config.CXXLanguage().scenarios()
...@@ -99,7 +99,7 @@ print yaml.dump({ ...@@ -99,7 +99,7 @@ print yaml.dump({
] + [ ] + [
{ {
'name': 'json_run_localhost', 'name': 'json_run_localhost',
'shortname': 'json_run_localhost:%s' % scenario_json['name'], 'shortname': 'json_run_localhost:%s_low_thread_count' % scenario_json['name'],
'args': ['--scenarios_json', _scenario_json_string(scenario_json, True)], 'args': ['--scenarios_json', _scenario_json_string(scenario_json, True)],
'ci_platforms': ['linux'], 'ci_platforms': ['linux'],
'platforms': ['linux'], 'platforms': ['linux'],
...@@ -108,7 +108,7 @@ print yaml.dump({ ...@@ -108,7 +108,7 @@ print yaml.dump({
'boringssl': True, 'boringssl': True,
'defaults': 'boringssl', 'defaults': 'boringssl',
'cpu_cost': guess_cpu(scenario_json, True), 'cpu_cost': guess_cpu(scenario_json, True),
'exclude_configs': sorted(c for c in configs_from_yaml if c != 'tsan'), 'exclude_configs': sorted(c for c in configs_from_yaml if c not in ('tsan', 'asan')),
'timeout_seconds': 6*60 'timeout_seconds': 6*60
} }
for scenario_json in scenario_config.CXXLanguage().scenarios() for scenario_json in scenario_config.CXXLanguage().scenarios()
......
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