Skip to content

Commit 65ff827

Browse files
committed
Set PSA_WANT macros to 1 (to avoid macro redefinition errors)
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
1 parent 27436ec commit 65ff827

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tools/bin/mtest

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,11 @@ def set_config_option(action, option, silent=True):
372372
force = [ "--force" ] if action == "set" else []
373373
if option.startswith("PSA_WANT"):
374374
if not silent:
375-
log(f"scripts/config.py -f {CRYPTO_CONFIG_FILE} {action} {option}")
376-
output, success = subrun([f"{ROOT}/scripts/config.py"] + force + ["--file", CRYPTO_CONFIG_FILE, action, option], silent=True, ignore_failure=True)
375+
log(f"scripts/config.py -f {CRYPTO_CONFIG_FILE} {action} {option} {'1' if action == 'set' else ''}")
376+
if action == "set":
377+
output, success = subrun([f"{ROOT}/scripts/config.py"] + force + ["--file", CRYPTO_CONFIG_FILE, action, option, "1"], silent=True, ignore_failure=True)
378+
else:
379+
output, success = subrun([f"{ROOT}/scripts/config.py"] + force + ["--file", CRYPTO_CONFIG_FILE, action, option], silent=True, ignore_failure=True)
377380
else:
378381
if not silent:
379382
log(f"scripts/config.py {action} {option}")

0 commit comments

Comments
 (0)