Skip to content

Commit

Permalink
Do not use --recurse-submodules
Browse files Browse the repository at this point in the history
On the CI, the git version when running on
Ubuntu 16.04 is 2.7 and it does not support
the "--recurse-submodules" option of
"git ls-files" thus do not use it.

Another argument to not use it is that
when TF-PSA-Crypto will be a submodule of
mbedtls we will not want check_files.py to
check the TF-PSA-Crypto files as well.

Signed-off-by: Ronald Cron <[email protected]>
  • Loading branch information
ronald-cron-arm committed May 3, 2024
1 parent 62a908d commit 7661aa0
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions tests/scripts/check_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,17 @@ def collect_files():
These are the regular files commited into Git.
"""
bytes_output = subprocess.check_output(['git', 'ls-files',
'--recurse-submodules', '-z'])
bytes_filepaths = bytes_output.split(b'\0')[:-1]
bytes_output = subprocess.check_output(['git', '-C', 'framework',
'ls-files', '-z'])
bytes_framework_filepaths = bytes_output.split(b'\0')[:-1]
bytes_framework_filepaths = ["framework/".encode() + filepath
for filepath in bytes_framework_filepaths]

bytes_output = subprocess.check_output(['git', 'ls-files', '-z'])
bytes_filepaths = bytes_output.split(b'\0')[:-1] + \
bytes_framework_filepaths
ascii_filepaths = map(lambda fp: fp.decode('ascii'), bytes_filepaths)

# Filter out directories. Normally Git doesn't list directories
# (it only knows about the files inside them), but there is
# at least one case where 'git ls-files' includes a directory:
Expand Down

0 comments on commit 7661aa0

Please sign in to comment.