starred/qemu-qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-02-04 02:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/unit: add unit test for qemu_hexdump()

Browse Source 
Test that the fix in commit 20aa05edc2 ("util/hexdump: fix
QEMU_HEXDUMP_LINE_WIDTH logic") make sense.

To not break compilation when we build without 'block', move
hexdump.c out of "if have_block" in meson.build.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20260202112826.38018-1-philmd@linaro.org>
This commit is contained in:
Vladimir Sementsov-Ogievskiy
2025-10-31 20:02:46 +01:00
committed by Philippe Mathieu-Daudé
parent 587f4a1805
commit 7404d6852d
2 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
tests/unit/test-cutils.c
View File

@@ -3626,6 +3626,67 @@ static void test_si_prefix(void)
g_assert_cmpstr(si_prefix(18), ==, "E");
}
static void test_qemu_hexdump_alignment(void)
{
/*
* Test that ASCII part is properly aligned for incomplete lines.
* This test catches the bug that was fixed in previous commit
* "util/hexdump: fix QEMU_HEXDUMP_LINE_WIDTH logic".
*
* We use data that is not aligned to 16 bytes, so last line
* is incomplete.
*/
static const uint8_t data[] = {
/* First line: 16 bytes */
0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, /* "Hello Wo" */
0x72, 0x6c, 0x64, 0x21, 0x20, 0x54, 0x68, 0x69, /* "rld! Thi" */
/* Second line: 5 bytes (incomplete) */
0x73, 0x20, 0x69, 0x73, 0x20 /* "s is " */
};
char *fname = NULL;
int fd;
g_autofree char *output = NULL;
size_t size, bytes_read;
FILE *f;
fd = g_file_open_tmp("test-qemu-hexdump-alignment-XXXXXX", &fname, NULL);
g_assert(fd >= 0);
g_assert_nonnull(fname);
f = fdopen(fd, "w+");
g_assert_nonnull(f);
qemu_hexdump(f, "test", data, sizeof(data));
size = ftell(f);
fseek(f, 0, SEEK_SET);
output = g_malloc(size + 1);
bytes_read = 0;
while (bytes_read < size) {
size_t chunk = fread(output + bytes_read, 1, size - bytes_read, f);
if (chunk == 0) {
break;
}
bytes_read += chunk;
}
g_assert_cmpuint(bytes_read, ==, size);
output[size] = '\0';
fclose(f);
unlink(fname);
g_free(fname);
/* We expect proper alignment of "s is" part on the second line */
static const char *expected =
"test: 0000: 48 65 6c 6c 6f 20 57 6f 72 6c 64 21 20 54 68 69 "
"Hello World! Thi\n"
"test: 0010: 73 20 69 73 20 "
"s is \n";
g_assert_cmpstr(output, ==, expected);
}
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
@@ -3995,5 +4056,10 @@ int main(int argc, char **argv)
test_iec_binary_prefix);
g_test_add_func("/cutils/si_prefix",
test_si_prefix);
/* qemu_hexdump() test */
g_test_add_func("/cutils/qemu_hexdump/alignment",
test_qemu_hexdump_alignment);
return g_test_run();
}

2
util/meson.build
View File

@@ -33,6 +33,7 @@ endif
util_ss.add(files('defer-call.c'))
util_ss.add(files('envlist.c', 'path.c', 'module.c'))
util_ss.add(files('event.c'))
util_ss.add(files('hexdump.c'))
util_ss.add(files('host-utils.c'))
util_ss.add(files('bitmap.c', 'bitops.c'))
util_ss.add(files('fifo8.c'))
@@ -90,7 +91,6 @@ if have_block
util_ss.add(files('buffer.c'))
util_ss.add(files('bufferiszero.c'))
util_ss.add(files('hbitmap.c'))
util_ss.add(files('hexdump.c'))
util_ss.add(files('iova-tree.c'))
util_ss.add(files('iov.c'))
util_ss.add(files('nvdimm-utils.c'))