ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/test-hmp: Use qtest_init() instead of qtest_start() 

qtest_start() + qtest_end() should be avoided, since they use the
global_qtest variable that we want to get rid of in the long run
Use qtest_init() and qtest_quit() instead.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190409085245.31548-5-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2019-04-09 10:52:44 +02:00
parent da9cd2d06c
commit 8c7eb0987b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/test-hmp.c
View File

@ -73,13 +73,13 @@ static const char *hmp_cmds[] = {
}; };
/* Run through the list of pre-defined commands */ /* Run through the list of pre-defined commands */
static void test_commands(void) static void test_commands(QTestState *qts)
{ {
char *response; char *response;
int i; int i;
for (i = 0; hmp_cmds[i] != NULL; i++) { for (i = 0; hmp_cmds[i] != NULL; i++) {
response = hmp("%s", hmp_cmds[i]); response = qtest_hmp(qts, "%s", hmp_cmds[i]);
if (verbose) { if (verbose) {
fprintf(stderr, fprintf(stderr,
"\texecute HMP command: %s\n" "\texecute HMP command: %s\n"
@ -92,11 +92,11 @@ static void test_commands(void)
} }
/* Run through all info commands and call them blindly (without arguments) */ /* Run through all info commands and call them blindly (without arguments) */
static void test_info_commands(void) static void test_info_commands(QTestState *qts)
{ {
char *resp, *info, *info_buf, *endp; char *resp, *info, *info_buf, *endp;
info_buf = info = hmp("help info"); info_buf = info = qtest_hmp(qts, "help info");
while (*info) { while (*info) {
/* Extract the info command, ignore parameters and description */ /* Extract the info command, ignore parameters and description */
@ -108,7 +108,7 @@ static void test_info_commands(void)
if (verbose) { if (verbose) {
fprintf(stderr, "\t%s\n", info); fprintf(stderr, "\t%s\n", info);
} }
resp = hmp("%s", info); resp = qtest_hmp(qts, "%s", info);
g_free(resp); g_free(resp);
/* And move forward to the next line */ /* And move forward to the next line */
info = strchr(endp + 1, '\n'); info = strchr(endp + 1, '\n');
@ -125,14 +125,15 @@ static void test_machine(gconstpointer data)
{ {
const char *machine = data; const char *machine = data;
char *args; char *args;
QTestState *qts;
args = g_strdup_printf("-S -M %s", machine); args = g_strdup_printf("-S -M %s", machine);
qtest_start(args); qts = qtest_init(args);
test_info_commands(); test_info_commands(qts);
test_commands(); test_commands(qts);
qtest_end(); qtest_quit(qts);
g_free(args); g_free(args);
g_free((void *)data); g_free((void *)data);
} }