aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2018-07-06 15:31:05 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-06 16:18:31 +0100
commit5fd4a9c97397bc0819a919de7a62ec972ec85260 (patch)
tree102666fac3ec0af7606c59c36b97d5c014d77fb0
parenta428594042bad540479733548b748b78a1a234b8 (diff)
downloadqemu-arm-5fd4a9c97397bc0819a919de7a62ec972ec85260.tar.gz
tests/migration: Skip tests for ppc tcg
PPC tcg seems to be failing migration tests quite regularly; we believe this is TCG bugs in dirty bit updating; it's not clear why PPC fails more but lets skip for the moment. $ ./tests/migration-test /ppc64/migration/deprecated: OK /ppc64/migration/bad_dest: Skipping test: kvm_hv not available OK /ppc64/migration/postcopy/unix: Skipping test: kvm_hv not available OK /ppc64/migration/precopy/unix: Skipping test: kvm_hv not available OK Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> Message-id: 20180706143105.93472-1-dgilbert@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--tests/migration-test.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 3a85446f95..331efb0fe5 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -360,7 +360,7 @@ static void migrate_start_postcopy(QTestState *who)
qobject_unref(rsp);
}
-static void test_migrate_start(QTestState **from, QTestState **to,
+static int test_migrate_start(QTestState **from, QTestState **to,
const char *uri, bool hide_stderr)
{
gchar *cmd_src, *cmd_dst;
@@ -385,9 +385,13 @@ static void test_migrate_start(QTestState **from, QTestState **to,
accel, tmpfs, bootpath, uri);
} else if (strcmp(arch, "ppc64") == 0) {
- /* On ppc64, the test only works with kvm-hv, but not with kvm-pr */
+ /* On ppc64, the test only works with kvm-hv, but not with kvm-pr
+ * and TCG is touchy due to race conditions on dirty bits
+ * (especially on PPC for some reason)
+ */
if (access("/sys/module/kvm_hv", F_OK)) {
- accel = "tcg";
+ g_print("Skipping test: kvm_hv not available ");
+ return -1;
}
cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
" -name source,debug-threads=on"
@@ -424,6 +428,7 @@ static void test_migrate_start(QTestState **from, QTestState **to,
*to = qtest_init(cmd_dst);
g_free(cmd_dst);
+ return 0;
}
static void test_migrate_end(QTestState *from, QTestState *to, bool test_dest)
@@ -510,7 +515,9 @@ static void test_postcopy(void)
char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
QTestState *from, *to;
- test_migrate_start(&from, &to, uri, false);
+ if (test_migrate_start(&from, &to, uri, false)) {
+ return;
+ }
migrate_set_capability(from, "postcopy-ram", "true");
migrate_set_capability(to, "postcopy-ram", "true");
@@ -556,7 +563,9 @@ static void test_baddest(void)
const char *status;
bool failed;
- test_migrate_start(&from, &to, "tcp:0:0", true);
+ if (test_migrate_start(&from, &to, "tcp:0:0", true)) {
+ return;
+ }
migrate(from, "tcp:0:0");
do {
rsp = wait_command(from, "{ 'execute': 'query-migrate' }");
@@ -585,7 +594,9 @@ static void test_precopy_unix(void)
char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
QTestState *from, *to;
- test_migrate_start(&from, &to, uri, false);
+ if (test_migrate_start(&from, &to, uri, false)) {
+ return;
+ }
/* We want to pick a speed slow enough that the test completes
* quickly, but that it doesn't complete precopy even on a slow