commit 90dfc35643e58d8fd3fa502c391141171044da1b
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Apr 21 20:04:24 2021 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Jun 23 13:43:08 2021 +0200
tree 1e41c554e73b59cf716fcd58f6b9503340fa9661
parent 607eb7e4115bfe31aa9ca71eb55ed14afe600954

More informative message on invalid classification flags

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/suites/test_suite_psa_crypto_metadata.function

diff --git a/tests/suites/test_suite_psa_crypto_metadata.function b/tests/suites/test_suite_psa_crypto_metadata.function
index 5221279..cdb5312 100644
--- a/tests/suites/test_suite_psa_crypto_metadata.function
+++ b/tests/suites/test_suite_psa_crypto_metadata.function
@@ -60,8 +60,15 @@
  * flag is the name of the classification macro without the PSA_ prefix. */
 #define KEY_LIFETIME_IS_VOLATILE        ( 1u << 0 )
 
-#define TEST_CLASSIFICATION_MACRO( flag, alg, flags )           \
-    TEST_ASSERT( PSA_##flag( alg ) == !! ( ( flags ) & flag ) )
+#define TEST_CLASSIFICATION_MACRO( flag, alg, flags ) \
+    do                                                \
+    {                                                 \
+        if( ( flags ) & ( flag ) )                    \
+            TEST_ASSERT( PSA_##flag( alg ) );         \
+        else                                          \
+            TEST_ASSERT( ! PSA_##flag( alg ) );       \
+    }                                                 \
+    while( 0 )
 
 /* Check the parity of value.
  *