[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-5.2 3/4] qtest: escape device name in device-introspect-test
From: |
Paolo Bonzini |
Subject: |
[PATCH for-5.2 3/4] qtest: escape device name in device-introspect-test |
Date: |
Tue, 3 Nov 2020 10:14:51 -0500 |
device-introspect-test uses HMP, so it should escape the device name
properly. Because of this, a few devices that had commas in their
names were escaping testing.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qtest/device-introspect-test.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/device-introspect-test.c
b/tests/qtest/device-introspect-test.c
index 9f22340ee5..f471b0e0dd 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -104,7 +104,9 @@ static QList *device_type_list(QTestState *qts, bool
abstract)
static void test_one_device(QTestState *qts, const char *type)
{
QDict *resp;
- char *help;
+ g_autofree char *help;
+ g_autofree GRegex *comma;
+ g_autofree char *escaped;
g_test_message("Testing device '%s'", type);
@@ -113,8 +115,9 @@ static void test_one_device(QTestState *qts, const char
*type)
type);
qobject_unref(resp);
- help = qtest_hmp(qts, "device_add \"%s,help\"", type);
- g_free(help);
+ comma = g_regex_new(",", 0, 0, NULL);
+ escaped = g_regex_replace_literal(comma, type, -1, 0, ",,", 0, NULL);
+ help = qtest_hmp(qts, "device_add \"%s,help\"", escaped);
}
static void test_device_intro_list(void)
--
2.26.2
- [PATCH for-5.2 4/4] qemu-option: warn for short-form boolean options, (continued)
[PATCH for-5.2 2/4] qemu-option: move help handling to get_opt_name_value, Paolo Bonzini, 2020/11/03
[PATCH for-5.2 3/4] qtest: escape device name in device-introspect-test,
Paolo Bonzini <=
Re: [PATCH for-5.2 0/4] deprecate short-form boolean options, no-reply, 2020/11/03