[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/10] migration-test: Move hide_stderr to common commandline
From: |
Juan Quintela |
Subject: |
[PATCH 02/10] migration-test: Move hide_stderr to common commandline |
Date: |
Thu, 12 Dec 2019 23:20:25 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
tests/migration-test.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 9573861ede..372e66c755 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -558,6 +558,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
{
gchar *cmd_src, *cmd_dst;
gchar *cmd_source, *cmd_target;
+ const gchar *ignore_stderr;
char *bootpath = NULL;
char *extra_opts = NULL;
char *shmem_path = NULL;
@@ -661,24 +662,19 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
g_free(extra_opts);
if (hide_stderr) {
- gchar *tmp;
- tmp = g_strdup_printf("%s 2>/dev/null", cmd_src);
- g_free(cmd_src);
- cmd_src = tmp;
-
- tmp = g_strdup_printf("%s 2>/dev/null", cmd_dst);
- g_free(cmd_dst);
- cmd_dst = tmp;
+ ignore_stderr = "2>/dev/null";
+ } else {
+ ignore_stderr = "";
}
- cmd_source = g_strdup_printf("%s %s",
- cmd_src, opts_src);
+ cmd_source = g_strdup_printf("%s %s %s",
+ cmd_src, opts_src, ignore_stderr);
g_free(cmd_src);
*from = qtest_init(cmd_source);
g_free(cmd_source);
- cmd_target = g_strdup_printf("%s %s",
- cmd_dst, opts_dst);
+ cmd_target = g_strdup_printf("%s %s %s",
+ cmd_dst, opts_dst, ignore_stderr);
g_free(cmd_dst);
*to = qtest_init(cmd_target);
g_free(cmd_target);
--
2.21.0
- [PATCH 00/10] Migration Arguments cleanup, Juan Quintela, 2019/12/12
- [PATCH 02/10] migration-test: Move hide_stderr to common commandline,
Juan Quintela <=
- [PATCH 01/10] migration-test: Create cmd_soure and cmd_target, Juan Quintela, 2019/12/12
- [PATCH 03/10] migration-test: Move -machine to common commandline, Juan Quintela, 2019/12/12
- [PATCH 04/10] migration-test: Move memory size to common commandline, Juan Quintela, 2019/12/12
- [PATCH 05/10] migration-test: Move shmem handling to common commandline, Juan Quintela, 2019/12/12
- [PATCH 07/10] migration-test: Move -serial handling to common commandline, Juan Quintela, 2019/12/12
- [PATCH 06/10] migration-test: Move -name handling to common commandline, Juan Quintela, 2019/12/12
- [PATCH 08/10] migration-test: Move -incomming handling to common commandline, Juan Quintela, 2019/12/12
- [PATCH 09/10] migration-test: Rename cmd_src/dst to arch_source/arch_target, Juan Quintela, 2019/12/12