From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, URIBL_SBL,URIBL_SBL_A autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37BA5C49ED7 for ; Tue, 10 Sep 2019 19:06:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E020E21479 for ; Tue, 10 Sep 2019 19:06:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E020E21479 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7lT1-0006jM-21 for qemu-devel@archiver.kernel.org; Tue, 10 Sep 2019 15:06:19 -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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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/{ => qtest}/ac97-test.c | 0 tests/{ => qtest}/acpi-utils.c | 0 tests/{ => qtest}/acpi-utils.h | 0 tests/{ => qtest}/ahci-test.c | 0 .../bios-tables-test-allowed-diff.h | 0 tests/{ => qtest}/bios-tables-test.c | 0 tests/{ => qtest}/boot-order-test.c | 0 tests/{ => qtest}/boot-sector.c | 0 tests/{ => qtest}/boot-sector.h | 0 tests/{ => qtest}/boot-serial-test.c | 0 tests/{ => qtest}/cdrom-test.c | 0 tests/{ => qtest}/cpu-plug-test.c | 0 tests/{ => qtest}/device-introspect-test.c | 0 tests/{ => qtest}/device-plug-test.c | 0 tests/{ => qtest}/display-vga-test.c | 0 tests/{ => qtest}/drive_del-test.c | 0 tests/{ => qtest}/ds1338-test.c | 0 tests/{ => qtest}/e1000-test.c | 0 tests/{ => qtest}/e1000e-test.c | 0 tests/{ => qtest}/eepro100-test.c | 0 tests/{ => qtest}/endianness-test.c | 0 tests/{ => qtest}/es1370-test.c | 0 tests/{ => qtest}/fdc-test.c | 0 tests/{ => qtest}/fw_cfg-test.c | 0 tests/{ => qtest}/hd-geo-test.c | 0 tests/{ => qtest}/hexloader-test.c | 0 tests/{ => qtest}/i440fx-test.c | 0 tests/{ => qtest}/i82801b11-test.c | 0 tests/{ => qtest}/ide-test.c | 0 tests/{ => qtest}/intel-hda-test.c | 0 tests/{ => qtest}/ioh3420-test.c | 0 tests/{ => qtest}/ipmi-bt-test.c | 0 tests/{ => qtest}/ipmi-kcs-test.c | 0 tests/{ => qtest}/ipoctal232-test.c | 0 tests/{ => qtest}/ivshmem-test.c | 0 tests/{ => qtest}/libqtest-single.h | 0 tests/{ => qtest}/libqtest.c | 0 tests/{ => qtest}/libqtest.h | 0 tests/{ => qtest}/m25p80-test.c | 0 tests/{ => qtest}/m48t59-test.c | 0 tests/{ => qtest}/machine-none-test.c | 0 tests/{ => qtest}/megasas-test.c | 0 tests/{ => qtest}/microbit-test.c | 0 tests/{ => qtest}/migration-test.c | 0 tests/{ => qtest}/modules-test.c | 0 tests/{ => qtest}/ne2000-test.c | 0 tests/{ => qtest}/numa-test.c | 0 tests/{ => qtest}/nvme-test.c | 0 tests/{ => qtest}/pca9552-test.c | 0 tests/{ => qtest}/pci-test.c | 0 tests/{ => qtest}/pcnet-test.c | 0 tests/{ => qtest}/pflash-cfi02-test.c | 0 tests/{ => qtest}/pnv-xscom-test.c | 0 tests/{ => qtest}/prom-env-test.c | 0 tests/{ => qtest}/pvpanic-test.c | 0 tests/{ => qtest}/pxe-test.c | 0 tests/{ => qtest}/q35-test.c | 0 tests/{ => qtest}/qmp-cmd-test.c | 0 tests/{ => qtest}/qmp-test.c | 0 tests/{ => qtest}/qom-test.c | 0 tests/{ => qtest}/qos-test.c | 0 tests/{ => qtest}/rtas-test.c | 0 tests/{ => qtest}/rtc-test.c | 0 tests/{ => qtest}/rtl8139-test.c | 0 tests/{ => qtest}/sdhci-test.c | 0 tests/{ => qtest}/spapr-phb-test.c | 0 tests/{ => qtest}/tco-test.c | 0 tests/{ => qtest}/test-arm-mptimer.c | 0 tests/{ => qtest}/test-filter-mirror.c | 0 tests/{ => qtest}/test-filter-redirector.c | 0 tests/{ => qtest}/test-hmp.c | 0 tests/{ => qtest}/test-netfilter.c | 0 tests/{ => qtest}/test-x86-cpuid-compat.c | 0 tests/{ => qtest}/tmp105-test.c | 0 tests/{ => qtest}/tpm-crb-swtpm-test.c | 0 tests/{ => qtest}/tpm-crb-test.c | 0 tests/{ => qtest}/tpm-tests.c | 0 tests/{ => qtest}/tpm-tis-swtpm-test.c | 0 tests/{ => qtest}/tpm-tis-test.c | 0 tests/{ => qtest}/tpm-util.c | 0 tests/{ => qtest}/usb-hcd-ehci-test.c | 0 tests/{ => qtest}/usb-hcd-ohci-test.c | 0 tests/{ => qtest}/usb-hcd-uhci-test.c | 0 tests/{ => qtest}/usb-hcd-xhci-test.c | 0 tests/{ => qtest}/vhost-user-test.c | 0 tests/{ => qtest}/virtio-9p-test.c | 0 tests/{ => qtest}/virtio-blk-test.c | 0 tests/{ => qtest}/virtio-ccw-test.c | 0 tests/{ => qtest}/virtio-net-test.c | 0 tests/{ => qtest}/virtio-rng-test.c | 0 tests/{ => qtest}/virtio-scsi-test.c | 0 tests/{ => qtest}/virtio-serial-test.c | 0 tests/{ => qtest}/virtio-test.c | 0 tests/{ => qtest}/vmgenid-test.c | 0 tests/{ => qtest}/vmxnet3-test.c | 0 tests/{ => qtest}/wdt_ib700-test.c | 0 100 files changed, 138 insertions(+), 137 deletions(-) rename tests/{ => qtest}/ac97-test.c (100%) rename tests/{ => qtest}/acpi-utils.c (100%) rename tests/{ => qtest}/acpi-utils.h (100%) rename tests/{ => qtest}/ahci-test.c (100%) rename tests/{ => qtest}/bios-tables-test-allowed-diff.h (100%) rename tests/{ => qtest}/bios-tables-test.c (100%) rename tests/{ => qtest}/boot-order-test.c (100%) rename tests/{ => qtest}/boot-sector.c (100%) rename tests/{ => qtest}/boot-sector.h (100%) rename tests/{ => qtest}/boot-serial-test.c (100%) rename tests/{ => qtest}/cdrom-test.c (100%) rename tests/{ => qtest}/cpu-plug-test.c (100%) rename tests/{ => qtest}/device-introspect-test.c (100%) rename tests/{ => qtest}/device-plug-test.c (100%) rename tests/{ => qtest}/display-vga-test.c (100%) rename tests/{ => qtest}/drive_del-test.c (100%) rename tests/{ => qtest}/ds1338-test.c (100%) rename tests/{ => qtest}/e1000-test.c (100%) rename tests/{ => qtest}/e1000e-test.c (100%) rename tests/{ => qtest}/eepro100-test.c (100%) rename tests/{ => qtest}/endianness-test.c (100%) rename tests/{ => qtest}/es1370-test.c (100%) rename tests/{ => qtest}/fdc-test.c (100%) rename tests/{ => qtest}/fw_cfg-test.c (100%) rename tests/{ => qtest}/hd-geo-test.c (100%) rename tests/{ => qtest}/hexloader-test.c (100%) rename tests/{ => qtest}/i440fx-test.c (100%) rename tests/{ => qtest}/i82801b11-test.c (100%) rename tests/{ => qtest}/ide-test.c (100%) rename tests/{ => qtest}/intel-hda-test.c (100%) rename tests/{ => qtest}/ioh3420-test.c (100%) rename tests/{ => qtest}/ipmi-bt-test.c (100%) rename tests/{ => qtest}/ipmi-kcs-test.c (100%) rename tests/{ => qtest}/ipoctal232-test.c (100%) rename tests/{ => qtest}/ivshmem-test.c (100%) rename tests/{ => qtest}/libqtest-single.h (100%) rename tests/{ => qtest}/libqtest.c (100%) rename tests/{ => qtest}/libqtest.h (100%) rename tests/{ => qtest}/m25p80-test.c (100%) rename tests/{ => qtest}/m48t59-test.c (100%) rename tests/{ => qtest}/machine-none-test.c (100%) rename tests/{ => qtest}/megasas-test.c (100%) rename tests/{ => qtest}/microbit-test.c (100%) rename tests/{ => qtest}/migration-test.c (100%) rename tests/{ => qtest}/modules-test.c (100%) rename tests/{ => qtest}/ne2000-test.c (100%) rename tests/{ => qtest}/numa-test.c (100%) rename tests/{ => qtest}/nvme-test.c (100%) rename tests/{ => qtest}/pca9552-test.c (100%) rename tests/{ => qtest}/pci-test.c (100%) rename tests/{ => qtest}/pcnet-test.c (100%) rename tests/{ => qtest}/pflash-cfi02-test.c (100%) rename tests/{ => qtest}/pnv-xscom-test.c (100%) rename tests/{ => qtest}/prom-env-test.c (100%) rename tests/{ => qtest}/pvpanic-test.c (100%) rename tests/{ => qtest}/pxe-test.c (100%) rename tests/{ => qtest}/q35-test.c (100%) rename tests/{ => qtest}/qmp-cmd-test.c (100%) rename tests/{ => qtest}/qmp-test.c (100%) rename tests/{ => qtest}/qom-test.c (100%) rename tests/{ => qtest}/qos-test.c (100%) rename tests/{ => qtest}/rtas-test.c (100%) rename tests/{ => qtest}/rtc-test.c (100%) rename tests/{ => qtest}/rtl8139-test.c (100%) rename tests/{ => qtest}/sdhci-test.c (100%) rename tests/{ => qtest}/spapr-phb-test.c (100%) rename tests/{ => qtest}/tco-test.c (100%) rename tests/{ => qtest}/test-arm-mptimer.c (100%) rename tests/{ => qtest}/test-filter-mirror.c (100%) rename tests/{ => qtest}/test-filter-redirector.c (100%) rename tests/{ => qtest}/test-hmp.c (100%) rename tests/{ => qtest}/test-netfilter.c (100%) rename tests/{ => qtest}/test-x86-cpuid-compat.c (100%) rename tests/{ => qtest}/tmp105-test.c (100%) rename tests/{ => qtest}/tpm-crb-swtpm-test.c (100%) rename tests/{ => qtest}/tpm-crb-test.c (100%) rename tests/{ => qtest}/tpm-tests.c (100%) rename tests/{ => qtest}/tpm-tis-swtpm-test.c (100%) rename tests/{ => qtest}/tpm-tis-test.c (100%) rename tests/{ => qtest}/tpm-util.c (100%) rename tests/{ => qtest}/usb-hcd-ehci-test.c (100%) rename tests/{ => qtest}/usb-hcd-ohci-test.c (100%) rename tests/{ => qtest}/usb-hcd-uhci-test.c (100%) rename tests/{ => qtest}/usb-hcd-xhci-test.c (100%) rename tests/{ => qtest}/vhost-user-test.c (100%) rename tests/{ => qtest}/virtio-9p-test.c (100%) rename tests/{ => qtest}/virtio-blk-test.c (100%) rename tests/{ => qtest}/virtio-ccw-test.c (100%) rename tests/{ => qtest}/virtio-net-test.c (100%) rename tests/{ => qtest}/virtio-rng-test.c (100%) rename tests/{ => qtest}/virtio-scsi-test.c (100%) rename tests/{ => qtest}/virtio-serial-test.c (100%) rename tests/{ => qtest}/virtio-test.c (100%) rename tests/{ => qtest}/vmgenid-test.c (100%) rename tests/{ => qtest}/vmxnet3-test.c (100%) rename tests/{ => 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="$(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/pxe-test - for tg in $TARGETS ; do export QTEST_QEMU_BINARY="${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="x86_64-softmmu/qemu-system-x86_64" ./tests/pxe-test - - QTEST_QEMU_BINARY="s390x-softmmu/qemu-system-s390x" ./tests/pxe-test -m slow + - QTEST_QEMU_BINARY="x86_64-softmmu/qemu-system-x86_64" ./tests/qtest/pxe-test + - QTEST_QEMU_BINARY="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 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 @@ -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 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/ @@ -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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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/ 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 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="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" -DIRS="$DIRS tests/fp tests/qgraph" +DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/tcg/xtensa" +DIRS="$DIRS tests/libqos tests/qtest tests/qapi-schema tests/qemu-iotests" +DIRS="$DIRS tests/fp tests/vm" DIRS="$DIRS docs docs/interop fsdev scsi" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$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 += tests/include/test-qapi-events-sub-module.h generated-files-y += tests/test-qapi-events-sub-sub-module.h generated-files-y += tests/test-qapi-introspect.h -QEMU_CFLAGS += -I$(SRC_PATH)/tests +QEMU_CFLAGS += -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest # 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-emu.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-io-obj-y) -tests/tpm-tis-swtpm-test$(EXESUF): tests/tpm-tis-swtpm-test.o tests/tpm-emu.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-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-emu.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-emu.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 += tests/libqos/ahci.o libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o # Devices -qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y) +qos-test-obj-y = tests/qtest/qos-test.o $(libqgraph-obj-y) qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y) qos-test-obj-y += tests/libqos/e1000e.o qos-test-obj-y += tests/libqos/i2c.o @@ -738,96 +738,96 @@ qos-test-obj-y += tests/libqos/ppc64_pseries-machine.o qos-test-obj-y += tests/libqos/x86_64_pc-machine.o # Tests -qos-test-obj-y += tests/ac97-test.o -qos-test-obj-y += tests/ds1338-test.o -qos-test-obj-y += tests/e1000-test.o -qos-test-obj-y += tests/e1000e-test.o -qos-test-obj-y += tests/eepro100-test.o -qos-test-obj-y += tests/es1370-test.o -qos-test-obj-y += tests/ipoctal232-test.o -qos-test-obj-y += tests/megasas-test.o -qos-test-obj-y += tests/ne2000-test.o -qos-test-obj-y += tests/nvme-test.o -qos-test-obj-y += tests/pca9552-test.o -qos-test-obj-y += tests/pci-test.o -qos-test-obj-y += tests/pcnet-test.o -qos-test-obj-y += tests/sdhci-test.o -qos-test-obj-y += tests/spapr-phb-test.o -qos-test-obj-y += tests/tmp105-test.o -qos-test-obj-y += tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y) -qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y) -qos-test-obj-y += tests/virtio-test.o -qos-test-obj-$(CONFIG_VIRTFS) += tests/virtio-9p-test.o -qos-test-obj-y += tests/virtio-blk-test.o -qos-test-obj-y += tests/virtio-net-test.o -qos-test-obj-y += tests/virtio-rng-test.o -qos-test-obj-y += tests/virtio-scsi-test.o -qos-test-obj-y += tests/virtio-serial-test.o -qos-test-obj-y += tests/vmxnet3-test.o +qos-test-obj-y += tests/qtest/ac97-test.o +qos-test-obj-y += tests/qtest/ds1338-test.o +qos-test-obj-y += tests/qtest/e1000-test.o +qos-test-obj-y += tests/qtest/e1000e-test.o +qos-test-obj-y += tests/qtest/eepro100-test.o +qos-test-obj-y += tests/qtest/es1370-test.o +qos-test-obj-y += tests/qtest/ipoctal232-test.o +qos-test-obj-y += tests/qtest/megasas-test.o +qos-test-obj-y += tests/qtest/ne2000-test.o +qos-test-obj-y += tests/qtest/nvme-test.o +qos-test-obj-y += tests/qtest/pca9552-test.o +qos-test-obj-y += tests/qtest/pci-test.o +qos-test-obj-y += tests/qtest/pcnet-test.o +qos-test-obj-y += tests/qtest/sdhci-test.o +qos-test-obj-y += tests/qtest/spapr-phb-test.o +qos-test-obj-y += tests/qtest/tmp105-test.o +qos-test-obj-y += tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y) +qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/qtest/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y) +qos-test-obj-y += tests/qtest/virtio-test.o +qos-test-obj-$(CONFIG_VIRTFS) += tests/qtest/virtio-9p-test.o +qos-test-obj-y += tests/qtest/virtio-blk-test.o +qos-test-obj-y += tests/qtest/virtio-net-test.o +qos-test-obj-y += tests/qtest/virtio-rng-test.o +qos-test-obj-y += tests/qtest/virtio-scsi-test.o +qos-test-obj-y += tests/qtest/virtio-serial-test.o +qos-test-obj-y += tests/qtest/vmxnet3-test.o check-unit-y += tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) check-qtest-generic-y += 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$(EXESUF) -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-obj-y) -tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y) -tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y) -tests/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_scm_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 $(qtest-obj-y) -tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y) -tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-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 tests/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-obj-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 $(libqos-obj-y) +tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(libqos-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-sector.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-obj-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-obj-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/qemu-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-redirector.o $(qtest-obj-y) +tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-compat.o $(qtest-obj-y) +tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivshmem-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 $@ $< ,"LINK","$(TARGET_DIR)$@") @@ -846,13 +846,13 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF) TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) -check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%=tests/%$(EXESUF))) -check-qtest-y += $(check-qtest-generic-y:%=tests/%$(EXESUF)) +check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%=tests/qtest/%$(EXESUF))) +check-qtest-y += $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)) else QTEST_TARGETS = endif -qtest-obj-y = tests/libqtest.o $(test-util-obj-y) +qtest-obj-y = tests/qtest/libqtest.o $(test-util-obj-y) $(check-qtest-y): $(qtest-obj-y) tests/test-qga$(EXESUF): qemu-ga$(EXESUF) @@ -897,7 +897,7 @@ endef .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/all $(check-qtest-y) - $(call do_test_human,$(check-qtest-$*-y:%=tests/%$(EXESUF)) $(check-qtest-generic-y:%=tests/%$(EXESUF)), \ + $(call do_test_human,$(check-qtest-$*-y:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \ QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF)) @@ -910,7 +910,7 @@ check-speed: $(check-speed-y) # gtester tests with TAP output $(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: %-softmmu/all $(check-qtest-y) - $(call do_test_tap, $(check-qtest-$*-y:%=tests/%$(EXESUF)) $(check-qtest-generic-y:%=tests/%$(EXESUF)), \ + $(call do_test_tap, $(check-qtest-$*-y:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \ QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF)) @@ -1172,8 +1172,8 @@ check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-block check-qapi-schema check-unit check-softfloat check-qtest 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-$(target)-y:%=tests/%$(EXESUF))) $(check-qtest-generic-y:%=tests/%$(EXESUF))) + rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) + rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF))) rm -f tests/test-qapi-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) @@ -1184,6 +1184,7 @@ clean: check-clean all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) +-include $(wildcard tests/qtest/*.d) -include $(wildcard tests/libqos/*.d) 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-tables-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-redirector.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-compat.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 -- 2.18.1