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 <Gilles.Peskine@arm.com>
diff --git a/tests/scripts/psa_collect_statuses.py b/tests/scripts/psa_collect_statuses.py
index 6291d78..11bbebc 100755
--- a/tests/scripts/psa_collect_statuses.py
+++ b/tests/scripts/psa_collect_statuses.py
@@ -82,15 +82,10 @@
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 @@
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(