From 811daaa48c3003a563e4e06102743703e323ac1f Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Fri, 22 Dec 2023 13:16:59 +0100 Subject: [PATCH] Revert "Add ability to pass make variables to psa_collect_statuses.py" 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 --- tests/scripts/psa_collect_statuses.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/scripts/psa_collect_statuses.py b/tests/scripts/psa_collect_statuses.py index 6291d7898e..11bbebcc1f 100755 --- a/tests/scripts/psa_collect_statuses.py +++ b/tests/scripts/psa_collect_statuses.py @@ -82,15 +82,10 @@ def collect_status_logs(options): cwd='tests', stdout=sys.stderr) with open(os.devnull, 'w') as devnull: - build_command = ['make', '-q'] + options.make_vars.split(' ') + \ - ['lib', 'tests'] - make_q_ret = subprocess.call(build_command, stdout=devnull, - stderr=devnull) - print("blagh") + make_q_ret = subprocess.call(['make', '-q', 'lib', 'tests'], + stdout=devnull, stderr=devnull) if make_q_ret != 0: - build_command = ['make'] + options.make_vars.split(' ') + \ - ['RECORD_PSA_STATUS_COVERAGE_LOG=1'] - subprocess.check_call(build_command, + subprocess.check_call(['make', 'RECORD_PSA_STATUS_COVERAGE_LOG=1'], stdout=sys.stderr) rebuilt = True subprocess.check_call(['make', 'test'], @@ -117,9 +112,6 @@ def main(): help='Log file location (default: {})'.format( 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', default=DEFAULT_PSA_CONSTANT_NAMES, help='Path to psa_constant_names (default: {})'.format(