Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions Tests/scs-compliance-check.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def main(argv):
# collect scripts to be run
testcase_lookup = spec['testcases']
tc_script_lookup = spec['tc_scripts']
script_info = {}
script_tc_ids = [[] for _ in spec['scripts']]
for tc_id in all_testcase_ids:
script = tc_script_lookup[tc_id]
if 'executable' not in script:
Expand All @@ -343,16 +343,13 @@ def main(argv):
continue
if config.tests and not config.tests.match(tc_id):
continue
item = script_info.get(id(script))
if item is None:
_, testcase_ids = script_info[id(script)] = (script, [])
else:
_, testcase_ids = item
testcase_ids.append(tc_id)
idx = script['_idx']
script_tc_ids[idx].append(tc_id)
# run scripts
invocations = [
runner.run(script, testcases=sorted(testcases))
for script, testcases in script_info.values()
runner.run(script, testcases=sorted(tc_ids))
for script, tc_ids in zip(spec['scripts'], script_tc_ids)
if tc_ids
]
results = {}
for invocation in invocations:
Expand Down
3 changes: 2 additions & 1 deletion Tests/scs_cert_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ def _resolve_spec(spec: dict):
# step 1. build lookups
testcase_lookup = {}
tc_script_lookup = {}
for script in spec.get('scripts', ()):
for idx, script in enumerate(spec.get('scripts', ())):
script['_idx'] = idx
for testcase in script.get('testcases', ()):
id_ = testcase['id']
if id_ in testcase_lookup:
Expand Down
Loading