From af39a3433b4355f040d36d7bb61ebfc27c625eea Mon Sep 17 00:00:00 2001
From: Khairul Azhar Kasmiran <kazarmy@gmail.com>
Date: Sun, 30 Mar 2025 18:42:01 +0800
Subject: [PATCH] Echo `cmd` in string consistency test macros (#5052)

---
 test/db/cmd/cmd_search                  | 7 +++----
 test/db/cmd/regexp                      | 7 +++----
 test/scripts/string-consistency-test.rz | 6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/test/db/cmd/cmd_search b/test/db/cmd/cmd_search
index 5c70845689..264aebb0fe 100644
--- a/test/db/cmd/cmd_search
+++ b/test/db/cmd/cmd_search
@@ -951,15 +951,14 @@ RUN
 NAME=consistency btw /z and /x at 0x20k multiple
 FILE=--
 CMDS=<<EOF
+. scripts/string-consistency-test.rz
 $str=$abc+d
 $bin=$malloc://0x40000+10
 $setup=$"w `$str` @@=0x20000 0x40000"
-. scripts/string-consistency-test.rz
-
-.(search.show_progress "/z\ `$str`")
+.(search.show_progress "/z `$str`")
 echo ----
 $bytes=%x `$str`
-.(search.show_progress "/x\ `$bytes`")
+.(search.show_progress "/x `$bytes`")
 EOF
 EXPECT=<<EOF
 [0x0, 0x207ff): 1
diff --git a/test/db/cmd/regexp b/test/db/cmd/regexp
index c4dd90d8db..180e22caed 100644
--- a/test/db/cmd/regexp
+++ b/test/db/cmd/regexp
@@ -128,15 +128,14 @@ RUN
 NAME=consistency btw /z and /x
 FILE=bins/elf/analysis/ls2
 CMDS=<<EOF
+. scripts/string-consistency-test.rz
 $str=$lib
 $bin=$bins/elf/analysis/ls2
 $setup=$""
-. scripts/string-consistency-test.rz
-
-.(search.show_progress "/z\ `$str`")
+.(search.show_progress "/z `$str`")
 echo ----
 $bytes=%x `$str`
-.(search.show_progress "/x\ `$bytes`")
+.(search.show_progress "/x `$bytes`")
 
 echo ----
 /z lib > /dev/null
diff --git a/test/scripts/string-consistency-test.rz b/test/scripts/string-consistency-test.rz
index 7f24645c1e..4937bc03ff 100644
--- a/test/scripts/string-consistency-test.rz
+++ b/test/scripts/string-consistency-test.rz
@@ -1,5 +1,5 @@
-# $setup and $bin need to be defined before running this script
+# $setup and $bin need to be defined before calling this script's macros
 
-(show_intervals cmd; !!rizin -qc "e search.show_progress=intervals; `$setup`; ${cmd}" -1 `$bin` | grep "^.*[[:punct:]]0x.*" | sed "s/^.*[[:cntrl:]]//"~$0)
-(show_hits cmd; !!rizin -qc "`$setup`; ${cmd}" `$bin`)
+(show_intervals cmd; !!rizin -qc "e search.show_progress=intervals; `$setup`; `echo ${cmd}`" -1 `$bin` | grep "^.*[[:punct:]]0x.*" | sed "s/^.*[[:cntrl:]]//"~$0)
+(show_hits cmd; !!rizin -qc "`$setup`; `echo ${cmd}`" `$bin`)
 (search.show_progress cmd; .(show_intervals ${cmd}); .(show_hits ${cmd}))