From nobody Sat Apr 20 05:08:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568142130; cv=none; d=zoho.com; s=zohoarc; b=BEo/EEAvbULSsWa+YIcSVhFWzh0WgwSGQLNHdS8914X7oPKzzc1G1x5XYT2wW+N1fpATTC+pBvjLe3kjZSUs4L/5bH0NIjNZE45K6XHzmgIfr4w1mWBm6kHPlpqeyTXN5/qWWCZ/Nu9gvuis7q2mRbjLFXMxsE1ZyhslBqwqrnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568142130; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=VUJmGGSD92HYQu9hq4OUK4uPRT89NXjwI45MoZJbm6s=; b=WrznWqoxX8brm00Sbl7iKu6gGQHqQYvMX8FGeXHDrRs78/4c6/wDLFug3R+OmfMQnXr/CBOZ4qgI2nDL6/VM72rcig65T4lwREbP5l35XljtUmw0JKm7P9NaZfa6uLbU3FaFqXt49LqBIVNyDCQtrPnde2T1imQLeiUYOLF78fI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568142130249764.9518210751852; Tue, 10 Sep 2019 12:02:10 -0700 (PDT) Received: from localhost ([::1]:44114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lOn-0001HE-An for importer@patchew.org; Tue, 10 Sep 2019 15:01:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53162) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lLm-0008Pq-Iz for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7lLk-0006AS-AE for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38722) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7lLk-0006A1-4k for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:48 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D7703084288; Tue, 10 Sep 2019 18:58:47 +0000 (UTC) Received: from thuth.com (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 553113DE5; Tue, 10 Sep 2019 18:58:45 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 20:58:33 +0200 Message-Id: <20190910185839.19682-2-thuth@redhat.com> In-Reply-To: <20190910185839.19682-1-thuth@redhat.com> References: <20190910185839.19682-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 10 Sep 2019 18:58:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/7] tests/Makefile: test-char does not need libqtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" No need to link the libqtest objects here. Reviewed-by: John Snow Signed-off-by: Thomas Huth --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index f5ac09549c..50891b8a37 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -525,7 +525,7 @@ tests/check-qlit$(EXESUF): tests/check-qlit.o $(test-ut= il-obj-y) tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom= -obj-y) tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-o= bj-y) =20 -tests/test-char$(EXESUF): tests/test-char.o $(test-util-obj-y) $(qtest-obj= -y) $(test-io-obj-y) $(chardev-obj-y) tests/socket-helpers.o +tests/test-char$(EXESUF): tests/test-char.o $(test-util-obj-y) $(test-io-o= bj-y) $(chardev-obj-y) tests/socket-helpers.o tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y) tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y) tests/test-aio-multithread$(EXESUF): tests/test-aio-multithread.o $(test-b= lock-obj-y) --=20 2.18.1 From nobody Sat Apr 20 05:08:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568142130; cv=none; d=zoho.com; s=zohoarc; b=TA0rkEvf3CQjieUNODzOO73SW6CSBLw021YTV52hFcO6B7llkSbsEkRjYHh9eJQ246Cc2ZeQxR7YeW6yH814s+xVF6JuhQ9qLvi7zvqQ5cKTzv8bsjKCZaZatzbk5PKKLnyByM698vRSiJKqEHUBuufbZ4fwNlJskra/OYRiQVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568142130; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=G+fxtiKenG7RzJfOF/Y2BQz3XYyhgxmg5kIoQQ1MIMc=; b=CmwBWUvYXK0kRK2fx/xHqq8QDPKndXGCa0F6cAC0VFdwMZCMDcR9d8Nb8iFi6J3Eo90r0Wpg/UUWWBQCJTP5xXDdCEXORoT6k93JoHhafd3UGQdjfaShRXSQSvN9LmZ9QQviuXXgkziolCgXgXXjm8z0Wvs/oaeCvDd8zlvpXKA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568142130249420.6318992797035; Tue, 10 Sep 2019 12:02:10 -0700 (PDT) Received: from localhost ([::1]:44116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lOo-0001I7-2G for importer@patchew.org; Tue, 10 Sep 2019 15:01:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53173) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lLm-0008Pr-Tp for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7lLl-0006Bo-VK for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60374) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7lLl-0006BB-Pa for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:49 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EBF8630872C5; Tue, 10 Sep 2019 18:58:48 +0000 (UTC) Received: from thuth.com (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79AA8196AE; Tue, 10 Sep 2019 18:58:47 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 20:58:34 +0200 Message-Id: <20190910185839.19682-3-thuth@redhat.com> In-Reply-To: <20190910185839.19682-1-thuth@redhat.com> References: <20190910185839.19682-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 10 Sep 2019 18:58:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/7] tests/ptimer: Remove unnecessary inclusion of libqtest.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" ptimer-test is a unit test, not a qtest, so libqtest.h is not required here. Signed-off-by: Thomas Huth --- tests/ptimer-test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c index 5b20e91599..927c9ce48f 100644 --- a/tests/ptimer-test.c +++ b/tests/ptimer-test.c @@ -14,7 +14,6 @@ #include "qemu/main-loop.h" #include "hw/ptimer.h" =20 -#include "libqtest.h" #include "ptimer-test.h" =20 static bool triggered; --=20 2.18.1 From nobody Sat Apr 20 05:08:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568142237; cv=none; d=zoho.com; s=zohoarc; b=aAxctfjI6FrNcihB/mEFP9FGPaqPj+QXDs/udT9ToKLAy2yFo1vfzdb+/8kpF7MGPTIMMySMfNMXlf5XBfQKD7pSH9cAMHNFAsyCEQpCWz1JoQX2pNBNpEuF7HonJhFT7ZF8WtlZxkHky71FSTOXhdWxOxh9vZKcmk6bSAemvQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568142237; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=xK64EPqrxrzpPPhrF4OElR874ToYd4D2uXZrbDcgGAw=; b=b9BnwJaXshiWIIltZrSG8Sc4mseEE/LPwdgWe7txUgBy1J5EFENfWvTJssWhSsB0hoZyzbpyTjnxYY7SyRcSvc6rJ91SysPJoioXLWkgmq/aV/sM1GwfedQfpqZsjGZTRmIVUfIK5cmc3B+Iz0kgujBCi72XjqVkCzYvMwpFaek= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568142237276404.78648096145423; Tue, 10 Sep 2019 12:03:57 -0700 (PDT) Received: from localhost ([::1]:44142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lQf-00041g-Te for importer@patchew.org; Tue, 10 Sep 2019 15:03:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53217) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lLv-0008Uy-VK for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7lLr-0006FN-MS for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7lLp-0006CL-92 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C615D3082B67; Tue, 10 Sep 2019 18:58:50 +0000 (UTC) Received: from thuth.com (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53F27196AE; Tue, 10 Sep 2019 18:58:49 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 20:58:35 +0200 Message-Id: <20190910185839.19682-4-thuth@redhat.com> In-Reply-To: <20190910185839.19682-1-thuth@redhat.com> References: <20190910185839.19682-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 10 Sep 2019 18:58:50 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/7] tests/Makefile: Remove 'tests/' and '$(EXESUF)' from the check-qtest variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's much easier if we simply add the folder prefix and the exe suffix later via a substitution instead. Signed-off-by: Thomas Huth --- tests/Makefile.include | 252 ++++++++++++++++++++--------------------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 50891b8a37..2b2fec59c9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -147,150 +147,150 @@ check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SO= FTMMU)) +=3D tests/check-block. # All QTests for now are POSIX-only, but the dependencies are # really in libqtest, not in the testcases themselves. =20 -check-qtest-generic-y +=3D tests/qmp-test$(EXESUF) -check-qtest-generic-y +=3D tests/qmp-cmd-test$(EXESUF) -check-qtest-generic-$(CONFIG_MODULES) +=3D tests/modules-test$(EXESUF) - -check-qtest-generic-y +=3D tests/device-introspect-test$(EXESUF) -check-qtest-generic-y +=3D tests/cdrom-test$(EXESUF) - -check-qtest-pci-$(CONFIG_RTL8139_PCI) +=3D tests/rtl8139-test$(EXESUF) -check-qtest-pci-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) -check-qtest-pci-$(CONFIG_HDA) +=3D tests/intel-hda-test$(EXESUF) -check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) +=3D tests/ivshmem-test$(EXESUF) - -check-qtest-i386-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) -check-qtest-i386-y +=3D tests/fdc-test$(EXESUF) -check-qtest-i386-y +=3D tests/ide-test$(EXESUF) -check-qtest-i386-y +=3D tests/ahci-test$(EXESUF) -check-qtest-i386-y +=3D tests/hd-geo-test$(EXESUF) -check-qtest-i386-y +=3D tests/boot-order-test$(EXESUF) -check-qtest-i386-y +=3D tests/bios-tables-test$(EXESUF) -check-qtest-i386-$(CONFIG_SGA) +=3D tests/boot-serial-test$(EXESUF) -check-qtest-i386-$(CONFIG_SLIRP) +=3D tests/pxe-test$(EXESUF) -check-qtest-i386-y +=3D tests/rtc-test$(EXESUF) -check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D tests/ipmi-kcs-test$(EXESUF) +check-qtest-generic-y +=3D qmp-test +check-qtest-generic-y +=3D qmp-cmd-test +check-qtest-generic-$(CONFIG_MODULES) +=3D modules-test + +check-qtest-generic-y +=3D device-introspect-test +check-qtest-generic-y +=3D cdrom-test + +check-qtest-pci-$(CONFIG_RTL8139_PCI) +=3D rtl8139-test +check-qtest-pci-$(CONFIG_VGA) +=3D display-vga-test +check-qtest-pci-$(CONFIG_HDA) +=3D intel-hda-test +check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test + +check-qtest-i386-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-i386-y +=3D fdc-test +check-qtest-i386-y +=3D ide-test +check-qtest-i386-y +=3D ahci-test +check-qtest-i386-y +=3D hd-geo-test +check-qtest-i386-y +=3D boot-order-test +check-qtest-i386-y +=3D bios-tables-test +check-qtest-i386-$(CONFIG_SGA) +=3D boot-serial-test +check-qtest-i386-$(CONFIG_SLIRP) +=3D pxe-test +check-qtest-i386-y +=3D rtc-test +check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D ipmi-kcs-test # Disabled temporarily as it fails intermittently especially under NetBSD = VM -# check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D tests/ipmi-bt-test$(EXESUF) -check-qtest-i386-y +=3D tests/i440fx-test$(EXESUF) -check-qtest-i386-y +=3D tests/fw_cfg-test$(EXESUF) -check-qtest-i386-y +=3D tests/device-plug-test$(EXESUF) -check-qtest-i386-y +=3D tests/drive_del-test$(EXESUF) -check-qtest-i386-$(CONFIG_WDT_IB700) +=3D tests/wdt_ib700-test$(EXESUF) -check-qtest-i386-y +=3D tests/tco-test$(EXESUF) +# check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D ipmi-bt-test +check-qtest-i386-y +=3D i440fx-test +check-qtest-i386-y +=3D fw_cfg-test +check-qtest-i386-y +=3D device-plug-test +check-qtest-i386-y +=3D drive_del-test +check-qtest-i386-$(CONFIG_WDT_IB700) +=3D wdt_ib700-test +check-qtest-i386-y +=3D tco-test check-qtest-i386-y +=3D $(check-qtest-pci-y) -check-qtest-i386-$(CONFIG_PVPANIC) +=3D tests/pvpanic-test$(EXESUF) -check-qtest-i386-$(CONFIG_I82801B11) +=3D tests/i82801b11-test$(EXESUF) -check-qtest-i386-$(CONFIG_IOH3420) +=3D tests/ioh3420-test$(EXESUF) -check-qtest-i386-$(CONFIG_USB_UHCI) +=3D tests/usb-hcd-uhci-test$(EXESUF) +check-qtest-i386-$(CONFIG_PVPANIC) +=3D pvpanic-test +check-qtest-i386-$(CONFIG_I82801B11) +=3D i82801b11-test +check-qtest-i386-$(CONFIG_IOH3420) +=3D ioh3420-test +check-qtest-i386-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy) -check-qtest-i386-y +=3D tests/usb-hcd-ehci-test$(EXESUF) +check-qtest-i386-y +=3D usb-hcd-ehci-test endif -check-qtest-i386-$(CONFIG_USB_XHCI_NEC) +=3D tests/usb-hcd-xhci-test$(EXES= UF) -check-qtest-i386-y +=3D tests/cpu-plug-test$(EXESUF) -check-qtest-i386-y +=3D tests/q35-test$(EXESUF) -check-qtest-i386-y +=3D tests/vmgenid-test$(EXESUF) -check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tests/tpm-crb-swtpm-test$(EXESUF) -check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tests/tpm-crb-test$(EXESUF) -check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tests/tpm-tis-swtpm-test$(EXESUF) -check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tests/tpm-tis-test$(EXESUF) -check-qtest-i386-$(CONFIG_SLIRP) +=3D tests/test-netfilter$(EXESUF) -check-qtest-i386-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) -check-qtest-i386-$(CONFIG_RTL8139_PCI) +=3D tests/test-filter-redirector$(= EXESUF) -check-qtest-i386-y +=3D tests/migration-test$(EXESUF) -check-qtest-i386-y +=3D tests/test-x86-cpuid-compat$(EXESUF) -check-qtest-i386-y +=3D tests/numa-test$(EXESUF) +check-qtest-i386-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test +check-qtest-i386-y +=3D cpu-plug-test +check-qtest-i386-y +=3D q35-test +check-qtest-i386-y +=3D vmgenid-test +check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-swtpm-test +check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-test +check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-swtpm-test +check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-test +check-qtest-i386-$(CONFIG_SLIRP) +=3D test-netfilter +check-qtest-i386-$(CONFIG_POSIX) +=3D test-filter-mirror +check-qtest-i386-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector +check-qtest-i386-y +=3D migration-test +check-qtest-i386-y +=3D test-x86-cpuid-compat +check-qtest-i386-y +=3D numa-test check-qtest-x86_64-y +=3D $(check-qtest-i386-y) =20 -check-qtest-alpha-y +=3D tests/boot-serial-test$(EXESUF) -check-qtest-alpha-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) +check-qtest-alpha-y +=3D boot-serial-test +check-qtest-alpha-$(CONFIG_VGA) +=3D display-vga-test =20 -check-qtest-hppa-y +=3D tests/boot-serial-test$(EXESUF) -check-qtest-hppa-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) +check-qtest-hppa-y +=3D boot-serial-test +check-qtest-hppa-$(CONFIG_VGA) +=3D display-vga-test =20 -check-qtest-m68k-y =3D tests/boot-serial-test$(EXESUF) +check-qtest-m68k-y =3D boot-serial-test =20 -check-qtest-microblaze-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-microblaze-y +=3D boot-serial-test =20 -check-qtest-mips-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) -check-qtest-mips-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) +check-qtest-mips-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-mips-$(CONFIG_VGA) +=3D display-vga-test =20 -check-qtest-mips64-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) -check-qtest-mips64-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) +check-qtest-mips64-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-mips64-$(CONFIG_VGA) +=3D display-vga-test =20 -check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXES= UF) -check-qtest-mips64el-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) +check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-mips64el-$(CONFIG_VGA) +=3D display-vga-test =20 -check-qtest-moxie-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-moxie-y +=3D boot-serial-test =20 -check-qtest-ppc-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) -check-qtest-ppc-y +=3D tests/boot-order-test$(EXESUF) -check-qtest-ppc-y +=3D tests/prom-env-test$(EXESUF) -check-qtest-ppc-y +=3D tests/drive_del-test$(EXESUF) -check-qtest-ppc-y +=3D tests/boot-serial-test$(EXESUF) -check-qtest-ppc-$(CONFIG_M48T59) +=3D tests/m48t59-test$(EXESUF) +check-qtest-ppc-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-ppc-y +=3D boot-order-test +check-qtest-ppc-y +=3D prom-env-test +check-qtest-ppc-y +=3D drive_del-test +check-qtest-ppc-y +=3D boot-serial-test +check-qtest-ppc-$(CONFIG_M48T59) +=3D m48t59-test =20 check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) -check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/device-plug-test$(EXESUF) -check-qtest-ppc64-$(CONFIG_POWERNV) +=3D tests/pnv-xscom-test$(EXESUF) -check-qtest-ppc64-y +=3D tests/migration-test$(EXESUF) -check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/rtas-test$(EXESUF) -check-qtest-ppc64-$(CONFIG_SLIRP) +=3D tests/pxe-test$(EXESUF) -check-qtest-ppc64-$(CONFIG_USB_UHCI) +=3D tests/usb-hcd-uhci-test$(EXESUF) -check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) +=3D tests/usb-hcd-xhci-test$(EXE= SUF) -check-qtest-ppc64-$(CONFIG_SLIRP) +=3D tests/test-netfilter$(EXESUF) -check-qtest-ppc64-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) -check-qtest-ppc64-$(CONFIG_RTL8139_PCI) +=3D tests/test-filter-redirector$= (EXESUF) -check-qtest-ppc64-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) -check-qtest-ppc64-y +=3D tests/numa-test$(EXESUF) -check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) +=3D tests/ivshmem-test$(EXESUF) -check-qtest-ppc64-y +=3D tests/cpu-plug-test$(EXESUF) - -check-qtest-sh4-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) - -check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) - -check-qtest-sparc-y +=3D tests/prom-env-test$(EXESUF) -check-qtest-sparc-y +=3D tests/m48t59-test$(EXESUF) -check-qtest-sparc-y +=3D tests/boot-serial-test$(EXESUF) - -check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESU= F) -check-qtest-sparc64-y +=3D tests/prom-env-test$(EXESUF) -check-qtest-sparc64-y +=3D tests/boot-serial-test$(EXESUF) - -check-qtest-arm-y +=3D tests/microbit-test$(EXESUF) -check-qtest-arm-y +=3D tests/m25p80-test$(EXESUF) -check-qtest-arm-y +=3D tests/test-arm-mptimer$(EXESUF) -check-qtest-arm-y +=3D tests/boot-serial-test$(EXESUF) -check-qtest-arm-y +=3D tests/hexloader-test$(EXESUF) -check-qtest-arm-$(CONFIG_PFLASH_CFI02) +=3D tests/pflash-cfi02-test$(EXESU= F) - -check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) -check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) -check-qtest-aarch64-y +=3D tests/migration-test$(EXESUF) +check-qtest-ppc64-$(CONFIG_PSERIES) +=3D device-plug-test +check-qtest-ppc64-$(CONFIG_POWERNV) +=3D pnv-xscom-test +check-qtest-ppc64-y +=3D migration-test +check-qtest-ppc64-$(CONFIG_PSERIES) +=3D rtas-test +check-qtest-ppc64-$(CONFIG_SLIRP) +=3D pxe-test +check-qtest-ppc64-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test +check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test +check-qtest-ppc64-$(CONFIG_SLIRP) +=3D test-netfilter +check-qtest-ppc64-$(CONFIG_POSIX) +=3D test-filter-mirror +check-qtest-ppc64-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector +check-qtest-ppc64-$(CONFIG_VGA) +=3D display-vga-test +check-qtest-ppc64-y +=3D numa-test +check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test +check-qtest-ppc64-y +=3D cpu-plug-test + +check-qtest-sh4-$(CONFIG_ISA_TESTDEV) =3D endianness-test + +check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) =3D endianness-test + +check-qtest-sparc-y +=3D prom-env-test +check-qtest-sparc-y +=3D m48t59-test +check-qtest-sparc-y +=3D boot-serial-test + +check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-sparc64-y +=3D prom-env-test +check-qtest-sparc64-y +=3D boot-serial-test + +check-qtest-arm-y +=3D microbit-test +check-qtest-arm-y +=3D m25p80-test +check-qtest-arm-y +=3D test-arm-mptimer +check-qtest-arm-y +=3D boot-serial-test +check-qtest-arm-y +=3D hexloader-test +check-qtest-arm-$(CONFIG_PFLASH_CFI02) +=3D pflash-cfi02-test + +check-qtest-aarch64-y =3D numa-test +check-qtest-aarch64-y +=3D boot-serial-test +check-qtest-aarch64-y +=3D migration-test # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditio= nal ifneq ($(ARCH),arm) -check-qtest-aarch64-y +=3D tests/bios-tables-test$(EXESUF) +check-qtest-aarch64-y +=3D bios-tables-test endif =20 check-qtest-microblazeel-y +=3D $(check-qtest-microblaze-y) =20 check-qtest-xtensaeb-y +=3D $(check-qtest-xtensa-y) =20 -check-qtest-s390x-y =3D tests/boot-serial-test$(EXESUF) -check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/pxe-test$(EXESUF) -check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/test-netfilter$(EXESUF) -check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) -check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-redirector$(EXESU= F) -check-qtest-s390x-y +=3D tests/drive_del-test$(EXESUF) -check-qtest-s390x-y +=3D tests/device-plug-test$(EXESUF) -check-qtest-s390x-y +=3D tests/virtio-ccw-test$(EXESUF) -check-qtest-s390x-y +=3D tests/cpu-plug-test$(EXESUF) -check-qtest-s390x-y +=3D tests/migration-test$(EXESUF) - -check-qtest-generic-y +=3D tests/machine-none-test$(EXESUF) -check-qtest-generic-y +=3D tests/qom-test$(EXESUF) -check-qtest-generic-y +=3D tests/test-hmp$(EXESUF) +check-qtest-s390x-y =3D boot-serial-test +check-qtest-s390x-$(CONFIG_SLIRP) +=3D pxe-test +check-qtest-s390x-$(CONFIG_SLIRP) +=3D test-netfilter +check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-mirror +check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-redirector +check-qtest-s390x-y +=3D drive_del-test +check-qtest-s390x-y +=3D device-plug-test +check-qtest-s390x-y +=3D virtio-ccw-test +check-qtest-s390x-y +=3D cpu-plug-test +check-qtest-s390x-y +=3D migration-test + +check-qtest-generic-y +=3D machine-none-test +check-qtest-generic-y +=3D qom-test +check-qtest-generic-y +=3D test-hmp =20 qapi-schema +=3D alternate-any.json qapi-schema +=3D alternate-array.json @@ -763,7 +763,7 @@ qos-test-obj-y +=3D tests/vmxnet3-test.o check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) =20 -check-qtest-generic-y +=3D tests/qos-test$(EXESUF) +check-qtest-generic-y +=3D qos-test tests/qos-test$(EXESUF): $(qos-test-obj-y) =20 tests/qmp-test$(EXESUF): tests/qmp-test.o @@ -846,8 +846,8 @@ tests/migration/initrd-stress.img: tests/migration/stre= ss$(EXESUF) TARGETS=3D$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS =3D $(TARGETS) -check-qtest-y=3D$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) -check-qtest-y +=3D $(check-qtest-generic-y) +check-qtest-y=3D$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%= =3Dtests/%$(EXESUF))) +check-qtest-y +=3D $(check-qtest-generic-y:%=3Dtests/%$(EXESUF)) else QTEST_TARGETS =3D endif @@ -897,7 +897,7 @@ endef =20 .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/a= ll $(check-qtest-y) - $(call do_test_human,$(check-qtest-$*-y) $(check-qtest-generic-y), \ + $(call do_test_human,$(check-qtest-$*-y:%=3Dtests/%$(EXESUF)) $(check-qte= st-generic-y:%=3Dtests/%$(EXESUF)), \ QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) =20 @@ -910,7 +910,7 @@ check-speed: $(check-speed-y) # gtester tests with TAP output =20 $(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qt= est-%.tap: %-softmmu/all $(check-qtest-y) - $(call do_test_tap, $(check-qtest-$*-y) $(check-qtest-generic-y), \ + $(call do_test_tap, $(check-qtest-$*-y:%=3Dtests/%$(EXESUF)) $(check-qtes= t-generic-y:%=3Dtests/%$(EXESUF)), \ QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) =20 @@ -1173,7 +1173,7 @@ check-block: $(patsubst %,check-%, $(check-block-y)) check: check-block check-qapi-schema check-unit check-softfloat check-qtes= t check-decodetree check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) - rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y)) $(check-qtest-generic-y)) + rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/%$(EXESUF))) rm -f tests/test-qapi-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 --=20 2.18.1 From nobody Sat Apr 20 05:08:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568142129; cv=none; d=zoho.com; s=zohoarc; b=VNkRMRVjLPwldgxY8qwkvED+mgaxEEIgpRv2TYZXVj660COeN+uzVJ54dXS9gVTk+hFPyAwu+fFIHsDHq0B/+G0b1tdd48cgwdVd1zfu4eGf26NYY2Fwdft1XDjHtspZ+kTu0+o7Y8ULSe8FVyNijbFWf/BsmE1/G2ZbavitGL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568142129; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=hEQEWJS7wu0Qu9qlUmxLhfvaEgLLblk5BZ8LIjBTxzA=; b=mtW9l4RJK2WQPAZXSf6Nqg9FQT3kKKF/rlVaqn8df3YutbFuP/Ce/u0mWx2Qb6J6VdzWVbBUgKfC4kDYcK5hdaHp4zjbQ5iKKkhQltcOAEGEmxExMlxzXiK9f7qbAklx5XyELwhXSmMZMnKsctHPkBb7YjBycSreeaBeR6AhbAg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568142129647275.7137175260883; Tue, 10 Sep 2019 12:02:09 -0700 (PDT) Received: from localhost ([::1]:44118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lOt-0001MH-Pu for importer@patchew.org; Tue, 10 Sep 2019 15:02:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53209) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lLt-0008UM-UL for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7lLr-0006FZ-Oq for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41914) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7lLq-0006Cw-CY for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:55 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A20698A1C9D; Tue, 10 Sep 2019 18:58:52 +0000 (UTC) Received: from thuth.com (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DDA0196AE; Tue, 10 Sep 2019 18:58:50 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 20:58:36 +0200 Message-Id: <20190910185839.19682-5-thuth@redhat.com> In-Reply-To: <20190910185839.19682-1-thuth@redhat.com> References: <20190910185839.19682-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 10 Sep 2019 18:58:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/7] tests/Makefile: Separate unit test dependencies from qtest dependencies X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some of the unit test dependencies are declared right in the block of the qtest dependencies. Let's move them to the other unit tests instead. Signed-off-by: Thomas Huth --- tests/Makefile.include | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 2b2fec59c9..4687ed60a6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -574,6 +574,11 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-= obj-y) tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y) tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o = hw/core/ptimer.o +tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) +tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-= qapi-obj-y) +tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-b= lock-obj-y) +tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) +tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y) =20 tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y) =20 @@ -813,18 +818,13 @@ tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-= test.o $(libqos-usb-obj-y) tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o tests/migration-test$(EXESUF): tests/migration-test.o tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o -tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) -tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-= qapi-obj-y) -tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-b= lock-obj-y) tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y) tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-= y) tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qt= est-obj-y) tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtes= t-obj-y) tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/i= vshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a -tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o -tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y) tests/numa-test$(EXESUF): tests/numa-test.o tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o test= s/acpi-utils.o tests/cdrom-test$(EXESUF): tests/cdrom-test.o tests/boot-sector.o $(libqos= -obj-y) --=20 2.18.1 From nobody Sat Apr 20 05:08:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568142383; cv=none; d=zoho.com; s=zohoarc; b=EvddO3bgf6qOrz6kQbY8iqqCnbwieOjO8kNSgKZG7eiApxWxgisl7n4D/wj0oWHo763pmJLDrTFsCZDU5L+pTkRWwXlBn77l1/ko00gFcYYO1f+x1KB4BDiEemr7eeqg0k0BgvzKpr9YY6iSXNkFzOLZ/divSS32mvUuEFLEmnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568142383; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gmdECi6ZcSWchLmHw4CzJ9rBSSL8bwigAy7F2wdY7RI=; b=BUbFkO/uoFvnIztIMbFT7B4m8uDJPSbASnE8eZ9joCURZzDcExa0HvtE2Y0OKyycfzE8tMoo6XoRPeimnzdyug7zq+STi5yqHJanyQxOXllZhNBVo34KFdytVsPLUeP8zIPu3Oo6bMHOhZpOj9pM+3QQDTYfq+6J1fnl7UxBDvU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568142383905601.1701646185505; Tue, 10 Sep 2019 12:06:23 -0700 (PDT) Received: from localhost ([::1]:44156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lT4-0006jM-GS for importer@patchew.org; Tue, 10 Sep 2019 15:06:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53265) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lM0-00007S-OI for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7lLt-0006Gb-Re for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7lLr-0006Ey-Lw for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:57 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB9E78A1CAD; Tue, 10 Sep 2019 18:58:54 +0000 (UTC) Received: from thuth.com (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC76719C58; Tue, 10 Sep 2019 18:58:52 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 20:58:37 +0200 Message-Id: <20190910185839.19682-6-thuth@redhat.com> In-Reply-To: <20190910185839.19682-1-thuth@redhat.com> References: <20190910185839.19682-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 10 Sep 2019 18:58:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/7] test: Move qtests to a separate directory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The tests directory itself is pretty overcrowded, and it's hard to see which test belongs to which test subsystem (unit, qtest, ...). Let's move the qtests to a separate folder for more clarity. Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 11 +- MAINTAINERS | 58 +++-- configure | 5 +- tests/Makefile.include | 201 +++++++++--------- tests/{ =3D> qtest}/ac97-test.c | 0 tests/{ =3D> qtest}/acpi-utils.c | 0 tests/{ =3D> qtest}/acpi-utils.h | 0 tests/{ =3D> qtest}/ahci-test.c | 0 .../bios-tables-test-allowed-diff.h | 0 tests/{ =3D> qtest}/bios-tables-test.c | 0 tests/{ =3D> qtest}/boot-order-test.c | 0 tests/{ =3D> qtest}/boot-sector.c | 0 tests/{ =3D> qtest}/boot-sector.h | 0 tests/{ =3D> qtest}/boot-serial-test.c | 0 tests/{ =3D> qtest}/cdrom-test.c | 0 tests/{ =3D> qtest}/cpu-plug-test.c | 0 tests/{ =3D> qtest}/device-introspect-test.c | 0 tests/{ =3D> qtest}/device-plug-test.c | 0 tests/{ =3D> qtest}/display-vga-test.c | 0 tests/{ =3D> qtest}/drive_del-test.c | 0 tests/{ =3D> qtest}/ds1338-test.c | 0 tests/{ =3D> qtest}/e1000-test.c | 0 tests/{ =3D> qtest}/e1000e-test.c | 0 tests/{ =3D> qtest}/eepro100-test.c | 0 tests/{ =3D> qtest}/endianness-test.c | 0 tests/{ =3D> qtest}/es1370-test.c | 0 tests/{ =3D> qtest}/fdc-test.c | 0 tests/{ =3D> qtest}/fw_cfg-test.c | 0 tests/{ =3D> qtest}/hd-geo-test.c | 0 tests/{ =3D> qtest}/hexloader-test.c | 0 tests/{ =3D> qtest}/i440fx-test.c | 0 tests/{ =3D> qtest}/i82801b11-test.c | 0 tests/{ =3D> qtest}/ide-test.c | 0 tests/{ =3D> qtest}/intel-hda-test.c | 0 tests/{ =3D> qtest}/ioh3420-test.c | 0 tests/{ =3D> qtest}/ipmi-bt-test.c | 0 tests/{ =3D> qtest}/ipmi-kcs-test.c | 0 tests/{ =3D> qtest}/ipoctal232-test.c | 0 tests/{ =3D> qtest}/ivshmem-test.c | 0 tests/{ =3D> qtest}/libqtest-single.h | 0 tests/{ =3D> qtest}/libqtest.c | 0 tests/{ =3D> qtest}/libqtest.h | 0 tests/{ =3D> qtest}/m25p80-test.c | 0 tests/{ =3D> qtest}/m48t59-test.c | 0 tests/{ =3D> qtest}/machine-none-test.c | 0 tests/{ =3D> qtest}/megasas-test.c | 0 tests/{ =3D> qtest}/microbit-test.c | 0 tests/{ =3D> qtest}/migration-test.c | 0 tests/{ =3D> qtest}/modules-test.c | 0 tests/{ =3D> qtest}/ne2000-test.c | 0 tests/{ =3D> qtest}/numa-test.c | 0 tests/{ =3D> qtest}/nvme-test.c | 0 tests/{ =3D> qtest}/pca9552-test.c | 0 tests/{ =3D> qtest}/pci-test.c | 0 tests/{ =3D> qtest}/pcnet-test.c | 0 tests/{ =3D> qtest}/pflash-cfi02-test.c | 0 tests/{ =3D> qtest}/pnv-xscom-test.c | 0 tests/{ =3D> qtest}/prom-env-test.c | 0 tests/{ =3D> qtest}/pvpanic-test.c | 0 tests/{ =3D> qtest}/pxe-test.c | 0 tests/{ =3D> qtest}/q35-test.c | 0 tests/{ =3D> qtest}/qmp-cmd-test.c | 0 tests/{ =3D> qtest}/qmp-test.c | 0 tests/{ =3D> qtest}/qom-test.c | 0 tests/{ =3D> qtest}/qos-test.c | 0 tests/{ =3D> qtest}/rtas-test.c | 0 tests/{ =3D> qtest}/rtc-test.c | 0 tests/{ =3D> qtest}/rtl8139-test.c | 0 tests/{ =3D> qtest}/sdhci-test.c | 0 tests/{ =3D> qtest}/spapr-phb-test.c | 0 tests/{ =3D> qtest}/tco-test.c | 0 tests/{ =3D> qtest}/test-arm-mptimer.c | 0 tests/{ =3D> qtest}/test-filter-mirror.c | 0 tests/{ =3D> qtest}/test-filter-redirector.c | 0 tests/{ =3D> qtest}/test-hmp.c | 0 tests/{ =3D> qtest}/test-netfilter.c | 0 tests/{ =3D> qtest}/test-x86-cpuid-compat.c | 0 tests/{ =3D> qtest}/tmp105-test.c | 0 tests/{ =3D> qtest}/tpm-crb-swtpm-test.c | 0 tests/{ =3D> qtest}/tpm-crb-test.c | 0 tests/{ =3D> qtest}/tpm-tests.c | 0 tests/{ =3D> qtest}/tpm-tis-swtpm-test.c | 0 tests/{ =3D> qtest}/tpm-tis-test.c | 0 tests/{ =3D> qtest}/tpm-util.c | 0 tests/{ =3D> qtest}/usb-hcd-ehci-test.c | 0 tests/{ =3D> qtest}/usb-hcd-ohci-test.c | 0 tests/{ =3D> qtest}/usb-hcd-uhci-test.c | 0 tests/{ =3D> qtest}/usb-hcd-xhci-test.c | 0 tests/{ =3D> qtest}/vhost-user-test.c | 0 tests/{ =3D> qtest}/virtio-9p-test.c | 0 tests/{ =3D> qtest}/virtio-blk-test.c | 0 tests/{ =3D> qtest}/virtio-ccw-test.c | 0 tests/{ =3D> qtest}/virtio-net-test.c | 0 tests/{ =3D> qtest}/virtio-rng-test.c | 0 tests/{ =3D> qtest}/virtio-scsi-test.c | 0 tests/{ =3D> qtest}/virtio-serial-test.c | 0 tests/{ =3D> qtest}/virtio-test.c | 0 tests/{ =3D> qtest}/vmgenid-test.c | 0 tests/{ =3D> qtest}/vmxnet3-test.c | 0 tests/{ =3D> qtest}/wdt_ib700-test.c | 0 100 files changed, 138 insertions(+), 137 deletions(-) rename tests/{ =3D> qtest}/ac97-test.c (100%) rename tests/{ =3D> qtest}/acpi-utils.c (100%) rename tests/{ =3D> qtest}/acpi-utils.h (100%) rename tests/{ =3D> qtest}/ahci-test.c (100%) rename tests/{ =3D> qtest}/bios-tables-test-allowed-diff.h (100%) rename tests/{ =3D> qtest}/bios-tables-test.c (100%) rename tests/{ =3D> qtest}/boot-order-test.c (100%) rename tests/{ =3D> qtest}/boot-sector.c (100%) rename tests/{ =3D> qtest}/boot-sector.h (100%) rename tests/{ =3D> qtest}/boot-serial-test.c (100%) rename tests/{ =3D> qtest}/cdrom-test.c (100%) rename tests/{ =3D> qtest}/cpu-plug-test.c (100%) rename tests/{ =3D> qtest}/device-introspect-test.c (100%) rename tests/{ =3D> qtest}/device-plug-test.c (100%) rename tests/{ =3D> qtest}/display-vga-test.c (100%) rename tests/{ =3D> qtest}/drive_del-test.c (100%) rename tests/{ =3D> qtest}/ds1338-test.c (100%) rename tests/{ =3D> qtest}/e1000-test.c (100%) rename tests/{ =3D> qtest}/e1000e-test.c (100%) rename tests/{ =3D> qtest}/eepro100-test.c (100%) rename tests/{ =3D> qtest}/endianness-test.c (100%) rename tests/{ =3D> qtest}/es1370-test.c (100%) rename tests/{ =3D> qtest}/fdc-test.c (100%) rename tests/{ =3D> qtest}/fw_cfg-test.c (100%) rename tests/{ =3D> qtest}/hd-geo-test.c (100%) rename tests/{ =3D> qtest}/hexloader-test.c (100%) rename tests/{ =3D> qtest}/i440fx-test.c (100%) rename tests/{ =3D> qtest}/i82801b11-test.c (100%) rename tests/{ =3D> qtest}/ide-test.c (100%) rename tests/{ =3D> qtest}/intel-hda-test.c (100%) rename tests/{ =3D> qtest}/ioh3420-test.c (100%) rename tests/{ =3D> qtest}/ipmi-bt-test.c (100%) rename tests/{ =3D> qtest}/ipmi-kcs-test.c (100%) rename tests/{ =3D> qtest}/ipoctal232-test.c (100%) rename tests/{ =3D> qtest}/ivshmem-test.c (100%) rename tests/{ =3D> qtest}/libqtest-single.h (100%) rename tests/{ =3D> qtest}/libqtest.c (100%) rename tests/{ =3D> qtest}/libqtest.h (100%) rename tests/{ =3D> qtest}/m25p80-test.c (100%) rename tests/{ =3D> qtest}/m48t59-test.c (100%) rename tests/{ =3D> qtest}/machine-none-test.c (100%) rename tests/{ =3D> qtest}/megasas-test.c (100%) rename tests/{ =3D> qtest}/microbit-test.c (100%) rename tests/{ =3D> qtest}/migration-test.c (100%) rename tests/{ =3D> qtest}/modules-test.c (100%) rename tests/{ =3D> qtest}/ne2000-test.c (100%) rename tests/{ =3D> qtest}/numa-test.c (100%) rename tests/{ =3D> qtest}/nvme-test.c (100%) rename tests/{ =3D> qtest}/pca9552-test.c (100%) rename tests/{ =3D> qtest}/pci-test.c (100%) rename tests/{ =3D> qtest}/pcnet-test.c (100%) rename tests/{ =3D> qtest}/pflash-cfi02-test.c (100%) rename tests/{ =3D> qtest}/pnv-xscom-test.c (100%) rename tests/{ =3D> qtest}/prom-env-test.c (100%) rename tests/{ =3D> qtest}/pvpanic-test.c (100%) rename tests/{ =3D> qtest}/pxe-test.c (100%) rename tests/{ =3D> qtest}/q35-test.c (100%) rename tests/{ =3D> qtest}/qmp-cmd-test.c (100%) rename tests/{ =3D> qtest}/qmp-test.c (100%) rename tests/{ =3D> qtest}/qom-test.c (100%) rename tests/{ =3D> qtest}/qos-test.c (100%) rename tests/{ =3D> qtest}/rtas-test.c (100%) rename tests/{ =3D> qtest}/rtc-test.c (100%) rename tests/{ =3D> qtest}/rtl8139-test.c (100%) rename tests/{ =3D> qtest}/sdhci-test.c (100%) rename tests/{ =3D> qtest}/spapr-phb-test.c (100%) rename tests/{ =3D> qtest}/tco-test.c (100%) rename tests/{ =3D> qtest}/test-arm-mptimer.c (100%) rename tests/{ =3D> qtest}/test-filter-mirror.c (100%) rename tests/{ =3D> qtest}/test-filter-redirector.c (100%) rename tests/{ =3D> qtest}/test-hmp.c (100%) rename tests/{ =3D> qtest}/test-netfilter.c (100%) rename tests/{ =3D> qtest}/test-x86-cpuid-compat.c (100%) rename tests/{ =3D> qtest}/tmp105-test.c (100%) rename tests/{ =3D> qtest}/tpm-crb-swtpm-test.c (100%) rename tests/{ =3D> qtest}/tpm-crb-test.c (100%) rename tests/{ =3D> qtest}/tpm-tests.c (100%) rename tests/{ =3D> qtest}/tpm-tis-swtpm-test.c (100%) rename tests/{ =3D> qtest}/tpm-tis-test.c (100%) rename tests/{ =3D> qtest}/tpm-util.c (100%) rename tests/{ =3D> qtest}/usb-hcd-ehci-test.c (100%) rename tests/{ =3D> qtest}/usb-hcd-ohci-test.c (100%) rename tests/{ =3D> qtest}/usb-hcd-uhci-test.c (100%) rename tests/{ =3D> qtest}/usb-hcd-xhci-test.c (100%) rename tests/{ =3D> qtest}/vhost-user-test.c (100%) rename tests/{ =3D> qtest}/virtio-9p-test.c (100%) rename tests/{ =3D> qtest}/virtio-blk-test.c (100%) rename tests/{ =3D> qtest}/virtio-ccw-test.c (100%) rename tests/{ =3D> qtest}/virtio-net-test.c (100%) rename tests/{ =3D> qtest}/virtio-rng-test.c (100%) rename tests/{ =3D> qtest}/virtio-scsi-test.c (100%) rename tests/{ =3D> qtest}/virtio-serial-test.c (100%) rename tests/{ =3D> qtest}/virtio-test.c (100%) rename tests/{ =3D> qtest}/vmgenid-test.c (100%) rename tests/{ =3D> qtest}/vmxnet3-test.c (100%) rename tests/{ =3D> qtest}/wdt_ib700-test.c (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed8067f5cf..89d7e1e5d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,11 +73,12 @@ build-tci: - ./configure --enable-tcg-interpreter --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; = done)" - make -j2 - - make tests/boot-serial-test tests/cdrom-test tests/pxe-test + - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/px= e-test - for tg in $TARGETS ; do export QTEST_QEMU_BINARY=3D"${tg}-softmmu/qemu-system-${tg}" ; - ./tests/boot-serial-test || exit 1 ; - ./tests/cdrom-test || exit 1 ; + ./tests/qtest/boot-serial-test || exit 1 ; + ./tests/qtest/cdrom-test || exit 1 ; done - - QTEST_QEMU_BINARY=3D"x86_64-softmmu/qemu-system-x86_64" ./tests/pxe-test - - QTEST_QEMU_BINARY=3D"s390x-softmmu/qemu-system-s390x" ./tests/pxe-test = -m slow + - QTEST_QEMU_BINARY=3D"x86_64-softmmu/qemu-system-x86_64" ./tests/qtest/p= xe-test + - QTEST_QEMU_BINARY=3D"s390x-softmmu/qemu-system-s390x" + ./tests/qtest/pxe-test -m slow diff --git a/MAINTAINERS b/MAINTAINERS index 50eaf005f4..9ac4ca180b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -862,7 +862,7 @@ F: hw/*/nrf51*.c F: hw/*/microbit*.c F: include/hw/*/nrf51*.h F: include/hw/*/microbit*.h -F: tests/microbit-test.c +F: tests/qtest/microbit-test.c =20 CRIS Machines ------------- @@ -1325,9 +1325,9 @@ F: hw/ide/ F: hw/block/block.c F: hw/block/cdrom.c F: hw/block/hd-geometry.c -F: tests/ide-test.c -F: tests/ahci-test.c -F: tests/cdrom-test.c +F: tests/qtest/ide-test.c +F: tests/qtest/ahci-test.c +F: tests/qtest/cdrom-test.c F: tests/libqos/ahci* T: git https://github.com/jnsnow/qemu.git ide =20 @@ -1346,7 +1346,7 @@ L: qemu-block@nongnu.org S: Supported F: hw/block/fdc.c F: include/hw/block/fdc.h -F: tests/fdc-test.c +F: tests/qtest/fdc-test.c T: git https://github.com/jnsnow/qemu.git ide =20 OMAP @@ -1384,7 +1384,7 @@ F: hw/acpi/* F: hw/smbios/* F: hw/i386/acpi-build.[hc] F: hw/arm/virt-acpi-build.c -F: tests/bios-tables-test.c +F: tests/qtest/bios-tables-test.c F: tests/acpi-utils.[hc] F: tests/data/acpi/ =20 @@ -1408,7 +1408,7 @@ M: Jason Wang S: Odd Fixes F: hw/net/ F: include/hw/net/ -F: tests/virtio-net-test.c +F: tests/qtest/virtio-net-test.c T: git https://github.com/jasowang/qemu.git net =20 Parallel NOR Flash devices @@ -1424,7 +1424,7 @@ R: Fam Zheng S: Supported F: include/hw/scsi/* F: hw/scsi/* -F: tests/virtio-scsi-test.c +F: tests/qtest/virtio-scsi-test.c T: git https://github.com/bonzini/qemu.git scsi-next =20 SSI @@ -1434,7 +1434,7 @@ F: hw/ssi/* F: hw/block/m25p80.c F: include/hw/ssi/ssi.h X: hw/ssi/xilinx_* -F: tests/m25p80-test.c +F: tests/qtest/m25p80-test.c =20 Xilinx SPI M: Alistair Francis @@ -1453,7 +1453,7 @@ USB M: Gerd Hoffmann S: Maintained F: hw/usb/* -F: tests/usb-*-test.c +F: tests/qtest/usb-*-test.c F: docs/usb2.txt F: docs/usb-storage.txt F: include/hw/usb.h @@ -1515,7 +1515,6 @@ F: hw/virtio/Makefile.objs F: hw/virtio/trace-events F: net/vhost-user.c F: include/hw/virtio/ -F: tests/virtio-balloon-test.c =20 virtio-9p M: Greg Kurz @@ -1523,7 +1522,7 @@ S: Supported F: hw/9pfs/ X: hw/9pfs/xen-9p* F: fsdev/ -F: tests/virtio-9p-test.c +F: tests/qtest/virtio-9p-test.c T: git https://github.com/gkurz/qemu.git 9p-next =20 virtio-blk @@ -1532,7 +1531,7 @@ L: qemu-block@nongnu.org S: Supported F: hw/block/virtio-blk.c F: hw/block/dataplane/* -F: tests/virtio-blk-test.c +F: tests/qtest/virtio-blk-test.c T: git https://github.com/stefanha/qemu.git block =20 virtio-ccw @@ -1559,8 +1558,7 @@ S: Supported F: hw/char/virtio-serial-bus.c F: hw/char/virtio-console.c F: include/hw/virtio/virtio-serial.h -F: tests/virtio-console-test.c -F: tests/virtio-serial-test.c +F: tests/qtest/virtio-serial-test.c =20 virtio-rng M: Amit Shah @@ -1569,7 +1567,7 @@ F: hw/virtio/virtio-rng.c F: include/hw/virtio/virtio-rng.h F: include/sysemu/rng*.h F: backends/rng*.c -F: tests/virtio-rng-test.c +F: tests/qtest/virtio-rng-test.c =20 virtio-crypto M: Gonglei @@ -1583,7 +1581,7 @@ M: Keith Busch L: qemu-block@nongnu.org S: Supported F: hw/block/nvme* -F: tests/nvme-test.c +F: tests/qtest/nvme-test.c =20 megasas M: Hannes Reinecke @@ -1591,7 +1589,7 @@ L: qemu-block@nongnu.org S: Supported F: hw/scsi/megasas.c F: hw/scsi/mfi.h -F: tests/megasas-test.c +F: tests/qtest/megasas-test.c =20 Network packet abstractions M: Dmitry Fleytman @@ -1606,7 +1604,7 @@ M: Dmitry Fleytman S: Maintained F: hw/net/vmxnet* F: hw/scsi/vmw_pvscsi* -F: tests/vmxnet3-test.c +F: tests/qtest/vmxnet3-test.c =20 Rocker M: Jiri Pirko @@ -1648,7 +1646,7 @@ F: docs/generic-loader.txt Intel Hexadecimal Object File Loader M: Su Hang S: Maintained -F: tests/hexloader-test.c +F: tests/qtest/hexloader-test.c F: tests/data/hex-loader/test.hex =20 CHRP NVRAM @@ -1656,7 +1654,7 @@ M: Thomas Huth S: Maintained F: hw/nvram/chrp_nvram.c F: include/hw/nvram/chrp_nvram.h -F: tests/prom-env-test.c +F: tests/qtest/prom-env-test.c =20 VM Generation ID M: Ben Warren @@ -1664,7 +1662,7 @@ S: Maintained F: hw/acpi/vmgenid.c F: include/hw/acpi/vmgenid.h F: docs/specs/vmgenid.txt -F: tests/vmgenid-test.c +F: tests/qtest/vmgenid-test.c F: stubs/vmgenid.c =20 Unimplemented device @@ -1727,7 +1725,7 @@ F: stubs/fw_cfg.c F: include/hw/nvram/fw_cfg.h F: include/standard-headers/linux/qemu_fw_cfg.h F: tests/libqos/fw_cfg.c -F: tests/fw_cfg-test.c +F: tests/qtest/fw_cfg-test.c T: git https://github.com/philmd/qemu.git fw_cfg-next =20 XIVE @@ -1747,9 +1745,9 @@ S: Maintained F: audio/ F: hw/audio/ F: include/hw/audio/ -F: tests/ac97-test.c -F: tests/es1370-test.c -F: tests/intel-hda-test.c +F: tests/qtest/ac97-test.c +F: tests/qtest/es1370-test.c +F: tests/qtest/intel-hda-test.c =20 Block layer core M: Kevin Wolf @@ -2075,8 +2073,8 @@ F: qapi/error.json F: docs/devel/*qmp-* F: docs/interop/*qmp-* F: scripts/qmp/ -F: tests/qmp-test.c -F: tests/qmp-cmd-test.c +F: tests/qtest/qmp-test.c +F: tests/qtest/qmp-cmd-test.c T: git https://repo.or.cz/qemu/armbru.git qapi-next =20 qtest @@ -2088,7 +2086,7 @@ F: qtest.c F: accel/qtest.c F: tests/libqtest* F: tests/libqos/ -F: tests/*-test.c +F: tests/qtest/ =20 Register API M: Alistair Francis @@ -2149,7 +2147,7 @@ F: include/migration/ F: migration/ F: scripts/vmstate-static-checker.py F: tests/vmstate-static-checker-data/ -F: tests/migration-test.c +F: tests/qtest/migration-test.c F: docs/devel/migration.rst F: qapi/migration.json =20 diff --git a/configure b/configure index 95134c0180..59e7397916 100755 --- a/configure +++ b/configure @@ -7927,8 +7927,9 @@ fi # so the build tree will be missing the link back to the new file, and # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. -DIRS=3D"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/q= api-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" -DIRS=3D"$DIRS tests/fp tests/qgraph" +DIRS=3D"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/tcg/xtensa" +DIRS=3D"$DIRS tests/libqos tests/qtest tests/qapi-schema tests/qemu-iotest= s" +DIRS=3D"$DIRS tests/fp tests/vm" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios roms/vgabios" diff --git a/tests/Makefile.include b/tests/Makefile.include index 4687ed60a6..3de768ab5d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -493,7 +493,7 @@ generated-files-y +=3D tests/include/test-qapi-events-s= ub-module.h generated-files-y +=3D tests/test-qapi-events-sub-sub-module.h generated-files-y +=3D tests/test-qapi-introspect.h =20 -QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests +QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 =20 # Deps that are common to various different sets of tests below @@ -671,12 +671,12 @@ tests/test-authz-pam$(EXESUF): tests/test-authz-pam.o= $(test-authz-obj-y) tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \ tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y) -tests/tpm-crb-swtpm-test$(EXESUF): tests/tpm-crb-swtpm-test.o tests/tpm-em= u.o \ - tests/tpm-util.o tests/tpm-tests.o $(test-io-obj-y) -tests/tpm-crb-test$(EXESUF): tests/tpm-crb-test.o tests/tpm-emu.o $(test-i= o-obj-y) -tests/tpm-tis-swtpm-test$(EXESUF): tests/tpm-tis-swtpm-test.o tests/tpm-em= u.o \ - tests/tpm-util.o tests/tpm-tests.o $(test-io-obj-y) -tests/tpm-tis-test$(EXESUF): tests/tpm-tis-test.o tests/tpm-emu.o $(test-i= o-obj-y) +tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o = tests/tpm-emu.o \ + tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) +tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/tpm-em= u.o $(test-io-obj-y) +tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o = tests/tpm-emu.o \ + tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) +tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/tpm-em= u.o $(test-io-obj-y) tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \ tests/io-channel-helpers.o $(test-io-obj-y) tests/test-io-channel-tls$(EXESUF): tests/test-io-channel-tls.o \ @@ -706,7 +706,7 @@ libqos-pc-obj-y +=3D tests/libqos/ahci.o libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos= /usb.o =20 # Devices -qos-test-obj-y =3D tests/qos-test.o $(libqgraph-obj-y) +qos-test-obj-y =3D tests/qtest/qos-test.o $(libqgraph-obj-y) qos-test-obj-y +=3D $(libqos-pc-obj-y) $(libqos-spapr-obj-y) qos-test-obj-y +=3D tests/libqos/e1000e.o qos-test-obj-y +=3D tests/libqos/i2c.o @@ -738,96 +738,96 @@ qos-test-obj-y +=3D tests/libqos/ppc64_pseries-machin= e.o qos-test-obj-y +=3D tests/libqos/x86_64_pc-machine.o =20 # Tests -qos-test-obj-y +=3D tests/ac97-test.o -qos-test-obj-y +=3D tests/ds1338-test.o -qos-test-obj-y +=3D tests/e1000-test.o -qos-test-obj-y +=3D tests/e1000e-test.o -qos-test-obj-y +=3D tests/eepro100-test.o -qos-test-obj-y +=3D tests/es1370-test.o -qos-test-obj-y +=3D tests/ipoctal232-test.o -qos-test-obj-y +=3D tests/megasas-test.o -qos-test-obj-y +=3D tests/ne2000-test.o -qos-test-obj-y +=3D tests/nvme-test.o -qos-test-obj-y +=3D tests/pca9552-test.o -qos-test-obj-y +=3D tests/pci-test.o -qos-test-obj-y +=3D tests/pcnet-test.o -qos-test-obj-y +=3D tests/sdhci-test.o -qos-test-obj-y +=3D tests/spapr-phb-test.o -qos-test-obj-y +=3D tests/tmp105-test.o -qos-test-obj-y +=3D tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y) -qos-test-obj-$(CONFIG_VHOST_NET_USER) +=3D tests/vhost-user-test.o $(chard= ev-obj-y) $(test-io-obj-y) -qos-test-obj-y +=3D tests/virtio-test.o -qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/virtio-9p-test.o -qos-test-obj-y +=3D tests/virtio-blk-test.o -qos-test-obj-y +=3D tests/virtio-net-test.o -qos-test-obj-y +=3D tests/virtio-rng-test.o -qos-test-obj-y +=3D tests/virtio-scsi-test.o -qos-test-obj-y +=3D tests/virtio-serial-test.o -qos-test-obj-y +=3D tests/vmxnet3-test.o +qos-test-obj-y +=3D tests/qtest/ac97-test.o +qos-test-obj-y +=3D tests/qtest/ds1338-test.o +qos-test-obj-y +=3D tests/qtest/e1000-test.o +qos-test-obj-y +=3D tests/qtest/e1000e-test.o +qos-test-obj-y +=3D tests/qtest/eepro100-test.o +qos-test-obj-y +=3D tests/qtest/es1370-test.o +qos-test-obj-y +=3D tests/qtest/ipoctal232-test.o +qos-test-obj-y +=3D tests/qtest/megasas-test.o +qos-test-obj-y +=3D tests/qtest/ne2000-test.o +qos-test-obj-y +=3D tests/qtest/nvme-test.o +qos-test-obj-y +=3D tests/qtest/pca9552-test.o +qos-test-obj-y +=3D tests/qtest/pci-test.o +qos-test-obj-y +=3D tests/qtest/pcnet-test.o +qos-test-obj-y +=3D tests/qtest/sdhci-test.o +qos-test-obj-y +=3D tests/qtest/spapr-phb-test.o +qos-test-obj-y +=3D tests/qtest/tmp105-test.o +qos-test-obj-y +=3D tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y) +qos-test-obj-$(CONFIG_VHOST_NET_USER) +=3D tests/qtest/vhost-user-test.o $= (chardev-obj-y) $(test-io-obj-y) +qos-test-obj-y +=3D tests/qtest/virtio-test.o +qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/virtio-9p-test.o +qos-test-obj-y +=3D tests/qtest/virtio-blk-test.o +qos-test-obj-y +=3D tests/qtest/virtio-net-test.o +qos-test-obj-y +=3D tests/qtest/virtio-rng-test.o +qos-test-obj-y +=3D tests/qtest/virtio-scsi-test.o +qos-test-obj-y +=3D tests/qtest/virtio-serial-test.o +qos-test-obj-y +=3D tests/qtest/vmxnet3-test.o =20 check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) =20 check-qtest-generic-y +=3D qos-test -tests/qos-test$(EXESUF): $(qos-test-obj-y) - -tests/qmp-test$(EXESUF): tests/qmp-test.o -tests/qmp-cmd-test$(EXESUF): tests/qmp-cmd-test.o -tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o -tests/rtc-test$(EXESUF): tests/rtc-test.o -tests/m48t59-test$(EXESUF): tests/m48t59-test.o -tests/hexloader-test$(EXESUF): tests/hexloader-test.o -tests/pflash-cfi02$(EXESUF): tests/pflash-cfi02-test.o -tests/endianness-test$(EXESUF): tests/endianness-test.o -tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) -tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y) -tests/fdc-test$(EXESUF): tests/fdc-test.o -tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y) -tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) qemu-img$(E= XESUF) -tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o -tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o -tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o -tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y) -tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y) -tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \ - tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y) -tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj= -y) -tests/microbit-test$(EXESUF): tests/microbit-test.o -tests/m25p80-test$(EXESUF): tests/m25p80-test.o -tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y) -tests/q35-test$(EXESUF): tests/q35-test.o $(libqos-pc-obj-y) -tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y) -tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y) -tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o -tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o -tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y) -tests/virtio-ccw-test$(EXESUF): tests/virtio-ccw-test.o -tests/display-vga-test$(EXESUF): tests/display-vga-test.o -tests/qom-test$(EXESUF): tests/qom-test.o -tests/test-hmp$(EXESUF): tests/test-hmp.o -tests/machine-none-test$(EXESUF): tests/machine-none-test.o -tests/device-plug-test$(EXESUF): tests/device-plug-test.o -tests/drive_del-test$(EXESUF): tests/drive_del-test.o -tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o -tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o -tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o -tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o -tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-o= bj-y) -tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-o= bj-y) -tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-o= bj-y) -tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o -tests/migration-test$(EXESUF): tests/migration-test.o -tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o -tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y) -tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-= y) -tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qt= est-obj-y) -tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtes= t-obj-y) -tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/i= vshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a -tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o -tests/numa-test$(EXESUF): tests/numa-test.o -tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o test= s/acpi-utils.o -tests/cdrom-test$(EXESUF): tests/cdrom-test.o tests/boot-sector.o $(libqos= -obj-y) +tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y) + +tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o +tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o +tests/qtest/device-introspect-test$(EXESUF): tests/qtest/device-introspect= -test.o +tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o +tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o +tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o +tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o +tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o +tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o $(libqos-o= bj-y) +tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o $(libqos-spapr-obj= -y) +tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o +tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y) +tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o $(libqos-pc-obj-y)= qemu-img$(EXESUF) +tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o +tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o +tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o +tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o $(libq= os-obj-y) +tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(li= bqos-obj-y) +tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \ + tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y) +tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o tests/qtest/boot-sec= tor.o $(libqos-obj-y) +tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o +tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o +tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o $(libqos-pc-ob= j-y) +tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y) +tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o $(libqos-pc-ob= j-y) +tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o $(libqos-pc-= obj-y) +tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o +tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o +tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) +tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o +tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o +tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o +tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o +tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o +tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o +tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o +tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o +tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o +tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o +tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o +tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o $(= libqos-usb-obj-y) +tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(= libqos-usb-obj-y) +tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(= libqos-usb-obj-y) +tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o +tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o +tests/qtest/qemu-iotests/qtest/socket_scm_helper$(EXESUF): tests/qtest/qem= u-iotests/qtest/socket_scm_helper.o +tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-= obj-y) +tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o = $(qtest-obj-y) +tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redir= ector.o $(qtest-obj-y) +tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-com= pat.o $(qtest-obj-y) +tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivsh= mem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) +tests/qtest/vhost-user-bridge$(EXESUF): tests/qtest/vhost-user-bridge.o $(= test-util-obj-y) libvhost-user.a +tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o +tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o +tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/= boot-sector.o tests/qtest/acpi-utils.o +tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o tests/qtest/boot= -sector.o $(libqos-obj-y) =20 tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") @@ -846,13 +846,13 @@ tests/migration/initrd-stress.img: tests/migration/st= ress$(EXESUF) TARGETS=3D$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS =3D $(TARGETS) -check-qtest-y=3D$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%= =3Dtests/%$(EXESUF))) -check-qtest-y +=3D $(check-qtest-generic-y:%=3Dtests/%$(EXESUF)) +check-qtest-y=3D$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%= =3Dtests/qtest/%$(EXESUF))) +check-qtest-y +=3D $(check-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)) else QTEST_TARGETS =3D endif =20 -qtest-obj-y =3D tests/libqtest.o $(test-util-obj-y) +qtest-obj-y =3D tests/qtest/libqtest.o $(test-util-obj-y) $(check-qtest-y): $(qtest-obj-y) =20 tests/test-qga$(EXESUF): qemu-ga$(EXESUF) @@ -897,7 +897,7 @@ endef =20 .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/a= ll $(check-qtest-y) - $(call do_test_human,$(check-qtest-$*-y:%=3Dtests/%$(EXESUF)) $(check-qte= st-generic-y:%=3Dtests/%$(EXESUF)), \ + $(call do_test_human,$(check-qtest-$*-y:%=3Dtests/qtest/%$(EXESUF)) $(che= ck-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)), \ QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) =20 @@ -910,7 +910,7 @@ check-speed: $(check-speed-y) # gtester tests with TAP output =20 $(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qt= est-%.tap: %-softmmu/all $(check-qtest-y) - $(call do_test_tap, $(check-qtest-$*-y:%=3Dtests/%$(EXESUF)) $(check-qtes= t-generic-y:%=3Dtests/%$(EXESUF)), \ + $(call do_test_tap, $(check-qtest-$*-y:%=3Dtests/qtest/%$(EXESUF)) $(chec= k-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)), \ QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) =20 @@ -1172,8 +1172,8 @@ check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARG= ETS)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-block check-qapi-schema check-unit check-softfloat check-qtes= t check-decodetree check-clean: - rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) - rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/%$(EXESUF))) + rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) + rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/qtest= /%$(EXESUF))) rm -f tests/test-qapi-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 @@ -1184,6 +1184,7 @@ clean: check-clean all: $(QEMU_IOTESTS_HELPERS-y) =20 -include $(wildcard tests/*.d) +-include $(wildcard tests/qtest/*.d) -include $(wildcard tests/libqos/*.d) =20 endif diff --git a/tests/ac97-test.c b/tests/qtest/ac97-test.c similarity index 100% rename from tests/ac97-test.c rename to tests/qtest/ac97-test.c diff --git a/tests/acpi-utils.c b/tests/qtest/acpi-utils.c similarity index 100% rename from tests/acpi-utils.c rename to tests/qtest/acpi-utils.c diff --git a/tests/acpi-utils.h b/tests/qtest/acpi-utils.h similarity index 100% rename from tests/acpi-utils.h rename to tests/qtest/acpi-utils.h diff --git a/tests/ahci-test.c b/tests/qtest/ahci-test.c similarity index 100% rename from tests/ahci-test.c rename to tests/qtest/ahci-test.c diff --git a/tests/bios-tables-test-allowed-diff.h b/tests/qtest/bios-table= s-test-allowed-diff.h similarity index 100% rename from tests/bios-tables-test-allowed-diff.h rename to tests/qtest/bios-tables-test-allowed-diff.h diff --git a/tests/bios-tables-test.c b/tests/qtest/bios-tables-test.c similarity index 100% rename from tests/bios-tables-test.c rename to tests/qtest/bios-tables-test.c diff --git a/tests/boot-order-test.c b/tests/qtest/boot-order-test.c similarity index 100% rename from tests/boot-order-test.c rename to tests/qtest/boot-order-test.c diff --git a/tests/boot-sector.c b/tests/qtest/boot-sector.c similarity index 100% rename from tests/boot-sector.c rename to tests/qtest/boot-sector.c diff --git a/tests/boot-sector.h b/tests/qtest/boot-sector.h similarity index 100% rename from tests/boot-sector.h rename to tests/qtest/boot-sector.h diff --git a/tests/boot-serial-test.c b/tests/qtest/boot-serial-test.c similarity index 100% rename from tests/boot-serial-test.c rename to tests/qtest/boot-serial-test.c diff --git a/tests/cdrom-test.c b/tests/qtest/cdrom-test.c similarity index 100% rename from tests/cdrom-test.c rename to tests/qtest/cdrom-test.c diff --git a/tests/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c similarity index 100% rename from tests/cpu-plug-test.c rename to tests/qtest/cpu-plug-test.c diff --git a/tests/device-introspect-test.c b/tests/qtest/device-introspect= -test.c similarity index 100% rename from tests/device-introspect-test.c rename to tests/qtest/device-introspect-test.c diff --git a/tests/device-plug-test.c b/tests/qtest/device-plug-test.c similarity index 100% rename from tests/device-plug-test.c rename to tests/qtest/device-plug-test.c diff --git a/tests/display-vga-test.c b/tests/qtest/display-vga-test.c similarity index 100% rename from tests/display-vga-test.c rename to tests/qtest/display-vga-test.c diff --git a/tests/drive_del-test.c b/tests/qtest/drive_del-test.c similarity index 100% rename from tests/drive_del-test.c rename to tests/qtest/drive_del-test.c diff --git a/tests/ds1338-test.c b/tests/qtest/ds1338-test.c similarity index 100% rename from tests/ds1338-test.c rename to tests/qtest/ds1338-test.c diff --git a/tests/e1000-test.c b/tests/qtest/e1000-test.c similarity index 100% rename from tests/e1000-test.c rename to tests/qtest/e1000-test.c diff --git a/tests/e1000e-test.c b/tests/qtest/e1000e-test.c similarity index 100% rename from tests/e1000e-test.c rename to tests/qtest/e1000e-test.c diff --git a/tests/eepro100-test.c b/tests/qtest/eepro100-test.c similarity index 100% rename from tests/eepro100-test.c rename to tests/qtest/eepro100-test.c diff --git a/tests/endianness-test.c b/tests/qtest/endianness-test.c similarity index 100% rename from tests/endianness-test.c rename to tests/qtest/endianness-test.c diff --git a/tests/es1370-test.c b/tests/qtest/es1370-test.c similarity index 100% rename from tests/es1370-test.c rename to tests/qtest/es1370-test.c diff --git a/tests/fdc-test.c b/tests/qtest/fdc-test.c similarity index 100% rename from tests/fdc-test.c rename to tests/qtest/fdc-test.c diff --git a/tests/fw_cfg-test.c b/tests/qtest/fw_cfg-test.c similarity index 100% rename from tests/fw_cfg-test.c rename to tests/qtest/fw_cfg-test.c diff --git a/tests/hd-geo-test.c b/tests/qtest/hd-geo-test.c similarity index 100% rename from tests/hd-geo-test.c rename to tests/qtest/hd-geo-test.c diff --git a/tests/hexloader-test.c b/tests/qtest/hexloader-test.c similarity index 100% rename from tests/hexloader-test.c rename to tests/qtest/hexloader-test.c diff --git a/tests/i440fx-test.c b/tests/qtest/i440fx-test.c similarity index 100% rename from tests/i440fx-test.c rename to tests/qtest/i440fx-test.c diff --git a/tests/i82801b11-test.c b/tests/qtest/i82801b11-test.c similarity index 100% rename from tests/i82801b11-test.c rename to tests/qtest/i82801b11-test.c diff --git a/tests/ide-test.c b/tests/qtest/ide-test.c similarity index 100% rename from tests/ide-test.c rename to tests/qtest/ide-test.c diff --git a/tests/intel-hda-test.c b/tests/qtest/intel-hda-test.c similarity index 100% rename from tests/intel-hda-test.c rename to tests/qtest/intel-hda-test.c diff --git a/tests/ioh3420-test.c b/tests/qtest/ioh3420-test.c similarity index 100% rename from tests/ioh3420-test.c rename to tests/qtest/ioh3420-test.c diff --git a/tests/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c similarity index 100% rename from tests/ipmi-bt-test.c rename to tests/qtest/ipmi-bt-test.c diff --git a/tests/ipmi-kcs-test.c b/tests/qtest/ipmi-kcs-test.c similarity index 100% rename from tests/ipmi-kcs-test.c rename to tests/qtest/ipmi-kcs-test.c diff --git a/tests/ipoctal232-test.c b/tests/qtest/ipoctal232-test.c similarity index 100% rename from tests/ipoctal232-test.c rename to tests/qtest/ipoctal232-test.c diff --git a/tests/ivshmem-test.c b/tests/qtest/ivshmem-test.c similarity index 100% rename from tests/ivshmem-test.c rename to tests/qtest/ivshmem-test.c diff --git a/tests/libqtest-single.h b/tests/qtest/libqtest-single.h similarity index 100% rename from tests/libqtest-single.h rename to tests/qtest/libqtest-single.h diff --git a/tests/libqtest.c b/tests/qtest/libqtest.c similarity index 100% rename from tests/libqtest.c rename to tests/qtest/libqtest.c diff --git a/tests/libqtest.h b/tests/qtest/libqtest.h similarity index 100% rename from tests/libqtest.h rename to tests/qtest/libqtest.h diff --git a/tests/m25p80-test.c b/tests/qtest/m25p80-test.c similarity index 100% rename from tests/m25p80-test.c rename to tests/qtest/m25p80-test.c diff --git a/tests/m48t59-test.c b/tests/qtest/m48t59-test.c similarity index 100% rename from tests/m48t59-test.c rename to tests/qtest/m48t59-test.c diff --git a/tests/machine-none-test.c b/tests/qtest/machine-none-test.c similarity index 100% rename from tests/machine-none-test.c rename to tests/qtest/machine-none-test.c diff --git a/tests/megasas-test.c b/tests/qtest/megasas-test.c similarity index 100% rename from tests/megasas-test.c rename to tests/qtest/megasas-test.c diff --git a/tests/microbit-test.c b/tests/qtest/microbit-test.c similarity index 100% rename from tests/microbit-test.c rename to tests/qtest/microbit-test.c diff --git a/tests/migration-test.c b/tests/qtest/migration-test.c similarity index 100% rename from tests/migration-test.c rename to tests/qtest/migration-test.c diff --git a/tests/modules-test.c b/tests/qtest/modules-test.c similarity index 100% rename from tests/modules-test.c rename to tests/qtest/modules-test.c diff --git a/tests/ne2000-test.c b/tests/qtest/ne2000-test.c similarity index 100% rename from tests/ne2000-test.c rename to tests/qtest/ne2000-test.c diff --git a/tests/numa-test.c b/tests/qtest/numa-test.c similarity index 100% rename from tests/numa-test.c rename to tests/qtest/numa-test.c diff --git a/tests/nvme-test.c b/tests/qtest/nvme-test.c similarity index 100% rename from tests/nvme-test.c rename to tests/qtest/nvme-test.c diff --git a/tests/pca9552-test.c b/tests/qtest/pca9552-test.c similarity index 100% rename from tests/pca9552-test.c rename to tests/qtest/pca9552-test.c diff --git a/tests/pci-test.c b/tests/qtest/pci-test.c similarity index 100% rename from tests/pci-test.c rename to tests/qtest/pci-test.c diff --git a/tests/pcnet-test.c b/tests/qtest/pcnet-test.c similarity index 100% rename from tests/pcnet-test.c rename to tests/qtest/pcnet-test.c diff --git a/tests/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-test.c similarity index 100% rename from tests/pflash-cfi02-test.c rename to tests/qtest/pflash-cfi02-test.c diff --git a/tests/pnv-xscom-test.c b/tests/qtest/pnv-xscom-test.c similarity index 100% rename from tests/pnv-xscom-test.c rename to tests/qtest/pnv-xscom-test.c diff --git a/tests/prom-env-test.c b/tests/qtest/prom-env-test.c similarity index 100% rename from tests/prom-env-test.c rename to tests/qtest/prom-env-test.c diff --git a/tests/pvpanic-test.c b/tests/qtest/pvpanic-test.c similarity index 100% rename from tests/pvpanic-test.c rename to tests/qtest/pvpanic-test.c diff --git a/tests/pxe-test.c b/tests/qtest/pxe-test.c similarity index 100% rename from tests/pxe-test.c rename to tests/qtest/pxe-test.c diff --git a/tests/q35-test.c b/tests/qtest/q35-test.c similarity index 100% rename from tests/q35-test.c rename to tests/qtest/q35-test.c diff --git a/tests/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c similarity index 100% rename from tests/qmp-cmd-test.c rename to tests/qtest/qmp-cmd-test.c diff --git a/tests/qmp-test.c b/tests/qtest/qmp-test.c similarity index 100% rename from tests/qmp-test.c rename to tests/qtest/qmp-test.c diff --git a/tests/qom-test.c b/tests/qtest/qom-test.c similarity index 100% rename from tests/qom-test.c rename to tests/qtest/qom-test.c diff --git a/tests/qos-test.c b/tests/qtest/qos-test.c similarity index 100% rename from tests/qos-test.c rename to tests/qtest/qos-test.c diff --git a/tests/rtas-test.c b/tests/qtest/rtas-test.c similarity index 100% rename from tests/rtas-test.c rename to tests/qtest/rtas-test.c diff --git a/tests/rtc-test.c b/tests/qtest/rtc-test.c similarity index 100% rename from tests/rtc-test.c rename to tests/qtest/rtc-test.c diff --git a/tests/rtl8139-test.c b/tests/qtest/rtl8139-test.c similarity index 100% rename from tests/rtl8139-test.c rename to tests/qtest/rtl8139-test.c diff --git a/tests/sdhci-test.c b/tests/qtest/sdhci-test.c similarity index 100% rename from tests/sdhci-test.c rename to tests/qtest/sdhci-test.c diff --git a/tests/spapr-phb-test.c b/tests/qtest/spapr-phb-test.c similarity index 100% rename from tests/spapr-phb-test.c rename to tests/qtest/spapr-phb-test.c diff --git a/tests/tco-test.c b/tests/qtest/tco-test.c similarity index 100% rename from tests/tco-test.c rename to tests/qtest/tco-test.c diff --git a/tests/test-arm-mptimer.c b/tests/qtest/test-arm-mptimer.c similarity index 100% rename from tests/test-arm-mptimer.c rename to tests/qtest/test-arm-mptimer.c diff --git a/tests/test-filter-mirror.c b/tests/qtest/test-filter-mirror.c similarity index 100% rename from tests/test-filter-mirror.c rename to tests/qtest/test-filter-mirror.c diff --git a/tests/test-filter-redirector.c b/tests/qtest/test-filter-redir= ector.c similarity index 100% rename from tests/test-filter-redirector.c rename to tests/qtest/test-filter-redirector.c diff --git a/tests/test-hmp.c b/tests/qtest/test-hmp.c similarity index 100% rename from tests/test-hmp.c rename to tests/qtest/test-hmp.c diff --git a/tests/test-netfilter.c b/tests/qtest/test-netfilter.c similarity index 100% rename from tests/test-netfilter.c rename to tests/qtest/test-netfilter.c diff --git a/tests/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-com= pat.c similarity index 100% rename from tests/test-x86-cpuid-compat.c rename to tests/qtest/test-x86-cpuid-compat.c diff --git a/tests/tmp105-test.c b/tests/qtest/tmp105-test.c similarity index 100% rename from tests/tmp105-test.c rename to tests/qtest/tmp105-test.c diff --git a/tests/tpm-crb-swtpm-test.c b/tests/qtest/tpm-crb-swtpm-test.c similarity index 100% rename from tests/tpm-crb-swtpm-test.c rename to tests/qtest/tpm-crb-swtpm-test.c diff --git a/tests/tpm-crb-test.c b/tests/qtest/tpm-crb-test.c similarity index 100% rename from tests/tpm-crb-test.c rename to tests/qtest/tpm-crb-test.c diff --git a/tests/tpm-tests.c b/tests/qtest/tpm-tests.c similarity index 100% rename from tests/tpm-tests.c rename to tests/qtest/tpm-tests.c diff --git a/tests/tpm-tis-swtpm-test.c b/tests/qtest/tpm-tis-swtpm-test.c similarity index 100% rename from tests/tpm-tis-swtpm-test.c rename to tests/qtest/tpm-tis-swtpm-test.c diff --git a/tests/tpm-tis-test.c b/tests/qtest/tpm-tis-test.c similarity index 100% rename from tests/tpm-tis-test.c rename to tests/qtest/tpm-tis-test.c diff --git a/tests/tpm-util.c b/tests/qtest/tpm-util.c similarity index 100% rename from tests/tpm-util.c rename to tests/qtest/tpm-util.c diff --git a/tests/usb-hcd-ehci-test.c b/tests/qtest/usb-hcd-ehci-test.c similarity index 100% rename from tests/usb-hcd-ehci-test.c rename to tests/qtest/usb-hcd-ehci-test.c diff --git a/tests/usb-hcd-ohci-test.c b/tests/qtest/usb-hcd-ohci-test.c similarity index 100% rename from tests/usb-hcd-ohci-test.c rename to tests/qtest/usb-hcd-ohci-test.c diff --git a/tests/usb-hcd-uhci-test.c b/tests/qtest/usb-hcd-uhci-test.c similarity index 100% rename from tests/usb-hcd-uhci-test.c rename to tests/qtest/usb-hcd-uhci-test.c diff --git a/tests/usb-hcd-xhci-test.c b/tests/qtest/usb-hcd-xhci-test.c similarity index 100% rename from tests/usb-hcd-xhci-test.c rename to tests/qtest/usb-hcd-xhci-test.c diff --git a/tests/vhost-user-test.c b/tests/qtest/vhost-user-test.c similarity index 100% rename from tests/vhost-user-test.c rename to tests/qtest/vhost-user-test.c diff --git a/tests/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c similarity index 100% rename from tests/virtio-9p-test.c rename to tests/qtest/virtio-9p-test.c diff --git a/tests/virtio-blk-test.c b/tests/qtest/virtio-blk-test.c similarity index 100% rename from tests/virtio-blk-test.c rename to tests/qtest/virtio-blk-test.c diff --git a/tests/virtio-ccw-test.c b/tests/qtest/virtio-ccw-test.c similarity index 100% rename from tests/virtio-ccw-test.c rename to tests/qtest/virtio-ccw-test.c diff --git a/tests/virtio-net-test.c b/tests/qtest/virtio-net-test.c similarity index 100% rename from tests/virtio-net-test.c rename to tests/qtest/virtio-net-test.c diff --git a/tests/virtio-rng-test.c b/tests/qtest/virtio-rng-test.c similarity index 100% rename from tests/virtio-rng-test.c rename to tests/qtest/virtio-rng-test.c diff --git a/tests/virtio-scsi-test.c b/tests/qtest/virtio-scsi-test.c similarity index 100% rename from tests/virtio-scsi-test.c rename to tests/qtest/virtio-scsi-test.c diff --git a/tests/virtio-serial-test.c b/tests/qtest/virtio-serial-test.c similarity index 100% rename from tests/virtio-serial-test.c rename to tests/qtest/virtio-serial-test.c diff --git a/tests/virtio-test.c b/tests/qtest/virtio-test.c similarity index 100% rename from tests/virtio-test.c rename to tests/qtest/virtio-test.c diff --git a/tests/vmgenid-test.c b/tests/qtest/vmgenid-test.c similarity index 100% rename from tests/vmgenid-test.c rename to tests/qtest/vmgenid-test.c diff --git a/tests/vmxnet3-test.c b/tests/qtest/vmxnet3-test.c similarity index 100% rename from tests/vmxnet3-test.c rename to tests/qtest/vmxnet3-test.c diff --git a/tests/wdt_ib700-test.c b/tests/qtest/wdt_ib700-test.c similarity index 100% rename from tests/wdt_ib700-test.c rename to tests/qtest/wdt_ib700-test.c --=20 2.18.1 From nobody Sat Apr 20 05:08:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568142443; cv=none; d=zoho.com; s=zohoarc; b=ThgNEo3dz56QirxUiB9LQkJBiWEOW9AQRzc/dBr3xCFjskZ2+TLMIx2IT6aa2RxTwqOOhEWXtO4OBQ9hkbWdArv82qDue6kU+nZmmB+NDtvTE1n0Pg13fUmqcovghRONQDUlGCPEgqj2paB63bj7cwXBzeaYGFRa3X/qjb0P734= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568142443; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=XdTvgu/MI4B08jDlj8Rir0srHWdVkzut8QxqeYW12bg=; b=oEEUxjp535zz46QTVR+Y62c/9jOAA0Z/4wEzjx5H1VpVxnX9/mJUPsjs3j1tctJzWpgZUF1OXd2GIlCJ5OC1JH87H0lSFw8QAvK9Zx8sBEu9Pkg8mxpoh4LVIP3bA0ECkUxZSex0+kb13/gaV8UVNxNjHKoYuKLsEy5Wj9KNCGQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568142443739847.9845504664047; Tue, 10 Sep 2019 12:07:23 -0700 (PDT) Received: from localhost ([::1]:44167 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lTu-0007qq-TQ for importer@patchew.org; Tue, 10 Sep 2019 15:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53263) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lM0-00007Q-Na for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7lLv-0006Hg-Ug for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7lLt-0006G7-RB for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:58:59 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D251859FE; Tue, 10 Sep 2019 18:58:56 +0000 (UTC) Received: from thuth.com (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B21419C58; Tue, 10 Sep 2019 18:58:54 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 20:58:38 +0200 Message-Id: <20190910185839.19682-7-thuth@redhat.com> In-Reply-To: <20190910185839.19682-1-thuth@redhat.com> References: <20190910185839.19682-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 10 Sep 2019 18:58:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/7] tests/Makefile: Move qtest-related settings to a separate Makefile.include X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" tests/Makefile.include is pretty much overcrowded. Now that we have a dedicated folder for the qtests, let's move the related settings to a Makefile.include file in that directory instead. Signed-off-by: Thomas Huth --- tests/Makefile.include | 306 +---------------------------------- tests/qtest/Makefile.include | 305 ++++++++++++++++++++++++++++++++++ 2 files changed, 306 insertions(+), 305 deletions(-) create mode 100644 tests/qtest/Makefile.include diff --git a/tests/Makefile.include b/tests/Makefile.include index 3de768ab5d..d68b2d68a8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -144,154 +144,6 @@ check-unit-y +=3D tests/test-qapi-util$(EXESUF) =20 check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) +=3D tests/chec= k-block.sh =20 -# All QTests for now are POSIX-only, but the dependencies are -# really in libqtest, not in the testcases themselves. - -check-qtest-generic-y +=3D qmp-test -check-qtest-generic-y +=3D qmp-cmd-test -check-qtest-generic-$(CONFIG_MODULES) +=3D modules-test - -check-qtest-generic-y +=3D device-introspect-test -check-qtest-generic-y +=3D cdrom-test - -check-qtest-pci-$(CONFIG_RTL8139_PCI) +=3D rtl8139-test -check-qtest-pci-$(CONFIG_VGA) +=3D display-vga-test -check-qtest-pci-$(CONFIG_HDA) +=3D intel-hda-test -check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test - -check-qtest-i386-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-i386-y +=3D fdc-test -check-qtest-i386-y +=3D ide-test -check-qtest-i386-y +=3D ahci-test -check-qtest-i386-y +=3D hd-geo-test -check-qtest-i386-y +=3D boot-order-test -check-qtest-i386-y +=3D bios-tables-test -check-qtest-i386-$(CONFIG_SGA) +=3D boot-serial-test -check-qtest-i386-$(CONFIG_SLIRP) +=3D pxe-test -check-qtest-i386-y +=3D rtc-test -check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D ipmi-kcs-test -# Disabled temporarily as it fails intermittently especially under NetBSD = VM -# check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D ipmi-bt-test -check-qtest-i386-y +=3D i440fx-test -check-qtest-i386-y +=3D fw_cfg-test -check-qtest-i386-y +=3D device-plug-test -check-qtest-i386-y +=3D drive_del-test -check-qtest-i386-$(CONFIG_WDT_IB700) +=3D wdt_ib700-test -check-qtest-i386-y +=3D tco-test -check-qtest-i386-y +=3D $(check-qtest-pci-y) -check-qtest-i386-$(CONFIG_PVPANIC) +=3D pvpanic-test -check-qtest-i386-$(CONFIG_I82801B11) +=3D i82801b11-test -check-qtest-i386-$(CONFIG_IOH3420) +=3D ioh3420-test -check-qtest-i386-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test -ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy) -check-qtest-i386-y +=3D usb-hcd-ehci-test -endif -check-qtest-i386-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test -check-qtest-i386-y +=3D cpu-plug-test -check-qtest-i386-y +=3D q35-test -check-qtest-i386-y +=3D vmgenid-test -check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-swtpm-test -check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-test -check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-swtpm-test -check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-test -check-qtest-i386-$(CONFIG_SLIRP) +=3D test-netfilter -check-qtest-i386-$(CONFIG_POSIX) +=3D test-filter-mirror -check-qtest-i386-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector -check-qtest-i386-y +=3D migration-test -check-qtest-i386-y +=3D test-x86-cpuid-compat -check-qtest-i386-y +=3D numa-test -check-qtest-x86_64-y +=3D $(check-qtest-i386-y) - -check-qtest-alpha-y +=3D boot-serial-test -check-qtest-alpha-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-hppa-y +=3D boot-serial-test -check-qtest-hppa-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-m68k-y =3D boot-serial-test - -check-qtest-microblaze-y +=3D boot-serial-test - -check-qtest-mips-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-mips-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-mips64-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-mips64-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-mips64el-$(CONFIG_VGA) +=3D display-vga-test - -check-qtest-moxie-y +=3D boot-serial-test - -check-qtest-ppc-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-ppc-y +=3D boot-order-test -check-qtest-ppc-y +=3D prom-env-test -check-qtest-ppc-y +=3D drive_del-test -check-qtest-ppc-y +=3D boot-serial-test -check-qtest-ppc-$(CONFIG_M48T59) +=3D m48t59-test - -check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) -check-qtest-ppc64-$(CONFIG_PSERIES) +=3D device-plug-test -check-qtest-ppc64-$(CONFIG_POWERNV) +=3D pnv-xscom-test -check-qtest-ppc64-y +=3D migration-test -check-qtest-ppc64-$(CONFIG_PSERIES) +=3D rtas-test -check-qtest-ppc64-$(CONFIG_SLIRP) +=3D pxe-test -check-qtest-ppc64-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test -check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test -check-qtest-ppc64-$(CONFIG_SLIRP) +=3D test-netfilter -check-qtest-ppc64-$(CONFIG_POSIX) +=3D test-filter-mirror -check-qtest-ppc64-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector -check-qtest-ppc64-$(CONFIG_VGA) +=3D display-vga-test -check-qtest-ppc64-y +=3D numa-test -check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test -check-qtest-ppc64-y +=3D cpu-plug-test - -check-qtest-sh4-$(CONFIG_ISA_TESTDEV) =3D endianness-test - -check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) =3D endianness-test - -check-qtest-sparc-y +=3D prom-env-test -check-qtest-sparc-y +=3D m48t59-test -check-qtest-sparc-y +=3D boot-serial-test - -check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) =3D endianness-test -check-qtest-sparc64-y +=3D prom-env-test -check-qtest-sparc64-y +=3D boot-serial-test - -check-qtest-arm-y +=3D microbit-test -check-qtest-arm-y +=3D m25p80-test -check-qtest-arm-y +=3D test-arm-mptimer -check-qtest-arm-y +=3D boot-serial-test -check-qtest-arm-y +=3D hexloader-test -check-qtest-arm-$(CONFIG_PFLASH_CFI02) +=3D pflash-cfi02-test - -check-qtest-aarch64-y =3D numa-test -check-qtest-aarch64-y +=3D boot-serial-test -check-qtest-aarch64-y +=3D migration-test -# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditio= nal -ifneq ($(ARCH),arm) -check-qtest-aarch64-y +=3D bios-tables-test -endif - -check-qtest-microblazeel-y +=3D $(check-qtest-microblaze-y) - -check-qtest-xtensaeb-y +=3D $(check-qtest-xtensa-y) - -check-qtest-s390x-y =3D boot-serial-test -check-qtest-s390x-$(CONFIG_SLIRP) +=3D pxe-test -check-qtest-s390x-$(CONFIG_SLIRP) +=3D test-netfilter -check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-mirror -check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-redirector -check-qtest-s390x-y +=3D drive_del-test -check-qtest-s390x-y +=3D device-plug-test -check-qtest-s390x-y +=3D virtio-ccw-test -check-qtest-s390x-y +=3D cpu-plug-test -check-qtest-s390x-y +=3D migration-test - -check-qtest-generic-y +=3D machine-none-test -check-qtest-generic-y +=3D qom-test -check-qtest-generic-y +=3D test-hmp - qapi-schema +=3D alternate-any.json qapi-schema +=3D alternate-array.json qapi-schema +=3D alternate-base.json @@ -671,12 +523,6 @@ tests/test-authz-pam$(EXESUF): tests/test-authz-pam.o = $(test-authz-obj-y) tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \ tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y) -tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o = tests/tpm-emu.o \ - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) -tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/tpm-em= u.o $(test-io-obj-y) -tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o = tests/tpm-emu.o \ - tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) -tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/tpm-em= u.o $(test-io-obj-y) tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \ tests/io-channel-helpers.o $(test-io-obj-y) tests/test-io-channel-tls$(EXESUF): tests/test-io-channel-tls.o \ @@ -691,144 +537,6 @@ tests/test-crypto-ivgen$(EXESUF): tests/test-crypto-i= vgen.o $(test-crypto-obj-y) tests/test-crypto-afsplit$(EXESUF): tests/test-crypto-afsplit.o $(test-cry= pto-obj-y) tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-= obj-y) =20 -libqgraph-obj-y =3D tests/libqos/qgraph.o - -libqos-obj-y =3D $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg= .o -libqos-obj-y +=3D tests/libqos/malloc.o -libqos-obj-y +=3D tests/libqos/libqos.o -libqos-spapr-obj-y =3D $(libqos-obj-y) tests/libqos/malloc-spapr.o -libqos-spapr-obj-y +=3D tests/libqos/libqos-spapr.o -libqos-spapr-obj-y +=3D tests/libqos/rtas.o -libqos-spapr-obj-y +=3D tests/libqos/pci-spapr.o -libqos-pc-obj-y =3D $(libqos-obj-y) tests/libqos/pci-pc.o -libqos-pc-obj-y +=3D tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o -libqos-pc-obj-y +=3D tests/libqos/ahci.o -libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos= /usb.o - -# Devices -qos-test-obj-y =3D tests/qtest/qos-test.o $(libqgraph-obj-y) -qos-test-obj-y +=3D $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -qos-test-obj-y +=3D tests/libqos/e1000e.o -qos-test-obj-y +=3D tests/libqos/i2c.o -qos-test-obj-y +=3D tests/libqos/i2c-imx.o -qos-test-obj-y +=3D tests/libqos/i2c-omap.o -qos-test-obj-y +=3D tests/libqos/sdhci.o -qos-test-obj-y +=3D tests/libqos/tpci200.o -qos-test-obj-y +=3D tests/libqos/virtio.o -qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/libqos/virtio-9p.o -qos-test-obj-y +=3D tests/libqos/virtio-balloon.o -qos-test-obj-y +=3D tests/libqos/virtio-blk.o -qos-test-obj-y +=3D tests/libqos/virtio-mmio.o -qos-test-obj-y +=3D tests/libqos/virtio-net.o -qos-test-obj-y +=3D tests/libqos/virtio-pci.o -qos-test-obj-y +=3D tests/libqos/virtio-rng.o -qos-test-obj-y +=3D tests/libqos/virtio-scsi.o -qos-test-obj-y +=3D tests/libqos/virtio-serial.o - -# Machines -qos-test-obj-y +=3D tests/libqos/aarch64-xlnx-zcu102-machine.o -qos-test-obj-y +=3D tests/libqos/arm-imx25-pdk-machine.o -qos-test-obj-y +=3D tests/libqos/arm-n800-machine.o -qos-test-obj-y +=3D tests/libqos/arm-raspi2-machine.o -qos-test-obj-y +=3D tests/libqos/arm-sabrelite-machine.o -qos-test-obj-y +=3D tests/libqos/arm-smdkc210-machine.o -qos-test-obj-y +=3D tests/libqos/arm-virt-machine.o -qos-test-obj-y +=3D tests/libqos/arm-xilinx-zynq-a9-machine.o -qos-test-obj-y +=3D tests/libqos/ppc64_pseries-machine.o -qos-test-obj-y +=3D tests/libqos/x86_64_pc-machine.o - -# Tests -qos-test-obj-y +=3D tests/qtest/ac97-test.o -qos-test-obj-y +=3D tests/qtest/ds1338-test.o -qos-test-obj-y +=3D tests/qtest/e1000-test.o -qos-test-obj-y +=3D tests/qtest/e1000e-test.o -qos-test-obj-y +=3D tests/qtest/eepro100-test.o -qos-test-obj-y +=3D tests/qtest/es1370-test.o -qos-test-obj-y +=3D tests/qtest/ipoctal232-test.o -qos-test-obj-y +=3D tests/qtest/megasas-test.o -qos-test-obj-y +=3D tests/qtest/ne2000-test.o -qos-test-obj-y +=3D tests/qtest/nvme-test.o -qos-test-obj-y +=3D tests/qtest/pca9552-test.o -qos-test-obj-y +=3D tests/qtest/pci-test.o -qos-test-obj-y +=3D tests/qtest/pcnet-test.o -qos-test-obj-y +=3D tests/qtest/sdhci-test.o -qos-test-obj-y +=3D tests/qtest/spapr-phb-test.o -qos-test-obj-y +=3D tests/qtest/tmp105-test.o -qos-test-obj-y +=3D tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y) -qos-test-obj-$(CONFIG_VHOST_NET_USER) +=3D tests/qtest/vhost-user-test.o $= (chardev-obj-y) $(test-io-obj-y) -qos-test-obj-y +=3D tests/qtest/virtio-test.o -qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/virtio-9p-test.o -qos-test-obj-y +=3D tests/qtest/virtio-blk-test.o -qos-test-obj-y +=3D tests/qtest/virtio-net-test.o -qos-test-obj-y +=3D tests/qtest/virtio-rng-test.o -qos-test-obj-y +=3D tests/qtest/virtio-scsi-test.o -qos-test-obj-y +=3D tests/qtest/virtio-serial-test.o -qos-test-obj-y +=3D tests/qtest/vmxnet3-test.o - -check-unit-y +=3D tests/test-qgraph$(EXESUF) -tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) - -check-qtest-generic-y +=3D qos-test -tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y) - -tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o -tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o -tests/qtest/device-introspect-test$(EXESUF): tests/qtest/device-introspect= -test.o -tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o -tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o -tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o -tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o -tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o -tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o $(libqos-o= bj-y) -tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o $(libqos-spapr-obj= -y) -tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o -tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y) -tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o $(libqos-pc-obj-y)= qemu-img$(EXESUF) -tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o -tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o -tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o -tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o $(libq= os-obj-y) -tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(li= bqos-obj-y) -tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \ - tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y) -tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o tests/qtest/boot-sec= tor.o $(libqos-obj-y) -tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o -tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o -tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o $(libqos-pc-ob= j-y) -tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y) -tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o $(libqos-pc-ob= j-y) -tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o $(libqos-pc-= obj-y) -tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o -tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o -tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) -tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o -tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o -tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o -tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o -tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o -tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o -tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o -tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o -tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o -tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o -tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o -tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o $(= libqos-usb-obj-y) -tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(= libqos-usb-obj-y) -tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(= libqos-usb-obj-y) -tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o -tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o -tests/qtest/qemu-iotests/qtest/socket_scm_helper$(EXESUF): tests/qtest/qem= u-iotests/qtest/socket_scm_helper.o -tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-= obj-y) -tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o = $(qtest-obj-y) -tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redir= ector.o $(qtest-obj-y) -tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-com= pat.o $(qtest-obj-y) -tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivsh= mem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -tests/qtest/vhost-user-bridge$(EXESUF): tests/qtest/vhost-user-bridge.o $(= test-util-obj-y) libvhost-user.a -tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o -tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o -tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/= boot-sector.o tests/qtest/acpi-utils.o -tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o tests/qtest/boot= -sector.o $(libqos-obj-y) - tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") =20 @@ -841,19 +549,7 @@ tests/migration/initrd-stress.img: tests/migration/str= ess$(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -# QTest rules - -TARGETS=3D$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) -ifeq ($(CONFIG_POSIX),y) -QTEST_TARGETS =3D $(TARGETS) -check-qtest-y=3D$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%= =3Dtests/qtest/%$(EXESUF))) -check-qtest-y +=3D $(check-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)) -else -QTEST_TARGETS =3D -endif - -qtest-obj-y =3D tests/qtest/libqtest.o $(test-util-obj-y) -$(check-qtest-y): $(qtest-obj-y) +include $(SRC_PATH)/tests/qtest/Makefile.include =20 tests/test-qga$(EXESUF): qemu-ga$(EXESUF) tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include new file mode 100644 index 0000000000..54e1d6fb6c --- /dev/null +++ b/tests/qtest/Makefile.include @@ -0,0 +1,305 @@ +# All QTests for now are POSIX-only, but the dependencies are +# really in libqtest, not in the testcases themselves. + +check-qtest-generic-y +=3D cdrom-test +check-qtest-generic-y +=3D device-introspect-test +check-qtest-generic-y +=3D machine-none-test +check-qtest-generic-$(CONFIG_MODULES) +=3D modules-test +check-qtest-generic-y +=3D qmp-test +check-qtest-generic-y +=3D qmp-cmd-test +check-qtest-generic-y +=3D qom-test +check-qtest-generic-y +=3D test-hmp + +check-qtest-pci-$(CONFIG_RTL8139_PCI) +=3D rtl8139-test +check-qtest-pci-$(CONFIG_VGA) +=3D display-vga-test +check-qtest-pci-$(CONFIG_HDA) +=3D intel-hda-test +check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test + +check-qtest-i386-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-i386-y +=3D fdc-test +check-qtest-i386-y +=3D ide-test +check-qtest-i386-y +=3D ahci-test +check-qtest-i386-y +=3D hd-geo-test +check-qtest-i386-y +=3D boot-order-test +check-qtest-i386-y +=3D bios-tables-test +check-qtest-i386-$(CONFIG_SGA) +=3D boot-serial-test +check-qtest-i386-$(CONFIG_SLIRP) +=3D pxe-test +check-qtest-i386-y +=3D rtc-test +check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D ipmi-kcs-test +# Disabled temporarily as it fails intermittently especially under NetBSD = VM +# check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D ipmi-bt-test +check-qtest-i386-y +=3D i440fx-test +check-qtest-i386-y +=3D fw_cfg-test +check-qtest-i386-y +=3D device-plug-test +check-qtest-i386-y +=3D drive_del-test +check-qtest-i386-$(CONFIG_WDT_IB700) +=3D wdt_ib700-test +check-qtest-i386-y +=3D tco-test +check-qtest-i386-y +=3D $(check-qtest-pci-y) +check-qtest-i386-$(CONFIG_PVPANIC) +=3D pvpanic-test +check-qtest-i386-$(CONFIG_I82801B11) +=3D i82801b11-test +check-qtest-i386-$(CONFIG_IOH3420) +=3D ioh3420-test +check-qtest-i386-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test +ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy) +check-qtest-i386-y +=3D usb-hcd-ehci-test +endif +check-qtest-i386-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test +check-qtest-i386-y +=3D cpu-plug-test +check-qtest-i386-y +=3D q35-test +check-qtest-i386-y +=3D vmgenid-test +check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-swtpm-test +check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-test +check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-swtpm-test +check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-test +check-qtest-i386-$(CONFIG_SLIRP) +=3D test-netfilter +check-qtest-i386-$(CONFIG_POSIX) +=3D test-filter-mirror +check-qtest-i386-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector +check-qtest-i386-y +=3D migration-test +check-qtest-i386-y +=3D test-x86-cpuid-compat +check-qtest-i386-y +=3D numa-test +check-qtest-x86_64-y +=3D $(check-qtest-i386-y) + +check-qtest-alpha-y +=3D boot-serial-test +check-qtest-alpha-$(CONFIG_VGA) +=3D display-vga-test + +check-qtest-hppa-y +=3D boot-serial-test +check-qtest-hppa-$(CONFIG_VGA) +=3D display-vga-test + +check-qtest-m68k-y =3D boot-serial-test + +check-qtest-microblaze-y +=3D boot-serial-test + +check-qtest-mips-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-mips-$(CONFIG_VGA) +=3D display-vga-test + +check-qtest-mips64-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-mips64-$(CONFIG_VGA) +=3D display-vga-test + +check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-mips64el-$(CONFIG_VGA) +=3D display-vga-test + +check-qtest-moxie-y +=3D boot-serial-test + +check-qtest-ppc-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-ppc-y +=3D boot-order-test +check-qtest-ppc-y +=3D prom-env-test +check-qtest-ppc-y +=3D drive_del-test +check-qtest-ppc-y +=3D boot-serial-test +check-qtest-ppc-$(CONFIG_M48T59) +=3D m48t59-test + +check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) +check-qtest-ppc64-$(CONFIG_PSERIES) +=3D device-plug-test +check-qtest-ppc64-$(CONFIG_POWERNV) +=3D pnv-xscom-test +check-qtest-ppc64-y +=3D migration-test +check-qtest-ppc64-$(CONFIG_PSERIES) +=3D rtas-test +check-qtest-ppc64-$(CONFIG_SLIRP) +=3D pxe-test +check-qtest-ppc64-$(CONFIG_USB_UHCI) +=3D usb-hcd-uhci-test +check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) +=3D usb-hcd-xhci-test +check-qtest-ppc64-$(CONFIG_SLIRP) +=3D test-netfilter +check-qtest-ppc64-$(CONFIG_POSIX) +=3D test-filter-mirror +check-qtest-ppc64-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector +check-qtest-ppc64-$(CONFIG_VGA) +=3D display-vga-test +check-qtest-ppc64-y +=3D numa-test +check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem-test +check-qtest-ppc64-y +=3D cpu-plug-test + +check-qtest-sh4-$(CONFIG_ISA_TESTDEV) =3D endianness-test + +check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) =3D endianness-test + +check-qtest-sparc-y +=3D prom-env-test +check-qtest-sparc-y +=3D m48t59-test +check-qtest-sparc-y +=3D boot-serial-test + +check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) =3D endianness-test +check-qtest-sparc64-y +=3D prom-env-test +check-qtest-sparc64-y +=3D boot-serial-test + +check-qtest-arm-y +=3D microbit-test +check-qtest-arm-y +=3D m25p80-test +check-qtest-arm-y +=3D test-arm-mptimer +check-qtest-arm-y +=3D boot-serial-test +check-qtest-arm-y +=3D hexloader-test +check-qtest-arm-$(CONFIG_PFLASH_CFI02) +=3D pflash-cfi02-test + +check-qtest-aarch64-y =3D numa-test +check-qtest-aarch64-y +=3D boot-serial-test +check-qtest-aarch64-y +=3D migration-test +# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditio= nal +ifneq ($(ARCH),arm) +check-qtest-aarch64-y +=3D bios-tables-test +endif + +check-qtest-microblazeel-y +=3D $(check-qtest-microblaze-y) + +check-qtest-xtensaeb-y +=3D $(check-qtest-xtensa-y) + +check-qtest-s390x-y =3D boot-serial-test +check-qtest-s390x-$(CONFIG_SLIRP) +=3D pxe-test +check-qtest-s390x-$(CONFIG_SLIRP) +=3D test-netfilter +check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-mirror +check-qtest-s390x-$(CONFIG_POSIX) +=3D test-filter-redirector +check-qtest-s390x-y +=3D drive_del-test +check-qtest-s390x-y +=3D device-plug-test +check-qtest-s390x-y +=3D virtio-ccw-test +check-qtest-s390x-y +=3D cpu-plug-test +check-qtest-s390x-y +=3D migration-test + +# libqos / qgraph : +libqgraph-obj-y =3D tests/libqos/qgraph.o + +libqos-obj-y =3D $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg= .o +libqos-obj-y +=3D tests/libqos/malloc.o +libqos-obj-y +=3D tests/libqos/libqos.o +libqos-spapr-obj-y =3D $(libqos-obj-y) tests/libqos/malloc-spapr.o +libqos-spapr-obj-y +=3D tests/libqos/libqos-spapr.o +libqos-spapr-obj-y +=3D tests/libqos/rtas.o +libqos-spapr-obj-y +=3D tests/libqos/pci-spapr.o +libqos-pc-obj-y =3D $(libqos-obj-y) tests/libqos/pci-pc.o +libqos-pc-obj-y +=3D tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o +libqos-pc-obj-y +=3D tests/libqos/ahci.o +libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos= /usb.o + +# qos devices: +qos-test-obj-y =3D tests/qtest/qos-test.o $(libqgraph-obj-y) +qos-test-obj-y +=3D $(libqos-pc-obj-y) $(libqos-spapr-obj-y) +qos-test-obj-y +=3D tests/libqos/e1000e.o +qos-test-obj-y +=3D tests/libqos/i2c.o +qos-test-obj-y +=3D tests/libqos/i2c-imx.o +qos-test-obj-y +=3D tests/libqos/i2c-omap.o +qos-test-obj-y +=3D tests/libqos/sdhci.o +qos-test-obj-y +=3D tests/libqos/tpci200.o +qos-test-obj-y +=3D tests/libqos/virtio.o +qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/libqos/virtio-9p.o +qos-test-obj-y +=3D tests/libqos/virtio-balloon.o +qos-test-obj-y +=3D tests/libqos/virtio-blk.o +qos-test-obj-y +=3D tests/libqos/virtio-mmio.o +qos-test-obj-y +=3D tests/libqos/virtio-net.o +qos-test-obj-y +=3D tests/libqos/virtio-pci.o +qos-test-obj-y +=3D tests/libqos/virtio-rng.o +qos-test-obj-y +=3D tests/libqos/virtio-scsi.o +qos-test-obj-y +=3D tests/libqos/virtio-serial.o + +# qos machines: +qos-test-obj-y +=3D tests/libqos/aarch64-xlnx-zcu102-machine.o +qos-test-obj-y +=3D tests/libqos/arm-imx25-pdk-machine.o +qos-test-obj-y +=3D tests/libqos/arm-n800-machine.o +qos-test-obj-y +=3D tests/libqos/arm-raspi2-machine.o +qos-test-obj-y +=3D tests/libqos/arm-sabrelite-machine.o +qos-test-obj-y +=3D tests/libqos/arm-smdkc210-machine.o +qos-test-obj-y +=3D tests/libqos/arm-virt-machine.o +qos-test-obj-y +=3D tests/libqos/arm-xilinx-zynq-a9-machine.o +qos-test-obj-y +=3D tests/libqos/ppc64_pseries-machine.o +qos-test-obj-y +=3D tests/libqos/x86_64_pc-machine.o + +# qos tests: +qos-test-obj-y +=3D tests/qtest/ac97-test.o +qos-test-obj-y +=3D tests/qtest/ds1338-test.o +qos-test-obj-y +=3D tests/qtest/e1000-test.o +qos-test-obj-y +=3D tests/qtest/e1000e-test.o +qos-test-obj-y +=3D tests/qtest/eepro100-test.o +qos-test-obj-y +=3D tests/qtest/es1370-test.o +qos-test-obj-y +=3D tests/qtest/ipoctal232-test.o +qos-test-obj-y +=3D tests/qtest/megasas-test.o +qos-test-obj-y +=3D tests/qtest/ne2000-test.o +qos-test-obj-y +=3D tests/qtest/nvme-test.o +qos-test-obj-y +=3D tests/qtest/pca9552-test.o +qos-test-obj-y +=3D tests/qtest/pci-test.o +qos-test-obj-y +=3D tests/qtest/pcnet-test.o +qos-test-obj-y +=3D tests/qtest/sdhci-test.o +qos-test-obj-y +=3D tests/qtest/spapr-phb-test.o +qos-test-obj-y +=3D tests/qtest/tmp105-test.o +qos-test-obj-y +=3D tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y) +qos-test-obj-$(CONFIG_VHOST_NET_USER) +=3D tests/qtest/vhost-user-test.o $= (chardev-obj-y) $(test-io-obj-y) +qos-test-obj-y +=3D tests/qtest/virtio-test.o +qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/virtio-9p-test.o +qos-test-obj-y +=3D tests/qtest/virtio-blk-test.o +qos-test-obj-y +=3D tests/qtest/virtio-net-test.o +qos-test-obj-y +=3D tests/qtest/virtio-rng-test.o +qos-test-obj-y +=3D tests/qtest/virtio-scsi-test.o +qos-test-obj-y +=3D tests/qtest/virtio-serial-test.o +qos-test-obj-y +=3D tests/qtest/vmxnet3-test.o + +check-unit-y +=3D tests/test-qgraph$(EXESUF) +tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) + +check-qtest-generic-y +=3D qos-test +tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y) + +# QTests dependencies: +tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o = tests/tpm-emu.o \ + tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) +tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/tpm-em= u.o $(test-io-obj-y) +tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o = tests/tpm-emu.o \ + tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) +tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/tpm-em= u.o $(test-io-obj-y) +tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o +tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o +tests/qtest/device-introspect-test$(EXESUF): tests/qtest/device-introspect= -test.o +tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o +tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o +tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o +tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o +tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o +tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o $(libqos-o= bj-y) +tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o $(libqos-spapr-obj= -y) +tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o +tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y) +tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o $(libqos-pc-obj-y)= qemu-img$(EXESUF) +tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o +tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o +tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o +tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o $(libq= os-obj-y) +tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(li= bqos-obj-y) +tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \ + tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y) +tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o tests/qtest/boot-sec= tor.o $(libqos-obj-y) +tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o +tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o +tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o $(libqos-pc-ob= j-y) +tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y) +tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o $(libqos-pc-ob= j-y) +tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o $(libqos-pc-= obj-y) +tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o +tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o +tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) +tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o +tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o +tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o +tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o +tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o +tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o +tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o +tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o +tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o +tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o +tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o +tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o $(= libqos-usb-obj-y) +tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(= libqos-usb-obj-y) +tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(= libqos-usb-obj-y) +tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o +tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o +tests/qtest/qemu-iotests/qtest/socket_scm_helper$(EXESUF): tests/qtest/qem= u-iotests/qtest/socket_scm_helper.o +tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-= obj-y) +tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o = $(qtest-obj-y) +tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redir= ector.o $(qtest-obj-y) +tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-com= pat.o $(qtest-obj-y) +tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivsh= mem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) +tests/qtest/vhost-user-bridge$(EXESUF): tests/qtest/vhost-user-bridge.o $(= test-util-obj-y) libvhost-user.a +tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o +tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o +tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/= boot-sector.o tests/qtest/acpi-utils.o +tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o tests/qtest/boot= -sector.o $(libqos-obj-y) + +# QTest rules + +TARGETS=3D$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) +ifeq ($(CONFIG_POSIX),y) +QTEST_TARGETS =3D $(TARGETS) +check-qtest-y=3D$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%= =3Dtests/qtest/%$(EXESUF))) +check-qtest-y +=3D $(check-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)) +else +QTEST_TARGETS =3D +endif + +qtest-obj-y =3D tests/qtest/libqtest.o $(test-util-obj-y) +$(check-qtest-y): $(qtest-obj-y) --=20 2.18.1 From nobody Sat Apr 20 05:08:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568142321; cv=none; d=zoho.com; s=zohoarc; b=cCTOuEa90mYV39V+EZYDOkH6Xz/spaOfHyEqRCqkgBJSoGBScvjg5RnSmnYu+eYV2lHa0w/M+R4U16TEc3CC+Mnxlw4Wg/ySqEeC2TFI6JE3LIRZhnp4gVwuYYinirDR+ZzoXQif51SNrSwkh1080ZEi6XHVKwFxJM/dJrh6uWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568142321; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=/Ir9dQHhCYNNpyU/v+G/eovkvKu3DVauyAzrrnoByGg=; b=YcJyF+lNfC9s1OYFeEWyyf9Dr6xiyvdYdpnSZEFeEE2j3ZQbKw/RX3sdycQDg1fD4rbOQKy4c+L+vXIQXLdRx9jo07LG7cbSlgP9IRrek4WrrML7VoIru3zFA9RK0FUALWRWs1OFjVhA0ULZfMNgnaPKbKkiV0mp1QxP2stDq9c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156814232180362.80395312893245; Tue, 10 Sep 2019 12:05:21 -0700 (PDT) Received: from localhost ([::1]:44154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lS4-000635-G6 for importer@patchew.org; Tue, 10 Sep 2019 15:05:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53259) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lM0-00006r-9B for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7lLw-0006I6-A4 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7lLv-0006Gz-Tu for qemu-devel@nongnu.org; Tue, 10 Sep 2019 14:59:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3CDBC3082B67; Tue, 10 Sep 2019 18:58:58 +0000 (UTC) Received: from thuth.com (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id C865619C58; Tue, 10 Sep 2019 18:58:56 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 20:58:39 +0200 Message-Id: <20190910185839.19682-8-thuth@redhat.com> In-Reply-To: <20190910185839.19682-1-thuth@redhat.com> References: <20190910185839.19682-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 10 Sep 2019 18:58:58 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 7/7] tests/libqos: Move the libqos files under tests/qtest/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The qos stuff belongs to qtest, so move it into that directory, too. Signed-off-by: Thomas Huth --- MAINTAINERS | 9 +-- configure | 2 +- tests/Makefile.include | 2 +- tests/qtest/Makefile.include | 78 +++++++++---------- .../libqos/aarch64-xlnx-zcu102-machine.c | 0 tests/{ =3D> qtest}/libqos/ahci.c | 0 tests/{ =3D> qtest}/libqos/ahci.h | 0 .../libqos/arm-imx25-pdk-machine.c | 0 tests/{ =3D> qtest}/libqos/arm-n800-machine.c | 0 tests/{ =3D> qtest}/libqos/arm-raspi2-machine.c | 0 .../libqos/arm-sabrelite-machine.c | 0 .../{ =3D> qtest}/libqos/arm-smdkc210-machine.c | 0 tests/{ =3D> qtest}/libqos/arm-virt-machine.c | 0 .../libqos/arm-xilinx-zynq-a9-machine.c | 0 tests/{ =3D> qtest}/libqos/e1000e.c | 0 tests/{ =3D> qtest}/libqos/e1000e.h | 0 tests/{ =3D> qtest}/libqos/fw_cfg.c | 0 tests/{ =3D> qtest}/libqos/fw_cfg.h | 0 tests/{ =3D> qtest}/libqos/i2c-imx.c | 0 tests/{ =3D> qtest}/libqos/i2c-omap.c | 0 tests/{ =3D> qtest}/libqos/i2c.c | 0 tests/{ =3D> qtest}/libqos/i2c.h | 0 tests/{ =3D> qtest}/libqos/libqos-pc.c | 0 tests/{ =3D> qtest}/libqos/libqos-pc.h | 0 tests/{ =3D> qtest}/libqos/libqos-spapr.c | 0 tests/{ =3D> qtest}/libqos/libqos-spapr.h | 0 tests/{ =3D> qtest}/libqos/libqos.c | 0 tests/{ =3D> qtest}/libqos/libqos.h | 0 tests/{ =3D> qtest}/libqos/malloc-pc.c | 0 tests/{ =3D> qtest}/libqos/malloc-pc.h | 0 tests/{ =3D> qtest}/libqos/malloc-spapr.c | 0 tests/{ =3D> qtest}/libqos/malloc-spapr.h | 0 tests/{ =3D> qtest}/libqos/malloc.c | 0 tests/{ =3D> qtest}/libqos/malloc.h | 0 tests/{ =3D> qtest}/libqos/pci-pc.c | 0 tests/{ =3D> qtest}/libqos/pci-pc.h | 0 tests/{ =3D> qtest}/libqos/pci-spapr.c | 0 tests/{ =3D> qtest}/libqos/pci-spapr.h | 0 tests/{ =3D> qtest}/libqos/pci.c | 0 tests/{ =3D> qtest}/libqos/pci.h | 0 .../libqos/ppc64_pseries-machine.c | 0 tests/{ =3D> qtest}/libqos/qgraph.c | 0 tests/{ =3D> qtest}/libqos/qgraph.h | 0 tests/{ =3D> qtest}/libqos/qgraph_internal.h | 0 tests/{ =3D> qtest}/libqos/rtas.c | 0 tests/{ =3D> qtest}/libqos/rtas.h | 0 tests/{ =3D> qtest}/libqos/sdhci.c | 0 tests/{ =3D> qtest}/libqos/sdhci.h | 0 tests/{ =3D> qtest}/libqos/tpci200.c | 0 tests/{ =3D> qtest}/libqos/usb.c | 0 tests/{ =3D> qtest}/libqos/usb.h | 0 tests/{ =3D> qtest}/libqos/virtio-9p.c | 0 tests/{ =3D> qtest}/libqos/virtio-9p.h | 0 tests/{ =3D> qtest}/libqos/virtio-balloon.c | 0 tests/{ =3D> qtest}/libqos/virtio-balloon.h | 0 tests/{ =3D> qtest}/libqos/virtio-blk.c | 0 tests/{ =3D> qtest}/libqos/virtio-blk.h | 0 tests/{ =3D> qtest}/libqos/virtio-mmio.c | 0 tests/{ =3D> qtest}/libqos/virtio-mmio.h | 0 tests/{ =3D> qtest}/libqos/virtio-net.c | 0 tests/{ =3D> qtest}/libqos/virtio-net.h | 0 tests/{ =3D> qtest}/libqos/virtio-pci.c | 0 tests/{ =3D> qtest}/libqos/virtio-pci.h | 0 tests/{ =3D> qtest}/libqos/virtio-rng.c | 0 tests/{ =3D> qtest}/libqos/virtio-rng.h | 0 tests/{ =3D> qtest}/libqos/virtio-scsi.c | 0 tests/{ =3D> qtest}/libqos/virtio-scsi.h | 0 tests/{ =3D> qtest}/libqos/virtio-serial.c | 0 tests/{ =3D> qtest}/libqos/virtio-serial.h | 0 tests/{ =3D> qtest}/libqos/virtio.c | 0 tests/{ =3D> qtest}/libqos/virtio.h | 0 tests/{ =3D> qtest}/libqos/x86_64_pc-machine.c | 0 72 files changed, 45 insertions(+), 46 deletions(-) rename tests/{ =3D> qtest}/libqos/aarch64-xlnx-zcu102-machine.c (100%) rename tests/{ =3D> qtest}/libqos/ahci.c (100%) rename tests/{ =3D> qtest}/libqos/ahci.h (100%) rename tests/{ =3D> qtest}/libqos/arm-imx25-pdk-machine.c (100%) rename tests/{ =3D> qtest}/libqos/arm-n800-machine.c (100%) rename tests/{ =3D> qtest}/libqos/arm-raspi2-machine.c (100%) rename tests/{ =3D> qtest}/libqos/arm-sabrelite-machine.c (100%) rename tests/{ =3D> qtest}/libqos/arm-smdkc210-machine.c (100%) rename tests/{ =3D> qtest}/libqos/arm-virt-machine.c (100%) rename tests/{ =3D> qtest}/libqos/arm-xilinx-zynq-a9-machine.c (100%) rename tests/{ =3D> qtest}/libqos/e1000e.c (100%) rename tests/{ =3D> qtest}/libqos/e1000e.h (100%) rename tests/{ =3D> qtest}/libqos/fw_cfg.c (100%) rename tests/{ =3D> qtest}/libqos/fw_cfg.h (100%) rename tests/{ =3D> qtest}/libqos/i2c-imx.c (100%) rename tests/{ =3D> qtest}/libqos/i2c-omap.c (100%) rename tests/{ =3D> qtest}/libqos/i2c.c (100%) rename tests/{ =3D> qtest}/libqos/i2c.h (100%) rename tests/{ =3D> qtest}/libqos/libqos-pc.c (100%) rename tests/{ =3D> qtest}/libqos/libqos-pc.h (100%) rename tests/{ =3D> qtest}/libqos/libqos-spapr.c (100%) rename tests/{ =3D> qtest}/libqos/libqos-spapr.h (100%) rename tests/{ =3D> qtest}/libqos/libqos.c (100%) rename tests/{ =3D> qtest}/libqos/libqos.h (100%) rename tests/{ =3D> qtest}/libqos/malloc-pc.c (100%) rename tests/{ =3D> qtest}/libqos/malloc-pc.h (100%) rename tests/{ =3D> qtest}/libqos/malloc-spapr.c (100%) rename tests/{ =3D> qtest}/libqos/malloc-spapr.h (100%) rename tests/{ =3D> qtest}/libqos/malloc.c (100%) rename tests/{ =3D> qtest}/libqos/malloc.h (100%) rename tests/{ =3D> qtest}/libqos/pci-pc.c (100%) rename tests/{ =3D> qtest}/libqos/pci-pc.h (100%) rename tests/{ =3D> qtest}/libqos/pci-spapr.c (100%) rename tests/{ =3D> qtest}/libqos/pci-spapr.h (100%) rename tests/{ =3D> qtest}/libqos/pci.c (100%) rename tests/{ =3D> qtest}/libqos/pci.h (100%) rename tests/{ =3D> qtest}/libqos/ppc64_pseries-machine.c (100%) rename tests/{ =3D> qtest}/libqos/qgraph.c (100%) rename tests/{ =3D> qtest}/libqos/qgraph.h (100%) rename tests/{ =3D> qtest}/libqos/qgraph_internal.h (100%) rename tests/{ =3D> qtest}/libqos/rtas.c (100%) rename tests/{ =3D> qtest}/libqos/rtas.h (100%) rename tests/{ =3D> qtest}/libqos/sdhci.c (100%) rename tests/{ =3D> qtest}/libqos/sdhci.h (100%) rename tests/{ =3D> qtest}/libqos/tpci200.c (100%) rename tests/{ =3D> qtest}/libqos/usb.c (100%) rename tests/{ =3D> qtest}/libqos/usb.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-9p.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-9p.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-balloon.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-balloon.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-blk.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-blk.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-mmio.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-mmio.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-net.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-net.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-pci.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-pci.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-rng.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-rng.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-scsi.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-scsi.h (100%) rename tests/{ =3D> qtest}/libqos/virtio-serial.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-serial.h (100%) rename tests/{ =3D> qtest}/libqos/virtio.c (100%) rename tests/{ =3D> qtest}/libqos/virtio.h (100%) rename tests/{ =3D> qtest}/libqos/x86_64_pc-machine.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9ac4ca180b..cb97fa967f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1083,9 +1083,9 @@ F: pc-bios/slof.bin F: docs/specs/ppc-spapr-hcalls.txt F: docs/specs/ppc-spapr-hotplug.txt F: tests/spapr* -F: tests/libqos/*spapr* +F: tests/qtest/qos/*spapr* F: tests/rtas* -F: tests/libqos/rtas* +F: tests/qtest/qos/rtas* =20 PowerNV (Non-Virtualized) M: C=C3=A9dric Le Goater @@ -1328,7 +1328,7 @@ F: hw/block/hd-geometry.c F: tests/qtest/ide-test.c F: tests/qtest/ahci-test.c F: tests/qtest/cdrom-test.c -F: tests/libqos/ahci* +F: tests/qtest/qos/ahci* T: git https://github.com/jnsnow/qemu.git ide =20 IPMI @@ -1724,7 +1724,7 @@ F: hw/nvram/fw_cfg.c F: stubs/fw_cfg.c F: include/hw/nvram/fw_cfg.h F: include/standard-headers/linux/qemu_fw_cfg.h -F: tests/libqos/fw_cfg.c +F: tests/qtest/qos/fw_cfg.c F: tests/qtest/fw_cfg-test.c T: git https://github.com/philmd/qemu.git fw_cfg-next =20 @@ -2085,7 +2085,6 @@ S: Maintained F: qtest.c F: accel/qtest.c F: tests/libqtest* -F: tests/libqos/ F: tests/qtest/ =20 Register API diff --git a/configure b/configure index 59e7397916..2f0a495dcd 100755 --- a/configure +++ b/configure @@ -7928,7 +7928,7 @@ fi # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. DIRS=3D"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/tcg/xtensa" -DIRS=3D"$DIRS tests/libqos tests/qtest tests/qapi-schema tests/qemu-iotest= s" +DIRS=3D"$DIRS tests/qtest tests/qtest/libqos tests/qapi-schema tests/qemu-= iotests" DIRS=3D"$DIRS tests/fp tests/vm" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" diff --git a/tests/Makefile.include b/tests/Makefile.include index d68b2d68a8..b1df761932 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -881,6 +881,6 @@ all: $(QEMU_IOTESTS_HELPERS-y) =20 -include $(wildcard tests/*.d) -include $(wildcard tests/qtest/*.d) --include $(wildcard tests/libqos/*.d) +-include $(wildcard tests/qtest/qos/*.d) =20 endif diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index 54e1d6fb6c..bf324e8c16 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -145,51 +145,51 @@ check-qtest-s390x-y +=3D cpu-plug-test check-qtest-s390x-y +=3D migration-test =20 # libqos / qgraph : -libqgraph-obj-y =3D tests/libqos/qgraph.o - -libqos-obj-y =3D $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg= .o -libqos-obj-y +=3D tests/libqos/malloc.o -libqos-obj-y +=3D tests/libqos/libqos.o -libqos-spapr-obj-y =3D $(libqos-obj-y) tests/libqos/malloc-spapr.o -libqos-spapr-obj-y +=3D tests/libqos/libqos-spapr.o -libqos-spapr-obj-y +=3D tests/libqos/rtas.o -libqos-spapr-obj-y +=3D tests/libqos/pci-spapr.o -libqos-pc-obj-y =3D $(libqos-obj-y) tests/libqos/pci-pc.o -libqos-pc-obj-y +=3D tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o -libqos-pc-obj-y +=3D tests/libqos/ahci.o -libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos= /usb.o +libqgraph-obj-y =3D tests/qtest/libqos/qgraph.o + +libqos-obj-y =3D $(libqgraph-obj-y) tests/qtest/libqos/pci.o tests/qtest/l= ibqos/fw_cfg.o +libqos-obj-y +=3D tests/qtest/libqos/malloc.o +libqos-obj-y +=3D tests/qtest/libqos/libqos.o +libqos-spapr-obj-y =3D $(libqos-obj-y) tests/qtest/libqos/malloc-spapr.o +libqos-spapr-obj-y +=3D tests/qtest/libqos/libqos-spapr.o +libqos-spapr-obj-y +=3D tests/qtest/libqos/rtas.o +libqos-spapr-obj-y +=3D tests/qtest/libqos/pci-spapr.o +libqos-pc-obj-y =3D $(libqos-obj-y) tests/qtest/libqos/pci-pc.o +libqos-pc-obj-y +=3D tests/qtest/libqos/malloc-pc.o tests/qtest/libqos/lib= qos-pc.o +libqos-pc-obj-y +=3D tests/qtest/libqos/ahci.o +libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/qtest/= libqos/usb.o =20 # qos devices: qos-test-obj-y =3D tests/qtest/qos-test.o $(libqgraph-obj-y) qos-test-obj-y +=3D $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -qos-test-obj-y +=3D tests/libqos/e1000e.o -qos-test-obj-y +=3D tests/libqos/i2c.o -qos-test-obj-y +=3D tests/libqos/i2c-imx.o -qos-test-obj-y +=3D tests/libqos/i2c-omap.o -qos-test-obj-y +=3D tests/libqos/sdhci.o -qos-test-obj-y +=3D tests/libqos/tpci200.o -qos-test-obj-y +=3D tests/libqos/virtio.o -qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/libqos/virtio-9p.o -qos-test-obj-y +=3D tests/libqos/virtio-balloon.o -qos-test-obj-y +=3D tests/libqos/virtio-blk.o -qos-test-obj-y +=3D tests/libqos/virtio-mmio.o -qos-test-obj-y +=3D tests/libqos/virtio-net.o -qos-test-obj-y +=3D tests/libqos/virtio-pci.o -qos-test-obj-y +=3D tests/libqos/virtio-rng.o -qos-test-obj-y +=3D tests/libqos/virtio-scsi.o -qos-test-obj-y +=3D tests/libqos/virtio-serial.o +qos-test-obj-y +=3D tests/qtest/libqos/e1000e.o +qos-test-obj-y +=3D tests/qtest/libqos/i2c.o +qos-test-obj-y +=3D tests/qtest/libqos/i2c-imx.o +qos-test-obj-y +=3D tests/qtest/libqos/i2c-omap.o +qos-test-obj-y +=3D tests/qtest/libqos/sdhci.o +qos-test-obj-y +=3D tests/qtest/libqos/tpci200.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio.o +qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/libqos/virtio-9p.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-balloon.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-blk.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-mmio.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-net.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-pci.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-rng.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-scsi.o +qos-test-obj-y +=3D tests/qtest/libqos/virtio-serial.o =20 # qos machines: -qos-test-obj-y +=3D tests/libqos/aarch64-xlnx-zcu102-machine.o -qos-test-obj-y +=3D tests/libqos/arm-imx25-pdk-machine.o -qos-test-obj-y +=3D tests/libqos/arm-n800-machine.o -qos-test-obj-y +=3D tests/libqos/arm-raspi2-machine.o -qos-test-obj-y +=3D tests/libqos/arm-sabrelite-machine.o -qos-test-obj-y +=3D tests/libqos/arm-smdkc210-machine.o -qos-test-obj-y +=3D tests/libqos/arm-virt-machine.o -qos-test-obj-y +=3D tests/libqos/arm-xilinx-zynq-a9-machine.o -qos-test-obj-y +=3D tests/libqos/ppc64_pseries-machine.o -qos-test-obj-y +=3D tests/libqos/x86_64_pc-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/aarch64-xlnx-zcu102-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/arm-imx25-pdk-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/arm-n800-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/arm-raspi2-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/arm-sabrelite-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/arm-smdkc210-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/arm-virt-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/arm-xilinx-zynq-a9-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/ppc64_pseries-machine.o +qos-test-obj-y +=3D tests/qtest/libqos/x86_64_pc-machine.o =20 # qos tests: qos-test-obj-y +=3D tests/qtest/ac97-test.o diff --git a/tests/libqos/aarch64-xlnx-zcu102-machine.c b/tests/qtest/libqo= s/aarch64-xlnx-zcu102-machine.c similarity index 100% rename from tests/libqos/aarch64-xlnx-zcu102-machine.c rename to tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c diff --git a/tests/libqos/ahci.c b/tests/qtest/libqos/ahci.c similarity index 100% rename from tests/libqos/ahci.c rename to tests/qtest/libqos/ahci.c diff --git a/tests/libqos/ahci.h b/tests/qtest/libqos/ahci.h similarity index 100% rename from tests/libqos/ahci.h rename to tests/qtest/libqos/ahci.h diff --git a/tests/libqos/arm-imx25-pdk-machine.c b/tests/qtest/libqos/arm-= imx25-pdk-machine.c similarity index 100% rename from tests/libqos/arm-imx25-pdk-machine.c rename to tests/qtest/libqos/arm-imx25-pdk-machine.c diff --git a/tests/libqos/arm-n800-machine.c b/tests/qtest/libqos/arm-n800-= machine.c similarity index 100% rename from tests/libqos/arm-n800-machine.c rename to tests/qtest/libqos/arm-n800-machine.c diff --git a/tests/libqos/arm-raspi2-machine.c b/tests/qtest/libqos/arm-ras= pi2-machine.c similarity index 100% rename from tests/libqos/arm-raspi2-machine.c rename to tests/qtest/libqos/arm-raspi2-machine.c diff --git a/tests/libqos/arm-sabrelite-machine.c b/tests/qtest/libqos/arm-= sabrelite-machine.c similarity index 100% rename from tests/libqos/arm-sabrelite-machine.c rename to tests/qtest/libqos/arm-sabrelite-machine.c diff --git a/tests/libqos/arm-smdkc210-machine.c b/tests/qtest/libqos/arm-s= mdkc210-machine.c similarity index 100% rename from tests/libqos/arm-smdkc210-machine.c rename to tests/qtest/libqos/arm-smdkc210-machine.c diff --git a/tests/libqos/arm-virt-machine.c b/tests/qtest/libqos/arm-virt-= machine.c similarity index 100% rename from tests/libqos/arm-virt-machine.c rename to tests/qtest/libqos/arm-virt-machine.c diff --git a/tests/libqos/arm-xilinx-zynq-a9-machine.c b/tests/qtest/libqos= /arm-xilinx-zynq-a9-machine.c similarity index 100% rename from tests/libqos/arm-xilinx-zynq-a9-machine.c rename to tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c diff --git a/tests/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c similarity index 100% rename from tests/libqos/e1000e.c rename to tests/qtest/libqos/e1000e.c diff --git a/tests/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h similarity index 100% rename from tests/libqos/e1000e.h rename to tests/qtest/libqos/e1000e.h diff --git a/tests/libqos/fw_cfg.c b/tests/qtest/libqos/fw_cfg.c similarity index 100% rename from tests/libqos/fw_cfg.c rename to tests/qtest/libqos/fw_cfg.c diff --git a/tests/libqos/fw_cfg.h b/tests/qtest/libqos/fw_cfg.h similarity index 100% rename from tests/libqos/fw_cfg.h rename to tests/qtest/libqos/fw_cfg.h diff --git a/tests/libqos/i2c-imx.c b/tests/qtest/libqos/i2c-imx.c similarity index 100% rename from tests/libqos/i2c-imx.c rename to tests/qtest/libqos/i2c-imx.c diff --git a/tests/libqos/i2c-omap.c b/tests/qtest/libqos/i2c-omap.c similarity index 100% rename from tests/libqos/i2c-omap.c rename to tests/qtest/libqos/i2c-omap.c diff --git a/tests/libqos/i2c.c b/tests/qtest/libqos/i2c.c similarity index 100% rename from tests/libqos/i2c.c rename to tests/qtest/libqos/i2c.c diff --git a/tests/libqos/i2c.h b/tests/qtest/libqos/i2c.h similarity index 100% rename from tests/libqos/i2c.h rename to tests/qtest/libqos/i2c.h diff --git a/tests/libqos/libqos-pc.c b/tests/qtest/libqos/libqos-pc.c similarity index 100% rename from tests/libqos/libqos-pc.c rename to tests/qtest/libqos/libqos-pc.c diff --git a/tests/libqos/libqos-pc.h b/tests/qtest/libqos/libqos-pc.h similarity index 100% rename from tests/libqos/libqos-pc.h rename to tests/qtest/libqos/libqos-pc.h diff --git a/tests/libqos/libqos-spapr.c b/tests/qtest/libqos/libqos-spapr.c similarity index 100% rename from tests/libqos/libqos-spapr.c rename to tests/qtest/libqos/libqos-spapr.c diff --git a/tests/libqos/libqos-spapr.h b/tests/qtest/libqos/libqos-spapr.h similarity index 100% rename from tests/libqos/libqos-spapr.h rename to tests/qtest/libqos/libqos-spapr.h diff --git a/tests/libqos/libqos.c b/tests/qtest/libqos/libqos.c similarity index 100% rename from tests/libqos/libqos.c rename to tests/qtest/libqos/libqos.c diff --git a/tests/libqos/libqos.h b/tests/qtest/libqos/libqos.h similarity index 100% rename from tests/libqos/libqos.h rename to tests/qtest/libqos/libqos.h diff --git a/tests/libqos/malloc-pc.c b/tests/qtest/libqos/malloc-pc.c similarity index 100% rename from tests/libqos/malloc-pc.c rename to tests/qtest/libqos/malloc-pc.c diff --git a/tests/libqos/malloc-pc.h b/tests/qtest/libqos/malloc-pc.h similarity index 100% rename from tests/libqos/malloc-pc.h rename to tests/qtest/libqos/malloc-pc.h diff --git a/tests/libqos/malloc-spapr.c b/tests/qtest/libqos/malloc-spapr.c similarity index 100% rename from tests/libqos/malloc-spapr.c rename to tests/qtest/libqos/malloc-spapr.c diff --git a/tests/libqos/malloc-spapr.h b/tests/qtest/libqos/malloc-spapr.h similarity index 100% rename from tests/libqos/malloc-spapr.h rename to tests/qtest/libqos/malloc-spapr.h diff --git a/tests/libqos/malloc.c b/tests/qtest/libqos/malloc.c similarity index 100% rename from tests/libqos/malloc.c rename to tests/qtest/libqos/malloc.c diff --git a/tests/libqos/malloc.h b/tests/qtest/libqos/malloc.h similarity index 100% rename from tests/libqos/malloc.h rename to tests/qtest/libqos/malloc.h diff --git a/tests/libqos/pci-pc.c b/tests/qtest/libqos/pci-pc.c similarity index 100% rename from tests/libqos/pci-pc.c rename to tests/qtest/libqos/pci-pc.c diff --git a/tests/libqos/pci-pc.h b/tests/qtest/libqos/pci-pc.h similarity index 100% rename from tests/libqos/pci-pc.h rename to tests/qtest/libqos/pci-pc.h diff --git a/tests/libqos/pci-spapr.c b/tests/qtest/libqos/pci-spapr.c similarity index 100% rename from tests/libqos/pci-spapr.c rename to tests/qtest/libqos/pci-spapr.c diff --git a/tests/libqos/pci-spapr.h b/tests/qtest/libqos/pci-spapr.h similarity index 100% rename from tests/libqos/pci-spapr.h rename to tests/qtest/libqos/pci-spapr.h diff --git a/tests/libqos/pci.c b/tests/qtest/libqos/pci.c similarity index 100% rename from tests/libqos/pci.c rename to tests/qtest/libqos/pci.c diff --git a/tests/libqos/pci.h b/tests/qtest/libqos/pci.h similarity index 100% rename from tests/libqos/pci.h rename to tests/qtest/libqos/pci.h diff --git a/tests/libqos/ppc64_pseries-machine.c b/tests/qtest/libqos/ppc6= 4_pseries-machine.c similarity index 100% rename from tests/libqos/ppc64_pseries-machine.c rename to tests/qtest/libqos/ppc64_pseries-machine.c diff --git a/tests/libqos/qgraph.c b/tests/qtest/libqos/qgraph.c similarity index 100% rename from tests/libqos/qgraph.c rename to tests/qtest/libqos/qgraph.c diff --git a/tests/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h similarity index 100% rename from tests/libqos/qgraph.h rename to tests/qtest/libqos/qgraph.h diff --git a/tests/libqos/qgraph_internal.h b/tests/qtest/libqos/qgraph_int= ernal.h similarity index 100% rename from tests/libqos/qgraph_internal.h rename to tests/qtest/libqos/qgraph_internal.h diff --git a/tests/libqos/rtas.c b/tests/qtest/libqos/rtas.c similarity index 100% rename from tests/libqos/rtas.c rename to tests/qtest/libqos/rtas.c diff --git a/tests/libqos/rtas.h b/tests/qtest/libqos/rtas.h similarity index 100% rename from tests/libqos/rtas.h rename to tests/qtest/libqos/rtas.h diff --git a/tests/libqos/sdhci.c b/tests/qtest/libqos/sdhci.c similarity index 100% rename from tests/libqos/sdhci.c rename to tests/qtest/libqos/sdhci.c diff --git a/tests/libqos/sdhci.h b/tests/qtest/libqos/sdhci.h similarity index 100% rename from tests/libqos/sdhci.h rename to tests/qtest/libqos/sdhci.h diff --git a/tests/libqos/tpci200.c b/tests/qtest/libqos/tpci200.c similarity index 100% rename from tests/libqos/tpci200.c rename to tests/qtest/libqos/tpci200.c diff --git a/tests/libqos/usb.c b/tests/qtest/libqos/usb.c similarity index 100% rename from tests/libqos/usb.c rename to tests/qtest/libqos/usb.c diff --git a/tests/libqos/usb.h b/tests/qtest/libqos/usb.h similarity index 100% rename from tests/libqos/usb.h rename to tests/qtest/libqos/usb.h diff --git a/tests/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c similarity index 100% rename from tests/libqos/virtio-9p.c rename to tests/qtest/libqos/virtio-9p.c diff --git a/tests/libqos/virtio-9p.h b/tests/qtest/libqos/virtio-9p.h similarity index 100% rename from tests/libqos/virtio-9p.h rename to tests/qtest/libqos/virtio-9p.h diff --git a/tests/libqos/virtio-balloon.c b/tests/qtest/libqos/virtio-ball= oon.c similarity index 100% rename from tests/libqos/virtio-balloon.c rename to tests/qtest/libqos/virtio-balloon.c diff --git a/tests/libqos/virtio-balloon.h b/tests/qtest/libqos/virtio-ball= oon.h similarity index 100% rename from tests/libqos/virtio-balloon.h rename to tests/qtest/libqos/virtio-balloon.h diff --git a/tests/libqos/virtio-blk.c b/tests/qtest/libqos/virtio-blk.c similarity index 100% rename from tests/libqos/virtio-blk.c rename to tests/qtest/libqos/virtio-blk.c diff --git a/tests/libqos/virtio-blk.h b/tests/qtest/libqos/virtio-blk.h similarity index 100% rename from tests/libqos/virtio-blk.h rename to tests/qtest/libqos/virtio-blk.h diff --git a/tests/libqos/virtio-mmio.c b/tests/qtest/libqos/virtio-mmio.c similarity index 100% rename from tests/libqos/virtio-mmio.c rename to tests/qtest/libqos/virtio-mmio.c diff --git a/tests/libqos/virtio-mmio.h b/tests/qtest/libqos/virtio-mmio.h similarity index 100% rename from tests/libqos/virtio-mmio.h rename to tests/qtest/libqos/virtio-mmio.h diff --git a/tests/libqos/virtio-net.c b/tests/qtest/libqos/virtio-net.c similarity index 100% rename from tests/libqos/virtio-net.c rename to tests/qtest/libqos/virtio-net.c diff --git a/tests/libqos/virtio-net.h b/tests/qtest/libqos/virtio-net.h similarity index 100% rename from tests/libqos/virtio-net.h rename to tests/qtest/libqos/virtio-net.h diff --git a/tests/libqos/virtio-pci.c b/tests/qtest/libqos/virtio-pci.c similarity index 100% rename from tests/libqos/virtio-pci.c rename to tests/qtest/libqos/virtio-pci.c diff --git a/tests/libqos/virtio-pci.h b/tests/qtest/libqos/virtio-pci.h similarity index 100% rename from tests/libqos/virtio-pci.h rename to tests/qtest/libqos/virtio-pci.h diff --git a/tests/libqos/virtio-rng.c b/tests/qtest/libqos/virtio-rng.c similarity index 100% rename from tests/libqos/virtio-rng.c rename to tests/qtest/libqos/virtio-rng.c diff --git a/tests/libqos/virtio-rng.h b/tests/qtest/libqos/virtio-rng.h similarity index 100% rename from tests/libqos/virtio-rng.h rename to tests/qtest/libqos/virtio-rng.h diff --git a/tests/libqos/virtio-scsi.c b/tests/qtest/libqos/virtio-scsi.c similarity index 100% rename from tests/libqos/virtio-scsi.c rename to tests/qtest/libqos/virtio-scsi.c diff --git a/tests/libqos/virtio-scsi.h b/tests/qtest/libqos/virtio-scsi.h similarity index 100% rename from tests/libqos/virtio-scsi.h rename to tests/qtest/libqos/virtio-scsi.h diff --git a/tests/libqos/virtio-serial.c b/tests/qtest/libqos/virtio-seria= l.c similarity index 100% rename from tests/libqos/virtio-serial.c rename to tests/qtest/libqos/virtio-serial.c diff --git a/tests/libqos/virtio-serial.h b/tests/qtest/libqos/virtio-seria= l.h similarity index 100% rename from tests/libqos/virtio-serial.h rename to tests/qtest/libqos/virtio-serial.h diff --git a/tests/libqos/virtio.c b/tests/qtest/libqos/virtio.c similarity index 100% rename from tests/libqos/virtio.c rename to tests/qtest/libqos/virtio.c diff --git a/tests/libqos/virtio.h b/tests/qtest/libqos/virtio.h similarity index 100% rename from tests/libqos/virtio.h rename to tests/qtest/libqos/virtio.h diff --git a/tests/libqos/x86_64_pc-machine.c b/tests/qtest/libqos/x86_64_p= c-machine.c similarity index 100% rename from tests/libqos/x86_64_pc-machine.c rename to tests/qtest/libqos/x86_64_pc-machine.c --=20 2.18.1