From 8db95ef47ce3f0cae85755a8f05be215d896da5a Mon Sep 17 00:00:00 2001
From: Rot127 <unisono@quyllur.org>
Date: Thu, 1 Feb 2024 21:52:56 -0500
Subject: [PATCH] More regex fixes of tests

---
 test/db/archos/darwin-x64/dbg      | 36 +++++++++++++++---------------
 test/db/archos/linux-x64/dbg_dmh   |  3 +--
 test/db/archos/linux-x64/dbg_oo    |  2 +-
 test/db/archos/linux-x64/dbg_trace |  2 +-
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/test/db/archos/darwin-x64/dbg b/test/db/archos/darwin-x64/dbg
index f245034f429..75963f32793 100644
--- a/test/db/archos/darwin-x64/dbg
+++ b/test/db/archos/darwin-x64/dbg
@@ -44,13 +44,13 @@ ARGS=-d
 CMDS=<<EOF
 dm~hello
 EOF
-REGEXP_FILTER_OUT=((0x00000001[^\/]+)|(hello_objc_osx.[r_x]+))
+REGEXP_FILTER_OUT=((0x00000001[^\/]+)|(hello_objc_osx.[r_wx]+))
 EXPECT=<<EOF
-0x0000000100000000 - 0x0000000100001000 - usr     4K u r-x hello-objc-osx hello-objc-osx
+0x0000000100000000 - 0x0000000100001000 - usr     4K u r-x hello-objc-osx
 hello_objc_osx.r_x
-0x0000000100001000 - 0x0000000100002000 - usr     4K u rw- hello-objc-osx hello-objc-osx
+0x0000000100001000 - 0x0000000100002000 - usr     4K u rw- hello-objc-osx
 hello_objc_osx.rw
-0x0000000100002000 - 0x0000000100003000 - usr     4K u r-- hello-objc-osx hello-objc-osx
+0x0000000100002000 - 0x0000000100003000 - usr     4K u r-- hello-objc-osx
 hello_objc_osx.r
 EOF
 EXPECT_ERR=
@@ -144,19 +144,19 @@ dr rax
 EOF
 REGEXP_FILTER_OUT=((r[ia][px]\s=\s[a-fx0-9]+)|(--))
 EXPECT=<<EOF
-rip = f20
+rip = 0x0000000101665f20
 --
-rip = f34
+rip = 0x0000000101665f34
 rax = 0x0000000000000000
 --
-rip = f38
+rip = 0x0000000101665f38
 rax = 0x0000000000000064
 EOF
-REGEXP_FILTER_ERR=(([a-zA-Z:]+|[0-9a-f][0-9a-f][0-9a-f])\s+)
+REGEXP_FILTER_ERR=(hit\sbreakpoint\sat:\s[0-9xa-f]+)
 EXPECT_ERR=<<EOF
-hit breakpoint at: f20
-hit breakpoint at: f34
-hit breakpoint at: f38
+hit breakpoint at: 0x0000000101665f20
+hit breakpoint at: 0x0000000101665f34
+hit breakpoint at: 0x0000000101665f38
 EOF
 RUN
 
@@ -180,18 +180,18 @@ dr rax
 EOF
 REGEXP_FILTER_OUT=((r[ia][px]\s=\s[a-fx0-9]+)|(--))
 EXPECT=<<EOF
-rip = ea0
+rip = 0x0000000100000ea0
 --
-rip = edd
+rip = 0x0000000100000edd
 rax = 0x0000000000000190
 --
-rip = ee3
+rip = 0x0000000100000ee3
 rax = 0x00000000000000a0
 EOF
-REGEXP_FILTER_ERR=(([a-zA-Z:]+|[0-9a-f][0-9a-f][0-9a-f])\s+)
+REGEXP_FILTER_ERR=(hit\sbreakpoint\sat:\s[0-9xa-f]+)
 EXPECT_ERR=<<EOF
-hit breakpoint at: ea0
-hit breakpoint at: edd
-hit breakpoint at: ee3
+hit breakpoint at: 0x0000000100000ea0
+hit breakpoint at: 0x0000000100000edd
+hit breakpoint at: 0x0000000100000ee3
 EOF
 RUN
diff --git a/test/db/archos/linux-x64/dbg_dmh b/test/db/archos/linux-x64/dbg_dmh
index bcd5a8b24aa..ca58af5e24c 100644
--- a/test/db/archos/linux-x64/dbg_dmh
+++ b/test/db/archos/linux-x64/dbg_dmh
@@ -24,11 +24,10 @@ echo ----
 7dso
 dmh | tail -n 3
 EOF
-REGEXP_FILTER_OUT=(status=[a-z,[0]+)|(size=0x[a-f0-9]+)|-+|\n|[()]|Chunk
+REGEXP_FILTER_OUT=(Chunk\(status=[a-z,[0]+(size=0x[a-f0-9]+)\))
 EXPECT=<<EOF
 Chunk(status=allocated,size=0x12010)
 Chunk(status=free,size=0xed60)
-----
 Chunk(status=allocated,size=0x12010)
 Chunk(status=allocated,size=0x20)
 Chunk(status=free,size=0xed40)
diff --git a/test/db/archos/linux-x64/dbg_oo b/test/db/archos/linux-x64/dbg_oo
index 807c1c44d55..19ca90fa10a 100644
--- a/test/db/archos/linux-x64/dbg_oo
+++ b/test/db/archos/linux-x64/dbg_oo
@@ -112,7 +112,7 @@ ARGS=-e log.level=4
 CMDS=<<EOF
 ood
 EOF
-REGEXP_FILTER_ERR=([a-zA-Z-]+)
+REGEXP_FILTER_ERR=(Process\swith\sPID\sFile\s.+)
 EXPECT_ERR=<<EOF
 Process with PID File -helloworld-gcc reopened in read-write mode
 EOF
diff --git a/test/db/archos/linux-x64/dbg_trace b/test/db/archos/linux-x64/dbg_trace
index 25f99aaf84d..49298afb3cf 100644
--- a/test/db/archos/linux-x64/dbg_trace
+++ b/test/db/archos/linux-x64/dbg_trace
@@ -61,7 +61,7 @@ echo ----
 dsui call; ds
 dbt~[6-]  # dbtt here would be nice
 EOF
-REGEXP_FILTER_OUT=((loc\.[^_]\S*)|(main\s?\S*)|(entry0\+\d+)|(-+))
+REGEXP_FILTER_OUT=((loc\.[^_]\S*)|(main\s?\S*)|(entry0\+\d+)|(----))
 EXPECT=<<EOF
 main loc.func_6+6
 entry0+41