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

migration-test: Move hide_stderr to common commandline 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Tested-by: Cornelia Huck <cohuck@redhat.com> #s390x
Tested-by: Laurent Vivier <lvivier@redhat.com>
This commit is contained in:
Juan Quintela 2019-12-12 23:20:25 +01:00 committed by Paolo Bonzini
parent 8443415f9a
commit 1b02371871
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/migration-test.c
View File

@ -558,6 +558,7 @@ static int test_migrate_start(QTestState **from, QTestState **to,
{ {
gchar *cmd_src, *cmd_dst; gchar *cmd_src, *cmd_dst;
gchar *cmd_source, *cmd_target; gchar *cmd_source, *cmd_target;
const gchar *ignore_stderr;
char *bootpath = NULL; char *bootpath = NULL;
char *extra_opts = NULL; char *extra_opts = NULL;
char *shmem_path = NULL; char *shmem_path = NULL;
@ -661,24 +662,19 @@ static int test_migrate_start(QTestState **from, QTestState **to,
g_free(extra_opts); g_free(extra_opts);
if (hide_stderr) { if (hide_stderr) {
gchar *tmp; ignore_stderr = "2>/dev/null";
tmp = g_strdup_printf("%s 2>/dev/null", cmd_src); } else {
g_free(cmd_src); ignore_stderr = "";
cmd_src = tmp;
tmp = g_strdup_printf("%s 2>/dev/null", cmd_dst);
g_free(cmd_dst);
cmd_dst = tmp;
} }
cmd_source = g_strdup_printf("%s %s", cmd_source = g_strdup_printf("%s %s %s",
cmd_src, opts_src); cmd_src, opts_src, ignore_stderr);
g_free(cmd_src); g_free(cmd_src);
*from = qtest_init(cmd_source); *from = qtest_init(cmd_source);
g_free(cmd_source); g_free(cmd_source);
cmd_target = g_strdup_printf("%s %s", cmd_target = g_strdup_printf("%s %s %s",
cmd_dst, opts_dst); cmd_dst, opts_dst, ignore_stderr);
g_free(cmd_dst); g_free(cmd_dst);
*to = qtest_init(cmd_target); *to = qtest_init(cmd_target);
g_free(cmd_target); g_free(cmd_target);