lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-06-13 19:21:32 +03:00
Code Activity

Make abi_check.py look in both locations

Browse Source 
To deal with situations where we are comparing revisions before and
after the move of generate_psa_tests.py to the framework, look for
it in both the old and new locations.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann
2024-05-31 14:38:52 +01:00
parent cb12604d55
commit b8360cf3ca
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/abi_check.py
View File

@ -326,8 +326,14 @@ class AbiChecker:
@staticmethod @staticmethod
def _list_generated_test_data_files(git_worktree_path): def _list_generated_test_data_files(git_worktree_path):
"""List the generated test data files.""" """List the generated test data files."""
generate_psa_tests = 'framework/scripts/generate_psa_tests.py'
if not os.path.isfile(git_worktree_path + '/' + generate_psa_tests):
# The checked-out revision is from before generate_psa_tests.py
# was moved to the framework submodule. Use the old location.
generate_psa_tests = 'tests/scripts/generate_psa_tests.py'
output = subprocess.check_output( output = subprocess.check_output(
['tests/scripts/generate_psa_tests.py', '--list'], [generate_psa_tests, '--list'],
cwd=git_worktree_path, cwd=git_worktree_path,
).decode('ascii') ).decode('ascii')
return [line for line in output.split('\n') if line] return [line for line in output.split('\n') if line]
@ -353,8 +359,14 @@ class AbiChecker:
if 'storage_format' in filename: if 'storage_format' in filename:
storage_data_files.add(filename) storage_data_files.add(filename)
to_be_generated.add(filename) to_be_generated.add(filename)
generate_psa_tests = 'framework/scripts/generate_psa_tests.py'
if not os.path.isfile(git_worktree_path + '/' + generate_psa_tests):
# The checked-out revision is from before generate_psa_tests.py
# was moved to the framework submodule. Use the old location.
generate_psa_tests = 'tests/scripts/generate_psa_tests.py'
subprocess.check_call( subprocess.check_call(
['tests/scripts/generate_psa_tests.py'] + sorted(to_be_generated), [generate_psa_tests] + sorted(to_be_generated),
cwd=git_worktree_path, cwd=git_worktree_path,
) )
for test_file in sorted(storage_data_files): for test_file in sorted(storage_data_files):