Skip to content

Commit 2b163fa

Browse files
notxvilkaXVilka
andauthored
Revert "Revert back linux-x64 dbg tests to Ubuntu 24.04 (20260201) (#5948)" (#5967)
This reverts commit 2eb28f9. Co-authored-by: Anton Kochkov <anton.kochkov@gmail.com>
1 parent 3112994 commit 2b163fa

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

test/db/archos/linux-x64/dbg_maps

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ dm~?
1818
.(dm_clean)
1919
EOF
2020
EXPECT=<<EOF
21-
9
21+
10
2222
0x08048000 - 0x08049000 - usr 4K s r-x .../rizin/test/bins/elf/analysis/elf-nx .../rizin/test/bins/elf/analysis/elf-nx ; ..._rizin_test_bins_elf_analysis_elf_nx.r_x
2323
0x08049000 - 0x0804a000 - usr 4K s rw- .../rizin/test/bins/elf/analysis/elf-nx .../rizin/test/bins/elf/analysis/elf-nx ; ..._rizin_test_bins_elf_analysis_elf_nx.rw
24-
0x________ - 0x________ - usr 16K s r-- [vvar] [vvar] ; vvar_.r
24+
0x________ - 0x________ - usr 8K s r-- [vvar] [vvar] ; vvar_.r
25+
0x________ - 0x________ - usr 8K s r-- [vvar_vclock] [vvar_vclock] ; vvar_vclock_.r
2526
0x________ - 0x________ - usr 8K s r-x [vdso] [vdso] ; vdso_.r_x
2627
0x________ - 0x________ - usr 4K s r-- /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r
2728
0x________ - 0x________ * usr 140K s r-x /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r_x
@@ -40,10 +41,11 @@ fl@F:maps~?
4041
.(fl_F_maps_clean)
4142
EOF
4243
EXPECT=<<EOF
43-
9
44+
10
4445
0x08048000 4096 ..._rizin_test_bins_elf_analysis_elf_nx.r_x
4546
0x08049000 4096 ..._rizin_test_bins_elf_analysis_elf_nx.rw
46-
0x________ 16384 vvar_.r
47+
0x________ 8192 vvar_.r
48+
0x________ 8192 vvar_vclock_.r
4749
0x________ 8192 vdso_.r_x
4850
0x________ 4096 usr_lib32_ld_linux.so.2.r
4951
0x________ 143360 usr_lib32_ld_linux.so.2.r_x
@@ -69,10 +71,10 @@ echo ----
6971
dc
7072
EOF
7173
EXPECT=<<EOF
72-
9
74+
10
7375
0
7476
----
75-
17
77+
18
7678
0x08048000 - 0x08049000 * usr 4K s r-x .../rizin/test/bins/elf/analysis/x86-helloworld-gcc .../rizin/test/bins/elf/analysis/x86-helloworld-gcc ; ..._rizin_test_bins_elf_analysis_x86_helloworld_gcc.r_x
7779
0x08049000 - 0x0804a000 - usr 4K s rw- .../rizin/test/bins/elf/analysis/x86-helloworld-gcc .../rizin/test/bins/elf/analysis/x86-helloworld-gcc ; ..._rizin_test_bins_elf_analysis_x86_helloworld_gcc.rw
7880
0x________ - 0x________ - usr 140K s r-- /usr/lib32/libc.so.6 /usr/lib32/libc.so.6
@@ -82,7 +84,8 @@ EXPECT=<<EOF
8284
0x________ - 0x________ - usr 4K s rw- /usr/lib32/libc.so.6 /usr/lib32/libc.so.6
8385
0x________ - 0x________ - usr 40K s rw- unk0 unk0
8486
0x________ - 0x________ - usr 8K s rw- unk1 unk1
85-
0x________ - 0x________ - usr 16K s r-- [vvar] [vvar] ; vvar_.r
87+
0x________ - 0x________ - usr 8K s r-- [vvar] [vvar] ; vvar_.r
88+
0x________ - 0x________ - usr 8K s r-- [vvar_vclock] [vvar_vclock] ; vvar_vclock_.r
8689
0x________ - 0x________ - usr 8K s r-x [vdso] [vdso] ; vdso_.r_x
8790
0x________ - 0x________ - usr 4K s r-- /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r
8891
0x________ - 0x________ - usr 140K s r-x /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r_x

test/db/archos/linux-x64/dbg_oo

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,11 @@ fl@F:maps~?
102102
.(fl_F_maps_clean)
103103
EOF
104104
EXPECT=<<EOF
105-
9
105+
10
106106
0x08048000 4096 ..._rizin_test_bins_elf_analysis_x86_helloworld_gcc.r_x
107107
0x08049000 4096 ..._rizin_test_bins_elf_analysis_x86_helloworld_gcc.rw
108-
0x________ 16384 vvar_.r
108+
0x________ 8192 vvar_.r
109+
0x________ 8192 vvar_vclock_.r
109110
0x________ 8192 vdso_.r_x
110111
0x________ 4096 usr_lib32_ld_linux.so.2.r
111112
0x________ 143360 usr_lib32_ld_linux.so.2.r_x

0 commit comments

Comments
 (0)