Skip to content

Commit 7661aa0

Browse files
Do not use --recurse-submodules
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 <ronald.cron@arm.com>
1 parent 62a908d commit 7661aa0

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

tests/scripts/check_files.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,10 +487,17 @@ def collect_files():
487487
488488
These are the regular files commited into Git.
489489
"""
490-
bytes_output = subprocess.check_output(['git', 'ls-files',
491-
'--recurse-submodules', '-z'])
492-
bytes_filepaths = bytes_output.split(b'\0')[:-1]
490+
bytes_output = subprocess.check_output(['git', '-C', 'framework',
491+
'ls-files', '-z'])
492+
bytes_framework_filepaths = bytes_output.split(b'\0')[:-1]
493+
bytes_framework_filepaths = ["framework/".encode() + filepath
494+
for filepath in bytes_framework_filepaths]
495+
496+
bytes_output = subprocess.check_output(['git', 'ls-files', '-z'])
497+
bytes_filepaths = bytes_output.split(b'\0')[:-1] + \
498+
bytes_framework_filepaths
493499
ascii_filepaths = map(lambda fp: fp.decode('ascii'), bytes_filepaths)
500+
494501
# Filter out directories. Normally Git doesn't list directories
495502
# (it only knows about the files inside them), but there is
496503
# at least one case where 'git ls-files' includes a directory:

0 commit comments

Comments
 (0)