mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-04-23 11:42:31 +00:00
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>
This commit is contained in:
parent
62a908d869
commit
7661aa0e20
@ -487,10 +487,17 @@ class IntegrityChecker:
|
|||||||
|
|
||||||
These are the regular files commited into Git.
|
These are the regular files commited into Git.
|
||||||
"""
|
"""
|
||||||
bytes_output = subprocess.check_output(['git', 'ls-files',
|
bytes_output = subprocess.check_output(['git', '-C', 'framework',
|
||||||
'--recurse-submodules', '-z'])
|
'ls-files', '-z'])
|
||||||
bytes_filepaths = bytes_output.split(b'\0')[:-1]
|
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)
|
ascii_filepaths = map(lambda fp: fp.decode('ascii'), bytes_filepaths)
|
||||||
|
|
||||||
# Filter out directories. Normally Git doesn't list directories
|
# Filter out directories. Normally Git doesn't list directories
|
||||||
# (it only knows about the files inside them), but there is
|
# (it only knows about the files inside them), but there is
|
||||||
# at least one case where 'git ls-files' includes a directory:
|
# at least one case where 'git ls-files' includes a directory:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user