From 1d92509b1aa5a1a65062bc9f84db8875e5d3e3cf Mon Sep 17 00:00:00 2001
From: Armin Weihbold <koyaan@users.noreply.github.com>
Date: Sun, 24 Dec 2023 12:18:07 +0100
Subject: [PATCH] Fix running arch/debug specific tests in r2r ##tests

Mark failing tests as broken
Mark tests that timeout as NORUN
Include bits in testfolder names
Update CI to upload results.json
---
 .github/workflows/ci.yml                      |  4 +++
 binr/r2r/load.c                               |  2 +-
 binr/r2r/r2r.h                                |  6 ++++
 .../{darwin-x64 => darwin-x86_64}/cmd_i       |  0
 .../cmd_interpreter                           |  0
 .../archos/{darwin-x64 => darwin-x86_64}/http |  0
 .../{linux-x64 => linux-x86_64}/.dbg_fork     |  0
 .../{linux-x64 => linux-x86_64}/.dbg_fork2    |  0
 .../{linux-x64 => linux-x86_64}/bug_6678      |  0
 .../archos/{linux-x64 => linux-x86_64}/cmd_dd |  4 +++
 .../cmd_di_onsignals                          | 32 ++++++++++++++++++-
 .../archos/{linux-x64 => linux-x86_64}/cmd_dx |  2 ++
 .../archos/{linux-x64 => linux-x86_64}/cmd_i  |  0
 .../cmd_interpreter                           |  0
 .../db/archos/{linux-x64 => linux-x86_64}/dbg |  0
 .../{linux-x64 => linux-x86_64}/dbg_aaa_dcu   |  0
 .../{linux-x64 => linux-x86_64}/dbg_aslr      |  0
 .../{linux-x64 => linux-x86_64}/dbg_bps       |  0
 .../{linux-x64 => linux-x86_64}/dbg_bps2      |  0
 .../{linux-x64 => linux-x86_64}/dbg_cmdbps    |  0
 .../{linux-x64 => linux-x86_64}/dbg_cont      |  0
 .../{linux-x64 => linux-x86_64}/dbg_cont_back |  3 +-
 .../archos/{linux-x64 => linux-x86_64}/dbg_dL |  3 +-
 .../{linux-x64 => linux-x86_64}/dbg_dmh       |  3 ++
 .../{linux-x64 => linux-x86_64}/dbg_dmht      |  3 ++
 .../{linux-x64 => linux-x86_64}/dbg_dmi       |  1 +
 .../{linux-x64 => linux-x86_64}/dbg_drt       |  3 ++
 .../{linux-x64 => linux-x86_64}/dbg_drv       |  0
 .../{linux-x64 => linux-x86_64}/dbg_dts       |  0
 .../{linux-x64 => linux-x86_64}/dbg_fds       | 15 +--------
 .../archos/{linux-x64 => linux-x86_64}/dbg_io |  0
 .../{linux-x64 => linux-x86_64}/dbg_maps      |  0
 .../archos/{linux-x64 => linux-x86_64}/dbg_oo |  0
 .../{linux-x64 => linux-x86_64}/dbg_px0       |  2 +-
 .../{linux-x64 => linux-x86_64}/dbg_seginfo   |  0
 .../{linux-x64 => linux-x86_64}/dbg_step      |  0
 .../{linux-x64 => linux-x86_64}/dbg_step_back |  1 +
 .../{linux-x64 => linux-x86_64}/dbg_trace1    |  0
 .../{linux-x64 => linux-x86_64}/dbg_trace2    |  0
 .../{linux-x64 => linux-x86_64}/dbg_trace3    |  0
 .../{linux-x64 => linux-x86_64}/dbg_wps       |  0
 .../archos/{linux-x64 => linux-x86_64}/http   |  3 +-
 .../{linux-x64 => linux-x86_64}/shell_uname   |  0
 .../dbg_rebase                                |  0
 .../{windows-x64 => windows-x86_64}/http      |  0
 45 files changed, 67 insertions(+), 20 deletions(-)
 rename test/db/archos/{darwin-x64 => darwin-x86_64}/cmd_i (100%)
 rename test/db/archos/{darwin-x64 => darwin-x86_64}/cmd_interpreter (100%)
 rename test/db/archos/{darwin-x64 => darwin-x86_64}/http (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/.dbg_fork (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/.dbg_fork2 (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/bug_6678 (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/cmd_dd (99%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/cmd_di_onsignals (97%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/cmd_dx (99%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/cmd_i (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/cmd_interpreter (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_aaa_dcu (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_aslr (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_bps (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_bps2 (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_cmdbps (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_cont (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_cont_back (97%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_dL (85%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_dmh (97%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_dmht (96%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_dmi (99%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_drt (96%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_drv (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_dts (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_fds (68%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_io (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_maps (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_oo (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_px0 (81%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_seginfo (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_step (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_step_back (99%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_trace1 (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_trace2 (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_trace3 (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/dbg_wps (100%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/http (99%)
 rename test/db/archos/{linux-x64 => linux-x86_64}/shell_uname (100%)
 rename test/db/archos/{windows-x64 => windows-x86_64}/dbg_rebase (100%)
 rename test/db/archos/{windows-x64 => windows-x86_64}/http (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 782e683e78..1e1fde9b78 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -148,6 +148,10 @@ jobs:
       run: |
         export LD_LIBRARY_PATH=/usr/local/lib
         make tests
+    - uses: actions/upload-artifact@v3
+      with:
+        name: results.json
+        path: test/results.json
   linux-static-meson:
     if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
     continue-on-error: true
diff --git a/binr/r2r/load.c b/binr/r2r/load.c
index dc2e11779e..c62fbc821b 100644
--- a/binr/r2r/load.c
+++ b/binr/r2r/load.c
@@ -622,7 +622,7 @@ static bool database_load(R2RTestDatabase *db, const char *path, int depth) {
 			}
 			bool is_archos_folder = !strcmp (path, "archos") || r_str_endswith (path, R_SYS_DIR"archos");
 			if (is_archos_folder && (skip_archos || strcmp (subname, R2R_ARCH_OS))) {
-				R_LOG_ERROR ("Skipping %s"R_SYS_DIR"%s because it does not match the current platform", path, subname);
+				R_LOG_ERROR ("Skipping %s"R_SYS_DIR"%s because it does not match the current platform \"%s\"", path, subname, R2R_ARCH_OS);
 				continue;
 			}
 			r_strbuf_setf (&subpath, "%s%s%s", path, R_SYS_DIR, subname);
diff --git a/binr/r2r/r2r.h b/binr/r2r/r2r.h
index 880d33edd6..817a073142 100644
--- a/binr/r2r/r2r.h
+++ b/binr/r2r/r2r.h
@@ -5,7 +5,13 @@
 
 #include <r_util.h>
 
+#if R_SYS_BITS & R_SYS_BITS_64
+#define R2R_ARCH_OS R_SYS_OS "-"R_SYS_ARCH "_64"
+#elif R_SYS_BITS & R_SYS_BITS_32
+#define R2R_ARCH_OS R_SYS_OS "-"R_SYS_ARCH "_32"
+#elif
 #define R2R_ARCH_OS R_SYS_OS "-"R_SYS_ARCH
+#endif
 
 typedef struct r2r_cmd_test_string_record {
 	char *value;
diff --git a/test/db/archos/darwin-x64/cmd_i b/test/db/archos/darwin-x86_64/cmd_i
similarity index 100%
rename from test/db/archos/darwin-x64/cmd_i
rename to test/db/archos/darwin-x86_64/cmd_i
diff --git a/test/db/archos/darwin-x64/cmd_interpreter b/test/db/archos/darwin-x86_64/cmd_interpreter
similarity index 100%
rename from test/db/archos/darwin-x64/cmd_interpreter
rename to test/db/archos/darwin-x86_64/cmd_interpreter
diff --git a/test/db/archos/darwin-x64/http b/test/db/archos/darwin-x86_64/http
similarity index 100%
rename from test/db/archos/darwin-x64/http
rename to test/db/archos/darwin-x86_64/http
diff --git a/test/db/archos/linux-x64/.dbg_fork b/test/db/archos/linux-x86_64/.dbg_fork
similarity index 100%
rename from test/db/archos/linux-x64/.dbg_fork
rename to test/db/archos/linux-x86_64/.dbg_fork
diff --git a/test/db/archos/linux-x64/.dbg_fork2 b/test/db/archos/linux-x86_64/.dbg_fork2
similarity index 100%
rename from test/db/archos/linux-x64/.dbg_fork2
rename to test/db/archos/linux-x86_64/.dbg_fork2
diff --git a/test/db/archos/linux-x64/bug_6678 b/test/db/archos/linux-x86_64/bug_6678
similarity index 100%
rename from test/db/archos/linux-x64/bug_6678
rename to test/db/archos/linux-x86_64/bug_6678
diff --git a/test/db/archos/linux-x64/cmd_dd b/test/db/archos/linux-x86_64/cmd_dd
similarity index 99%
rename from test/db/archos/linux-x64/cmd_dd
rename to test/db/archos/linux-x86_64/cmd_dd
index 9888fe9dba..4022bf86dd 100644
--- a/test/db/archos/linux-x64/cmd_dd
+++ b/test/db/archos/linux-x86_64/cmd_dd
@@ -1,4 +1,5 @@
 NAME=basic dd usage
+BROKEN=1
 FILE=bins/elf/ls-focal
 ARGS=-d
 CMDS=<<EOF
@@ -37,6 +38,7 @@ EOF
 RUN
 
 NAME=dd open, close, duplicate
+BROKEN=1
 FILE=bins/elf/ls-focal
 ARGS=-d
 CMDS=<<EOF
@@ -72,6 +74,7 @@ EOF
 RUN
 
 NAME=dd read, write, seek
+BROKEN=1
 FILE=bins/elf/ls-focal
 ARGS=-d
 CMDS=<<EOF
@@ -125,6 +128,7 @@ EOF
 RUN
 
 NAME=ddf
+BROKEN=1
 FILE=bins/elf/ls-focal
 ARGS=-d
 CMDS=<<EOF
diff --git a/test/db/archos/linux-x64/cmd_di_onsignals b/test/db/archos/linux-x86_64/cmd_di_onsignals
similarity index 97%
rename from test/db/archos/linux-x64/cmd_di_onsignals
rename to test/db/archos/linux-x86_64/cmd_di_onsignals
index 6f4ab499c5..e466ba4f7b 100644
--- a/test/db/archos/linux-x64/cmd_di_onsignals
+++ b/test/db/archos/linux-x86_64/cmd_di_onsignals
@@ -1,4 +1,5 @@
 NAME=di on SIGABRT
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=6 -d
 CMDS=<<EOF
@@ -22,6 +23,7 @@ RUN
 
 
 NAME=di on SIGALRM
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=14 -d
 CMDS=<<EOF
@@ -45,6 +47,7 @@ RUN
 
 
 NAME=di on SIGBUS
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=7 -d
 CMDS=<<EOF
@@ -68,6 +71,7 @@ RUN
 
 
 NAME=di on SIGCHLD
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=17 -d
 CMDS=<<EOF
@@ -91,6 +95,7 @@ RUN
 
 
 NAME=di on SIGCONT
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=18 -d
 CMDS=<<EOF
@@ -114,6 +119,7 @@ RUN
 
 
 NAME=di on SIGFPE
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=8 -d
 CMDS=<<EOF
@@ -137,6 +143,7 @@ RUN
 
 
 NAME=di on SIGHUP
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=1 -d
 CMDS=<<EOF
@@ -160,6 +167,7 @@ RUN
 
 
 NAME=di on SIGILL
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=4 -d
 CMDS=<<EOF
@@ -183,6 +191,7 @@ RUN
 
 
 NAME=di on SIGPWR
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=30 -d
 CMDS=<<EOF
@@ -206,6 +215,7 @@ RUN
 
 
 NAME=di on SIGINT
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=2 -d
 CMDS=<<EOF
@@ -228,6 +238,7 @@ RUN
 
 
 NAME=di on SIGIO
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=29 -d
 CMDS=<<EOF
@@ -251,6 +262,7 @@ RUN
 
 
 NAME=di on SIGKILL
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=9 -d
 CMDS=<<EOF
@@ -272,6 +284,7 @@ RUN
 
 
 NAME=di on SIGPIPE
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=13 -d
 CMDS=<<EOF
@@ -295,6 +308,7 @@ RUN
 
 
 NAME=di on SIGPROF
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=27 -d
 CMDS=<<EOF
@@ -318,6 +332,7 @@ RUN
 
 
 NAME=di on SIGQUIT
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=3 -d
 CMDS=<<EOF
@@ -341,6 +356,7 @@ RUN
 
 
 NAME=di on SIGSEGV
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=11 -d
 CMDS=<<EOF
@@ -387,6 +403,7 @@ RUN
 
 
 NAME=di on SIGSTOP
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=19 -d
 CMDS=<<EOF
@@ -409,6 +426,7 @@ RUN
 
 
 NAME=di on SIGSYS
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=31 -d
 CMDS=<<EOF
@@ -432,6 +450,7 @@ RUN
 
 
 NAME=di on SIGTERM
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=15 -d
 CMDS=<<EOF
@@ -453,6 +472,7 @@ EOF
 RUN
 
 NAME=di on SIGTRAP
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=5 -d
 CMDS=<<EOF
@@ -475,6 +495,7 @@ RUN
 
 
 NAME=di on SIGTSTP
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=20 -d
 CMDS=<<EOF
@@ -498,6 +519,7 @@ RUN
 
 
 NAME=di on SIGTTIN
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=21 -d
 CMDS=<<EOF
@@ -521,6 +543,7 @@ RUN
 
 
 NAME=di on SIGTTOU
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=22 -d
 CMDS=<<EOF
@@ -544,6 +567,7 @@ RUN
 
 
 NAME=di on SIGURG
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=23 -d
 CMDS=<<EOF
@@ -567,6 +591,7 @@ RUN
 
 
 NAME=di on SIGUSR1
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=10 -d
 CMDS=<<EOF
@@ -589,6 +614,7 @@ EOF
 RUN
 
 NAME=di on SIGUSR2
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=12 -d
 CMDS=<<EOF
@@ -612,6 +638,7 @@ RUN
 
 
 NAME=di on SIGVTALRM
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=26 -d
 CMDS=<<EOF
@@ -635,6 +662,7 @@ RUN
 
 
 NAME=di on SIGWINCH
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=28 -d
 CMDS=<<EOF
@@ -658,6 +686,7 @@ RUN
 
 
 NAME=di on SIGXCPU
+BROKEN=1
 FILE=bins/elf/signals/signal-input
 ARGS=-e cfg.fortunes=false -e dbg.args=24 -d
 CMDS=<<EOF
@@ -681,7 +710,8 @@ RUN
 
 
 NAME=di on SIGXFSZ
-FILE=bins/elf/signals/signal-input
+BROKEN=1
+FILE=1
 ARGS=-e cfg.fortunes=false -e dbg.args=25 -d
 CMDS=<<EOF
 dc
diff --git a/test/db/archos/linux-x64/cmd_dx b/test/db/archos/linux-x86_64/cmd_dx
similarity index 99%
rename from test/db/archos/linux-x64/cmd_dx
rename to test/db/archos/linux-x86_64/cmd_dx
index 1d303a96cd..abe4e60934 100644
--- a/test/db/archos/linux-x64/cmd_dx
+++ b/test/db/archos/linux-x86_64/cmd_dx
@@ -35,6 +35,7 @@ EOF
 RUN
 
 NAME=dx may clobber registers and stack
+BROKEN=1
 FILE=bins/elf/ls-focal
 ARGS=-d
 CMDS=<<EOF
@@ -221,6 +222,7 @@ EOF
 RUN
 
 NAME=dxa
+BROKEN=1
 FILE=bins/elf/ls-focal
 ARGS=-d
 CMDS=<<EOF
diff --git a/test/db/archos/linux-x64/cmd_i b/test/db/archos/linux-x86_64/cmd_i
similarity index 100%
rename from test/db/archos/linux-x64/cmd_i
rename to test/db/archos/linux-x86_64/cmd_i
diff --git a/test/db/archos/linux-x64/cmd_interpreter b/test/db/archos/linux-x86_64/cmd_interpreter
similarity index 100%
rename from test/db/archos/linux-x64/cmd_interpreter
rename to test/db/archos/linux-x86_64/cmd_interpreter
diff --git a/test/db/archos/linux-x64/dbg b/test/db/archos/linux-x86_64/dbg
similarity index 100%
rename from test/db/archos/linux-x64/dbg
rename to test/db/archos/linux-x86_64/dbg
diff --git a/test/db/archos/linux-x64/dbg_aaa_dcu b/test/db/archos/linux-x86_64/dbg_aaa_dcu
similarity index 100%
rename from test/db/archos/linux-x64/dbg_aaa_dcu
rename to test/db/archos/linux-x86_64/dbg_aaa_dcu
diff --git a/test/db/archos/linux-x64/dbg_aslr b/test/db/archos/linux-x86_64/dbg_aslr
similarity index 100%
rename from test/db/archos/linux-x64/dbg_aslr
rename to test/db/archos/linux-x86_64/dbg_aslr
diff --git a/test/db/archos/linux-x64/dbg_bps b/test/db/archos/linux-x86_64/dbg_bps
similarity index 100%
rename from test/db/archos/linux-x64/dbg_bps
rename to test/db/archos/linux-x86_64/dbg_bps
diff --git a/test/db/archos/linux-x64/dbg_bps2 b/test/db/archos/linux-x86_64/dbg_bps2
similarity index 100%
rename from test/db/archos/linux-x64/dbg_bps2
rename to test/db/archos/linux-x86_64/dbg_bps2
diff --git a/test/db/archos/linux-x64/dbg_cmdbps b/test/db/archos/linux-x86_64/dbg_cmdbps
similarity index 100%
rename from test/db/archos/linux-x64/dbg_cmdbps
rename to test/db/archos/linux-x86_64/dbg_cmdbps
diff --git a/test/db/archos/linux-x64/dbg_cont b/test/db/archos/linux-x86_64/dbg_cont
similarity index 100%
rename from test/db/archos/linux-x64/dbg_cont
rename to test/db/archos/linux-x86_64/dbg_cont
diff --git a/test/db/archos/linux-x64/dbg_cont_back b/test/db/archos/linux-x86_64/dbg_cont_back
similarity index 97%
rename from test/db/archos/linux-x64/dbg_cont_back
rename to test/db/archos/linux-x86_64/dbg_cont_back
index 588b656a93..d149ae561a 100644
--- a/test/db/archos/linux-x64/dbg_cont_back
+++ b/test/db/archos/linux-x86_64/dbg_cont_back
@@ -36,6 +36,7 @@ EOF
 RUN
 
 NAME=dbg.manycontback
+BROKEN=1
 FILE=bins/elf/analysis/ls-linux-x86_64-zlul
 ARGS=-d -e dbg.bpsysign=true
 CMDS=<<EOF
@@ -70,4 +71,4 @@ EXPECT=<<EOF
 0x004028ca
 0x004028a0
 EOF
-RUN
+NORUN
diff --git a/test/db/archos/linux-x64/dbg_dL b/test/db/archos/linux-x86_64/dbg_dL
similarity index 85%
rename from test/db/archos/linux-x64/dbg_dL
rename to test/db/archos/linux-x86_64/dbg_dL
index fa51a3212a..d9c89d5a03 100644
--- a/test/db/archos/linux-x64/dbg_dL
+++ b/test/db/archos/linux-x86_64/dbg_dL
@@ -11,6 +11,7 @@ EXPECT=<<EOF
 6  ---  null     MIT
 7  ---  qnx      LGPL3
 8  ---  rap      LGPL3
-9  ---  winkd    LGPL3
+9  ---  rv32ima  MIT
+10  ---  winkd    LGPL3
 EOF
 RUN
diff --git a/test/db/archos/linux-x64/dbg_dmh b/test/db/archos/linux-x86_64/dbg_dmh
similarity index 97%
rename from test/db/archos/linux-x64/dbg_dmh
rename to test/db/archos/linux-x86_64/dbg_dmh
index 948122886a..24d87ee3ef 100644
--- a/test/db/archos/linux-x64/dbg_dmh
+++ b/test/db/archos/linux-x86_64/dbg_dmh
@@ -15,6 +15,7 @@ EOF
 RUN
 
 NAME=dmh allocated
+BROKEN=1
 FILE=bins/elf/simple_malloc_x86_64
 ARGS=-d
 CMDS=<<EOF
@@ -31,6 +32,7 @@ EOF
 RUN
 
 NAME=dmh/dmha with memory dump
+BROKEN=1
 FILE=bins/heap/linux_glibc-2.30_x64.bin
 ARGS=-n
 CMDS=<<EOF
@@ -52,6 +54,7 @@ EOF
 RUN
 
 NAME=dmht with memory dump
+BROKEN=1
 FILE=bins/heap/linux_glibc-2.30_x64.bin
 ARGS=-n
 CMDS=<<EOF
diff --git a/test/db/archos/linux-x64/dbg_dmht b/test/db/archos/linux-x86_64/dbg_dmht
similarity index 96%
rename from test/db/archos/linux-x64/dbg_dmht
rename to test/db/archos/linux-x86_64/dbg_dmht
index 2cba97b7d9..a30c3b19f4 100644
--- a/test/db/archos/linux-x64/dbg_dmht
+++ b/test/db/archos/linux-x86_64/dbg_dmht
@@ -1,4 +1,5 @@
 NAME=check tcache mangling pointers on glibc 2.32
+BROKEN=1
 FILE=bins/elf/glibc-heap-2.32
 ARGS=-Rsetenv=LD_PRELOAD=bins/elf/libc-2.32.so -d
 CMDS=<<EOF
@@ -23,6 +24,7 @@ EOF
 RUN
 
 NAME=check tcache list on glibc 2.31
+BROKEN=1
 FILE=bins/elf/glibc-heap-2.31
 ARGS=-Rsetenv=LD_PRELOAD=bins/elf/libc-2.31.so -d
 CMDS=<<EOF
@@ -42,6 +44,7 @@ EOF
 RUN
 
 NAME=check tcache list on glibc 2.27
+BROKEN=1
 FILE=bins/elf/glibc-heap-2.27
 ARGS=-Rsetenv=LD_PRELOAD=bins/elf/libc-2.27.so -d
 CMDS=<<EOF
diff --git a/test/db/archos/linux-x64/dbg_dmi b/test/db/archos/linux-x86_64/dbg_dmi
similarity index 99%
rename from test/db/archos/linux-x64/dbg_dmi
rename to test/db/archos/linux-x86_64/dbg_dmi
index 0a0271a5fa..fb6c1b40e8 100644
--- a/test/db/archos/linux-x64/dbg_dmi
+++ b/test/db/archos/linux-x86_64/dbg_dmi
@@ -1,5 +1,6 @@
 NAME=dmi ld
 FILE=bins/elf/ls-focal
+BROKEN=1
 ARGS=-d
 CMDS=<<EOF
 dmiqq ld
diff --git a/test/db/archos/linux-x64/dbg_drt b/test/db/archos/linux-x86_64/dbg_drt
similarity index 96%
rename from test/db/archos/linux-x64/dbg_drt
rename to test/db/archos/linux-x86_64/dbg_drt
index 991baba3e5..07907a999d 100644
--- a/test/db/archos/linux-x64/dbg_drt
+++ b/test/db/archos/linux-x86_64/dbg_drt
@@ -1,7 +1,9 @@
 NAME=drt
+BROKEN=1
 FILE=bins/elf/sse2-add
 ARGS=-d
 CMDS=<<EOF
+# pri register bank is unexpected here
 drt
 EOF
 EXPECT=<<EOF
@@ -108,6 +110,7 @@ EOF
 RUN
 
 NAME=drt flg
+BROKEN=1
 FILE=bins/elf/sse2-add
 ARGS=-d
 CMDS=<<EOF
diff --git a/test/db/archos/linux-x64/dbg_drv b/test/db/archos/linux-x86_64/dbg_drv
similarity index 100%
rename from test/db/archos/linux-x64/dbg_drv
rename to test/db/archos/linux-x86_64/dbg_drv
diff --git a/test/db/archos/linux-x64/dbg_dts b/test/db/archos/linux-x86_64/dbg_dts
similarity index 100%
rename from test/db/archos/linux-x64/dbg_dts
rename to test/db/archos/linux-x86_64/dbg_dts
diff --git a/test/db/archos/linux-x64/dbg_fds b/test/db/archos/linux-x86_64/dbg_fds
similarity index 68%
rename from test/db/archos/linux-x64/dbg_fds
rename to test/db/archos/linux-x86_64/dbg_fds
index b7160f5866..c2557202a1 100644
--- a/test/db/archos/linux-x64/dbg_fds
+++ b/test/db/archos/linux-x86_64/dbg_fds
@@ -1,4 +1,5 @@
 NAME=dbg.fds.count
+BROKEN=1
 FILE=bins/elf/analysis/elf-nx
 ARGS=-d
 CMDS=<<EOF
@@ -25,17 +26,3 @@ EXPECT=<<EOF
 2
 EOF
 RUN
-
-NAME=dbg.fds.count
-FILE=bins/elf/analysis/elf-nx
-ARGS=-d
-CMDS=<<EOF
-dd~?
-dk 9
-EOF
-EXPECT=<<EOF
-3
-EOF
-RUN
-
-
diff --git a/test/db/archos/linux-x64/dbg_io b/test/db/archos/linux-x86_64/dbg_io
similarity index 100%
rename from test/db/archos/linux-x64/dbg_io
rename to test/db/archos/linux-x86_64/dbg_io
diff --git a/test/db/archos/linux-x64/dbg_maps b/test/db/archos/linux-x86_64/dbg_maps
similarity index 100%
rename from test/db/archos/linux-x64/dbg_maps
rename to test/db/archos/linux-x86_64/dbg_maps
diff --git a/test/db/archos/linux-x64/dbg_oo b/test/db/archos/linux-x86_64/dbg_oo
similarity index 100%
rename from test/db/archos/linux-x64/dbg_oo
rename to test/db/archos/linux-x86_64/dbg_oo
diff --git a/test/db/archos/linux-x64/dbg_px0 b/test/db/archos/linux-x86_64/dbg_px0
similarity index 81%
rename from test/db/archos/linux-x64/dbg_px0
rename to test/db/archos/linux-x86_64/dbg_px0
index 726be172f2..65923a7ac5 100644
--- a/test/db/archos/linux-x64/dbg_px0
+++ b/test/db/archos/linux-x86_64/dbg_px0
@@ -3,6 +3,6 @@ FILE=bins/elf/analysis/elf-nx
 ARGS=-d
 CMDS=px0
 EXPECT=<<EOF
-89e083ec0c50e8350c
+89e083ec0c50e8a50c
 EOF
 RUN
diff --git a/test/db/archos/linux-x64/dbg_seginfo b/test/db/archos/linux-x86_64/dbg_seginfo
similarity index 100%
rename from test/db/archos/linux-x64/dbg_seginfo
rename to test/db/archos/linux-x86_64/dbg_seginfo
diff --git a/test/db/archos/linux-x64/dbg_step b/test/db/archos/linux-x86_64/dbg_step
similarity index 100%
rename from test/db/archos/linux-x64/dbg_step
rename to test/db/archos/linux-x86_64/dbg_step
diff --git a/test/db/archos/linux-x64/dbg_step_back b/test/db/archos/linux-x86_64/dbg_step_back
similarity index 99%
rename from test/db/archos/linux-x64/dbg_step_back
rename to test/db/archos/linux-x86_64/dbg_step_back
index c9ddbfa94b..2d9fcb05ac 100644
--- a/test/db/archos/linux-x64/dbg_step_back
+++ b/test/db/archos/linux-x86_64/dbg_step_back
@@ -1,4 +1,5 @@
 NAME=test breakpoint in main
+BROKEN=1
 FILE=bins/elf/analysis/ls-linux-x86_64-zlul
 ARGS=-d -e dbg.bpsysign=true
 CMDS=<<EOF
diff --git a/test/db/archos/linux-x64/dbg_trace1 b/test/db/archos/linux-x86_64/dbg_trace1
similarity index 100%
rename from test/db/archos/linux-x64/dbg_trace1
rename to test/db/archos/linux-x86_64/dbg_trace1
diff --git a/test/db/archos/linux-x64/dbg_trace2 b/test/db/archos/linux-x86_64/dbg_trace2
similarity index 100%
rename from test/db/archos/linux-x64/dbg_trace2
rename to test/db/archos/linux-x86_64/dbg_trace2
diff --git a/test/db/archos/linux-x64/dbg_trace3 b/test/db/archos/linux-x86_64/dbg_trace3
similarity index 100%
rename from test/db/archos/linux-x64/dbg_trace3
rename to test/db/archos/linux-x86_64/dbg_trace3
diff --git a/test/db/archos/linux-x64/dbg_wps b/test/db/archos/linux-x86_64/dbg_wps
similarity index 100%
rename from test/db/archos/linux-x64/dbg_wps
rename to test/db/archos/linux-x86_64/dbg_wps
diff --git a/test/db/archos/linux-x64/http b/test/db/archos/linux-x86_64/http
similarity index 99%
rename from test/db/archos/linux-x64/http
rename to test/db/archos/linux-x86_64/http
index 07f5bbbcc1..e7171af18a 100644
--- a/test/db/archos/linux-x64/http
+++ b/test/db/archos/linux-x86_64/http
@@ -1,4 +1,5 @@
 NAME==h
+BROKEN=1
 FILE=--
 CMDS=!scripts/test-webserver.sh
 EXPECT=<<EOF
@@ -58,4 +59,4 @@ Starting http server...
 open http://localhost:9292/
 r2 -C http://localhost:9292/cmd/
 EOF
-RUN
+NORUN
diff --git a/test/db/archos/linux-x64/shell_uname b/test/db/archos/linux-x86_64/shell_uname
similarity index 100%
rename from test/db/archos/linux-x64/shell_uname
rename to test/db/archos/linux-x86_64/shell_uname
diff --git a/test/db/archos/windows-x64/dbg_rebase b/test/db/archos/windows-x86_64/dbg_rebase
similarity index 100%
rename from test/db/archos/windows-x64/dbg_rebase
rename to test/db/archos/windows-x86_64/dbg_rebase
diff --git a/test/db/archos/windows-x64/http b/test/db/archos/windows-x86_64/http
similarity index 100%
rename from test/db/archos/windows-x64/http
rename to test/db/archos/windows-x86_64/http