From 5fa69e480caab21b1dccf9fc5a79c66fec456410 Mon Sep 17 00:00:00 2001
From: Khairul Azhar Kasmiran <kazarmy@gmail.com>
Date: Mon, 11 Sep 2023 12:29:48 +0800
Subject: [PATCH] Combine all dbg_trace# tests into 1 testfile (#3840)

---
 .../linux-x64/{dbg_trace1 => dbg_trace}       | 35 +++++++++++++++++++
 test/db/archos/linux-x64/dbg_trace2           | 17 ---------
 test/db/archos/linux-x64/dbg_trace3           | 16 ---------
 3 files changed, 35 insertions(+), 33 deletions(-)
 rename test/db/archos/linux-x64/{dbg_trace1 => dbg_trace} (55%)
 delete mode 100644 test/db/archos/linux-x64/dbg_trace2
 delete mode 100644 test/db/archos/linux-x64/dbg_trace3

diff --git a/test/db/archos/linux-x64/dbg_trace1 b/test/db/archos/linux-x64/dbg_trace
similarity index 55%
rename from test/db/archos/linux-x64/dbg_trace1
rename to test/db/archos/linux-x64/dbg_trace
index ee105ab4c4..fa0c90b660 100644
--- a/test/db/archos/linux-x64/dbg_trace1
+++ b/test/db/archos/linux-x64/dbg_trace
@@ -16,6 +16,41 @@ rip = 0x00000000004004ed
 EOF
 RUN
 
+NAME=dbg.trace.loop.hwstep
+FILE=bins/elf/analysis/x64-loop
+ARGS=-d
+CMDS=<<EOF
+e scr.color=0
+e dbg.swstep=false
+db @ sym.called_in_loop
+dbc dr PC @ sym.called_in_loop
+dbte @ sym.called_in_loop
+dc
+EOF
+EXPECT=<<EOF
+rip = 0x00000000004004ed
+rip = 0x00000000004004ed
+rip = 0x00000000004004ed
+EOF
+RUN
+
+NAME=dbg.trace instructions
+FILE=bins/elf/analysis/x86-simple
+ARGS=-d
+BROKEN=1
+CMDS=<<EOF
+ds
+sr eip
+e dbg.trace = true
+2ds
+"pi 1 @ `atd~:0[3]`;pi 1 @ `atd~:1[3]`"
+EOF
+EXPECT=<<EOF
+pop ebx
+mov eax, 1
+EOF
+RUN
+
 NAME=missing main stack frame fix (#3806)
 FILE=bins/elf/analysis/calls_x64
 ARGS=-d
diff --git a/test/db/archos/linux-x64/dbg_trace2 b/test/db/archos/linux-x64/dbg_trace2
deleted file mode 100644
index f2cf8f81f0..0000000000
--- a/test/db/archos/linux-x64/dbg_trace2
+++ /dev/null
@@ -1,17 +0,0 @@
-NAME=dbg.trace.loop.hwstep
-FILE=bins/elf/analysis/x64-loop
-ARGS=-d
-CMDS=<<EOF
-e scr.color=0
-e dbg.swstep=false
-db @ sym.called_in_loop
-dbc dr PC @ sym.called_in_loop
-dbte @ sym.called_in_loop
-dc
-EOF
-EXPECT=<<EOF
-rip = 0x00000000004004ed
-rip = 0x00000000004004ed
-rip = 0x00000000004004ed
-EOF
-RUN
diff --git a/test/db/archos/linux-x64/dbg_trace3 b/test/db/archos/linux-x64/dbg_trace3
deleted file mode 100644
index 2428d54230..0000000000
--- a/test/db/archos/linux-x64/dbg_trace3
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME=dbg.trace instructions
-FILE=bins/elf/analysis/x86-simple
-ARGS=-d
-BROKEN=1
-CMDS=<<EOF
-ds
-sr eip
-e dbg.trace = true
-2ds
-"pi 1 @ `atd~:0[3]`;pi 1 @ `atd~:1[3]`"
-EOF
-EXPECT=<<EOF
-pop ebx
-mov eax, 1
-EOF
-RUN