From 4bbf4408f92e73731344fb324d50ba97acd3d7db Mon Sep 17 00:00:00 2001
From: Khairul Azhar Kasmiran <kazarmy@gmail.com>
Date: Tue, 21 Oct 2025 17:59:53 +0800
Subject: [PATCH] Make debug tests work with Ubuntu 22.04 (#5473)

---
 test/db/archos/linux-x64/dbg_maps | 18 +++++++++---------
 test/db/archos/linux-x64/dbg_oo   |  5 +++--
 test/scripts/alt_count.rz         |  2 ++
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 test/scripts/alt_count.rz

diff --git a/test/db/archos/linux-x64/dbg_maps b/test/db/archos/linux-x64/dbg_maps
index 426e655240..be7d409d4e 100644
--- a/test/db/archos/linux-x64/dbg_maps
+++ b/test/db/archos/linux-x64/dbg_maps
@@ -13,7 +13,8 @@ NAME=dbg.maps.count
 FILE=bins/elf/analysis/elf-nx
 ARGS=-d
 CMDS=<<EOF
-dm~?
+. scripts/alt_count.rz
+.(alt_count `dm~?` 9 10)
 EOF
 EXPECT=<<EOF
 10
@@ -24,8 +25,9 @@ NAME=debug map flags count
 FILE=bins/elf/analysis/elf-nx
 ARGS=-d
 CMDS=<<EOF
-fl@F:maps~?
-dm*~?
+. scripts/alt_count.rz
+.(alt_count `fl@F:maps~?` 9 10)
+.(alt_count `dm*~?` 11 12)
 EOF
 EXPECT=<<EOF
 10
@@ -37,18 +39,16 @@ NAME=dbg.maps.count.after.map
 FILE=bins/elf/analysis/x86-helloworld-gcc
 ARGS=-d
 CMDS=<<EOF
-dm~?
+. scripts/alt_count.rz
+.(alt_count `dm~?` 9 10)
 db @ sym.imp.puts
 dc~?
 echo ----
 $dm=%b64- `dm | base64 -w 0`
 $dm~x86-helloworld-gcc~?
-$libc_count=$`$dm~/usr/lib32/libc.so.6~?`
-%= `$libc_count`-6
-%! %vi 5
-%% $libc_count
+.(alt_count `$dm~/usr/lib32/libc.so.6~?` 6 5)
 $dm~unk~?
-$dm~[v~?
+.(alt_count `$dm~[v~?` 2 3)
 $dm~/usr/lib32/ld-linux.so.2~?
 $dm~[stack~?
 echo ----
diff --git a/test/db/archos/linux-x64/dbg_oo b/test/db/archos/linux-x64/dbg_oo
index 1fa15ae959..42a4e42425 100644
--- a/test/db/archos/linux-x64/dbg_oo
+++ b/test/db/archos/linux-x64/dbg_oo
@@ -96,9 +96,10 @@ NAME=dm flags after ood
 FILE=bins/elf/analysis/x86-helloworld-gcc
 ARGS=-e log.level=4
 CMDS=<<EOF
+. scripts/alt_count.rz
 ood
-fl@F:maps~?
-dm*~?
+.(alt_count `fl@F:maps~?` 9 10)
+.(alt_count `dm*~?` 11 12)
 EOF
 EXPECT=<<EOF
 10
diff --git a/test/scripts/alt_count.rz b/test/scripts/alt_count.rz
new file mode 100644
index 0000000000..c88b6f40f5
--- /dev/null
+++ b/test/scripts/alt_count.rz
@@ -0,0 +1,2 @@
+# If `result` is `alt_count`, print `count`
+(alt_count result alt_count count; $count=$${result}; %= `$count`-${alt_count}; %! %vi ${count}; %% $count)