commit 7581363122d7e441c5db79c324a25e75e1025b00
author David Horstmann <david.horstmann@arm.com> Wed Feb 28 15:16:44 2024 +0000
committer David Horstmann <david.horstmann@arm.com> Thu Feb 29 11:26:45 2024 +0000
tree 3c9643255755537e1c583849808daad231884073
parent e097bbdcf3f4d489adea1b0dec425b0cf9d2a84b

Fix incorrect conflict resolution

A return statement was missing in the wrapper generation script.

Signed-off-by: David Horstmann <david.horstmann@arm.com>

tests/scripts/generate_psa_wrappers.py

diff --git a/tests/scripts/generate_psa_wrappers.py b/tests/scripts/generate_psa_wrappers.py
index a6c340c..852fd6e 100755
--- a/tests/scripts/generate_psa_wrappers.py
+++ b/tests/scripts/generate_psa_wrappers.py
@@ -163,7 +163,7 @@
                              'psa_hash_verify',
                              'psa_hash_compute',
                              'psa_hash_compare'):
-
+            return True
         if function_name == 'psa_generate_random':
             return True
         return False