From patchwork Thu Oct 26 07:52:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 830488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yMzlZ12Gtz9t3J for ; Thu, 26 Oct 2017 18:53:26 +1100 (AEDT) Received: from localhost ([::1]:51471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7cyg-0004eo-4N for incoming@patchwork.ozlabs.org; Thu, 26 Oct 2017 03:53:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7cxt-0004eY-6A for qemu-devel@nongnu.org; Thu, 26 Oct 2017 03:52:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7cxq-0007wh-6i for qemu-devel@nongnu.org; Thu, 26 Oct 2017 03:52:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7cxp-0007wD-UQ for qemu-devel@nongnu.org; Thu, 26 Oct 2017 03:52:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0BA937EE9 for ; Thu, 26 Oct 2017 07:52:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D0BA937EE9 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=quintela@redhat.com Received: from secure.mitica (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5619A5DD6D; Thu, 26 Oct 2017 07:52:27 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 26 Oct 2017 09:52:13 +0200 Message-Id: <20171026075222.27798-2-quintela@redhat.com> In-Reply-To: <20171026075222.27798-1-quintela@redhat.com> References: <20171026075222.27798-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 26 Oct 2017 07:52:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 01/10] tests: rename postcopy-test to migration-test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Instead of repeating the code, we are going to bo more tests on this file Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- MAINTAINERS | 1 + tests/Makefile.include | 6 +++--- tests/{postcopy-test.c => migration-test.c} | 8 +++----- 3 files changed, 7 insertions(+), 8 deletions(-) rename tests/{postcopy-test.c => migration-test.c} (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 12175425a7..8d0a3de734 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1562,6 +1562,7 @@ F: include/migration/ F: migration/ F: scripts/vmstate-static-checker.py F: tests/vmstate-static-checker-data/ +F: tests/migration-test.c F: docs/devel/migration.txt F: qapi/migration.json diff --git a/tests/Makefile.include b/tests/Makefile.include index 70dc711bca..434a2ce868 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -287,7 +287,7 @@ endif check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF) -check-qtest-i386-y += tests/postcopy-test$(EXESUF) +check-qtest-i386-y += tests/migration-test$(EXESUF) check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y += tests/numa-test$(EXESUF) check-qtest-x86_64-y += $(check-qtest-i386-y) @@ -315,7 +315,7 @@ check-qtest-ppc64-y += tests/boot-order-test$(EXESUF) check-qtest-ppc64-y += tests/prom-env-test$(EXESUF) check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF) check-qtest-ppc64-y += tests/drive_del-test$(EXESUF) -check-qtest-ppc64-y += tests/postcopy-test$(EXESUF) +check-qtest-ppc64-y += tests/migration-test$(EXESUF) check-qtest-ppc64-y += tests/boot-serial-test$(EXESUF) check-qtest-ppc64-y += tests/rtas-test$(EXESUF) check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) @@ -784,7 +784,7 @@ tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y) tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y) tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y) tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o -tests/postcopy-test$(EXESUF): tests/postcopy-test.o +tests/migration-test$(EXESUF): tests/migration-test.o tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \ $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \ $(chardev-obj-y) diff --git a/tests/postcopy-test.c b/tests/migration-test.c similarity index 98% rename from tests/postcopy-test.c rename to tests/migration-test.c index 8142f2ab90..55c4aed719 100644 --- a/tests/postcopy-test.c +++ b/tests/migration-test.c @@ -1,5 +1,5 @@ /* - * QTest testcase for postcopy + * QTest testcase for migration * * Copyright (c) 2016 Red Hat, Inc. and/or its affiliates * based on the vhost-user-test.c that is: @@ -243,8 +243,6 @@ static QDict *return_or_event(QDict *response) /* * It's tricky to use qemu's migration event capability with qtest, * events suddenly appearing confuse the qmp()/hmp() responses. - * so wait for a couple of passes to have happened before - * going postcopy. */ static uint64_t get_migration_pass(void) @@ -504,7 +502,7 @@ static void test_migrate(void) int main(int argc, char **argv) { - char template[] = "/tmp/postcopy-test-XXXXXX"; + char template[] = "/tmp/migration-test-XXXXXX"; int ret; g_test_init(&argc, &argv, NULL); @@ -521,7 +519,7 @@ int main(int argc, char **argv) module_call_init(MODULE_INIT_QOM); - qtest_add_func("/postcopy", test_migrate); + qtest_add_func("/migration/postcopy/unix", test_migrate); ret = g_test_run();