commit 80de1475a1eb935822a9377ef8f73583ac6aee26
author David Horstmann <david.horstmann@arm.com> Wed Feb 28 15:16:44 2024 +0000
committer David Horstmann <david.horstmann@arm.com> Wed Feb 28 15:16:44 2024 +0000
tree c258a41cdead3a791749cc58ad786713d021ac41
parent 10e44f3fd172d0381709ad274a7d56ac9e2a0c3a

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 0aaa710..db7a559 100755
--- a/tests/scripts/generate_psa_wrappers.py
+++ b/tests/scripts/generate_psa_wrappers.py
@@ -171,7 +171,7 @@
                              'psa_hash_verify',
                              'psa_hash_compute',
                              'psa_hash_compare'):
-
+            return True
         if function_name == 'psa_generate_random':
             return True
         return False