From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Test, that fix in previous commit make sense.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20251031190246.257153-3-vsementsov@yandex-team.ru>
[PMD: Wrap long lines]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/unit/test-cutils.c | 45 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c
index 227acc59955..67b1cded64a 100644
--- a/tests/unit/test-cutils.c
+++ b/tests/unit/test-cutils.c
@@ -3626,6 +3626,46 @@ 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.
+ */
+ 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 *output = NULL;
+ size_t size;
+ FILE *stream = open_memstream(&output, &size);
+
+ g_assert_nonnull(stream);
+
+ qemu_hexdump(stream, "test", data, sizeof(data));
+ fclose(stream);
+
+ g_assert_nonnull(output);
+
+ /* We expect proper alignment of "s is" part on the second line */
+ 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);
+
+ free(output);
+}
+
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
@@ -3995,5 +4035,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.51.0