commit f3803a1f715245f36226abdd4b398bdb92fbdc85
author Dave Rodgman <dave.rodgman@arm.com> Mon Oct 16 13:47:15 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Mon Oct 16 13:47:15 2023 +0100
tree c1afb1048ae0d479a83f24b99f5e9926730b7713
parent 2457bcd26c2c8b803dce6318432b2a4f31ffa0bf

Cleanup validation interface

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 7b801a3..f07de88 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -3926,7 +3926,7 @@
 # The validator function is the name of a function to validate the combination of options.
 # It may be "" if all combinations are valid.
 # It receives a string containing a combination of options, as passed to the compiler,
-# e.g. "-DOPT1 -DOPT2 ...". It must echo something iff the combination is invalid.
+# e.g. "-DOPT1 -DOPT2 ...". It must return 0 iff the combination is valid, non-zero if invalid.
 build_test_config_combos() {
     file=$1
     shift
@@ -3975,7 +3975,7 @@
         done
 
         # if combination is not known to be invalid, add it to the makefile
-        if [[ -z $validate_options ]] || [[ $($validate_options "${clang_args}") == "" ]] ; then
+        if [[ -z $validate_options ]] || $validate_options "${clang_args}"; then
             cmd="${compile_cmd} ${clang_args}"
             echo "${target}: ${source_file}; $cmd ${source_file}" >> ${makefile}
 
@@ -3997,11 +3997,11 @@
 validate_aes_config_variations() {
     if [[ "$1" == *"MBEDTLS_AES_USE_HARDWARE_ONLY"* ]]; then
         if [[ "$1" == *"MBEDTLS_PADLOCK_C"* ]]; then
-            echo INVALID
+            false
         fi
         if [[ !(("$HOSTTYPE" == "aarch64" && "$1" != *"MBEDTLS_AESCE_C"*) || \
                 ("$HOSTTYPE" == "x86_64"  && "$1" != *"MBEDTLS_AESNI_C"*)) ]]; then
-            echo INVALID
+            false
         fi
     fi
 }