commit 2e8b00172bfc1d1df48baad86db57aa90a66a66a
author Jerry Yu <jerry.h.yu@arm.com> Fri Dec 10 20:29:02 2021 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Fri Dec 10 20:29:02 2021 +0800
tree 410e38f1c0f0ad1a3b92610823ce69e2f2db8f30
parent d0fcf7f6a08072a7d61f702a2804c0dca9894171

Beauty source code

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

scripts/data_files/query_config.fmt

diff --git a/scripts/data_files/query_config.fmt b/scripts/data_files/query_config.fmt
index e0e14cb..b22474a 100644
--- a/scripts/data_files/query_config.fmt
+++ b/scripts/data_files/query_config.fmt
@@ -99,9 +99,9 @@
 #define MACRO_NAME_TO_STR(macro)                                        \
     mbedtls_printf( "%s", strlen( #macro "" ) > 0 ? #macro "\n" : "" )
 
-#define NAME_TO_STR(macro)  #macro
+#define STRINGIFY(macro)  #macro
 #define OUTPUT_MACRO_NAME_VALUE(macro) mbedtls_printf( #macro "%s\n",   \
-    strlen( NAME_TO_STR(macro) "") > 0 ? "=" NAME_TO_STR(macro) : "" )
+    STRINGIFY(macro)[0] != 0 ? "=" STRINGIFY(macro) : "" )
 
 #if defined(_MSC_VER)
 /*

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 7b994cd..0c6afae 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -207,8 +207,7 @@
 # skip next test if the flag is not enabled in mbedtls_config.h
 requires_config_enabled() {
     case $CONFIGS_ENABLED in
-        *" $1 "*) :;;
-        *" $1="*) :;;
+        *" $1"[\ =]*) :;;
         *) SKIP_NEXT="YES";;
     esac
 }
@@ -216,8 +215,7 @@
 # skip next test if the flag is enabled in mbedtls_config.h
 requires_config_disabled() {
     case $CONFIGS_ENABLED in
-        *" $1 "*) SKIP_NEXT="YES";;
-        *" $1="*) SKIP_NEXT="YES";;
+        *" $1"[\ =]*) SKIP_NEXT="YES";;
     esac
 }