ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-09 08:31:33 +08:00
Code Issues Releases Wiki Activity

Revert "Add ability to pass make variables to psa_collect_statuses.py"

Browse Source 
This reverts commit 6587959a32f978aeb02766c27cf30b04d8a245e1.

The feature is no longer needed, and the script is broken if you don't pass
--make-vars.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-12-22 13:16:59 +01:00
parent 21570cf232
commit 811daaa48c
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/scripts/psa_collect_statuses.py
View File

@ -82,15 +82,10 @@ def collect_status_logs(options):
cwd='tests', cwd='tests',
stdout=sys.stderr) stdout=sys.stderr)
with open(os.devnull, 'w') as devnull: with open(os.devnull, 'w') as devnull:
build_command = ['make', '-q'] + options.make_vars.split(' ') + \ make_q_ret = subprocess.call(['make', '-q', 'lib', 'tests'],
['lib', 'tests'] stdout=devnull, stderr=devnull)
make_q_ret = subprocess.call(build_command, stdout=devnull,
stderr=devnull)
print("blagh")
if make_q_ret != 0: if make_q_ret != 0:
build_command = ['make'] + options.make_vars.split(' ') + \ subprocess.check_call(['make', 'RECORD_PSA_STATUS_COVERAGE_LOG=1'],
['RECORD_PSA_STATUS_COVERAGE_LOG=1']
subprocess.check_call(build_command,
stdout=sys.stderr) stdout=sys.stderr)
rebuilt = True rebuilt = True
subprocess.check_call(['make', 'test'], subprocess.check_call(['make', 'test'],
@ -117,9 +112,6 @@ def main():
help='Log file location (default: {})'.format( help='Log file location (default: {})'.format(
DEFAULT_STATUS_LOG_FILE DEFAULT_STATUS_LOG_FILE
)) ))
parser.add_argument('--make-vars',
help='optional variable/value pairs to pass to make',
action='store', default='')
parser.add_argument('--psa-constant-names', metavar='PROGRAM', parser.add_argument('--psa-constant-names', metavar='PROGRAM',
default=DEFAULT_PSA_CONSTANT_NAMES, default=DEFAULT_PSA_CONSTANT_NAMES,
help='Path to psa_constant_names (default: {})'.format( help='Path to psa_constant_names (default: {})'.format(