From nobody Sat Apr 27 16:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576665381; cv=none; d=zohomail.com; s=zohoarc; b=XTWFN8TtAx37tYY8zdkWiHPzh9lKazRdp0BkviBTkIZeOT8Jj61lXdUk6FQSjT1yrFML13R/ZAmCN/YJ3Fp+2gfq0lQI15y0NoiV8u8iKxpvsRf8mc7Adt35rqtaWSGlF9XshQXk2VILIpBE8czHIsF1H6EjkrYK8qQSSjit8aA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576665381; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=RH9IeDHzfaeZ6Cs/DQpi/Xmp0whC04MLlo9nB9zR0Yg=; b=d+8WG0zwR5cZEMAizt5UcfUYVu+/L048ddcPRpZJR32OwhxvHwvQ4kbz2mYITnEv1FWJ48ROceNOFNpiGqx0iqtfTiVguMxbZMqlKxc0zKiMaW3OCyd/ZlwWiQIVxVlIIEFlSnkFGl+gnSridldgGR8BnN68kHAG/8b4xxgTXew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1576665381403744.3085295095741; Wed, 18 Dec 2019 02:36:21 -0800 (PST) Received: from localhost ([::1]:52242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWgm-0007Zo-6M for importer@patchew.org; Wed, 18 Dec 2019 05:36:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36457) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWbt-0001p2-4G for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWbs-0000Fa-53 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:17 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:54997 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWbs-0000DY-07 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:16 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-zNurTfR3NZmP9S7gmLaboQ-1; Wed, 18 Dec 2019 05:31:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90F3E801E78; Wed, 18 Dec 2019 10:31:06 +0000 (UTC) Received: from thuth.com (ovpn-116-150.ams2.redhat.com [10.36.116.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5230F5C28D; Wed, 18 Dec 2019 10:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576665075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RH9IeDHzfaeZ6Cs/DQpi/Xmp0whC04MLlo9nB9zR0Yg=; b=AE4vaFiUomKOlsEM8iPQRQhTH39VODG/OJ2ktdmVGBoLN5CDllKY/Y7uQpyIADRuHvEw5o eG0zjJl5K2Z4xoJKbqBYxAlDFzs+TZqp/YkjZTKiqP+6mNmjn+NP26GLc9gu5NFxSbDBJN oD5rJM8J7WLavh/gr1pJJ31P9Yz/TII= From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH v2 1/7] tests/Makefile: test-char does not need libqtest Date: Wed, 18 Dec 2019 11:30:53 +0100 Message-Id: <20191218103059.11729-2-thuth@redhat.com> In-Reply-To: <20191218103059.11729-1-thuth@redhat.com> References: <20191218103059.11729-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: zNurTfR3NZmP9S7gmLaboQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Paolo Bonzini --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index b381387048..16eb4aa7ba 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -538,7 +538,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 27 16:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576665177; cv=none; d=zohomail.com; s=zohoarc; b=beBY7MHKud6K0r+Lwoaqdz9R2wVEJmQJKZez3QZKCWJRYlQFvKr9a7yhD5FbD/TTPeoydXFVqASo/GGi9ROkoaAWYFJuUjKFyKQ/UntGMazpFMrituo7Aei5CzJbQ7yiVL0E5jZGyX2obsrywDCCsfBOH5V9QH3+U3IvmF9gUmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576665177; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=kORAgGltljUbJQe+Zm0MInnJsu1cF2wnvhKTXDKjwrw=; b=SnBl9B4PSEXT9A5UXEO/7g0H3KMVrQZTJ/KsA8VuG72dLHcpmjEzTFgY0J9Jp9I4Z1pT4C7h8+jCmm4J3+Sei2E2+Hdzh8d32zQyZKtsrei757dpFgh3pyofg/LamW+APY5Si0HRQ2mdF84ztkLrfOkuo/O8bfhMpXWHyU6/o1Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1576665177266202.5424810170099; Wed, 18 Dec 2019 02:32:57 -0800 (PST) Received: from localhost ([::1]:52196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWdT-000375-Sv for importer@patchew.org; Wed, 18 Dec 2019 05:32:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35398) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWbp-0001lJ-My for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWbn-0008Kw-Pd for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51899 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWbn-0008H3-Jn for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:11 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-DbaMgIX1OlaMvvhUPMaoHQ-1; Wed, 18 Dec 2019 05:31:09 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3761C8017DF; Wed, 18 Dec 2019 10:31:08 +0000 (UTC) Received: from thuth.com (ovpn-116-150.ams2.redhat.com [10.36.116.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE7E35C28C; Wed, 18 Dec 2019 10:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576665070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kORAgGltljUbJQe+Zm0MInnJsu1cF2wnvhKTXDKjwrw=; b=WdM1IpZ4w1Ws/yngkr68yw5freWeYfI5TjPqcc+AjeZq1BVwUTHbzGfW8mr3QX1fhxb5Xo iJTI8HDWS4hDhVOlWmaPhQxhSCyFccCRvKxlJEoM2EYFjI/BE35IkNMdCLNPHb2wFFw48J rEeD2h2uUAp7oSDuxMrg/fOGUc01Gb8= From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH v2 2/7] tests/ptimer: Remove unnecessary inclusion of libqtest.h Date: Wed, 18 Dec 2019 11:30:54 +0100 Message-Id: <20191218103059.11729-3-thuth@redhat.com> In-Reply-To: <20191218103059.11729-1-thuth@redhat.com> References: <20191218103059.11729-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: DbaMgIX1OlaMvvhUPMaoHQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Paolo Bonzini --- tests/ptimer-test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c index e16c30ce57..9176b96c1c 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 27 16:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576665183; cv=none; d=zohomail.com; s=zohoarc; b=la1buWfGZiKFJXtc7SFpQHkV7/d5U838QNYGHX3hEes0VAVftzYQyLCM5ue5mJ5Wd7RLTfvT9mV++NAFrzoaLfyEuxpYqkqlUGbfjVn+FBltTcOliGlfETCGc6r2I5bx5IiIpNfNiUukr9mVhQxJI3IAhyNBMo/DL+HCg8qjOyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576665183; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=s3p6EgmUwLNqTAQosjZv8AScevIqcw1SuzyfY+IhmsI=; b=Rs8flQdldKbbhX1E8GPnmOIhWWvyuNNmFTT2GWVbZHvXnqAMX/Q71+xlGcT2a4DE9FcRVOCalWzNICM02y75CvyTF/x40FKp20M0V3bf8fvBF6VVxpVGEcGiZBsFSWxcqghgZutR6Ce1F1NOG2lAeLgGXpK+Exw5gYapfNxph48= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1576665183556391.12001135850767; Wed, 18 Dec 2019 02:33:03 -0800 (PST) Received: from localhost ([::1]:52198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWdZ-0003D1-Vg for importer@patchew.org; Wed, 18 Dec 2019 05:33:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36007) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWbr-0001nP-9B for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWbo-0008Re-Sy for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42700 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWbo-0008PR-NP for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:12 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-173-qzgOkxPVONyEik5MCzOK6w-1; Wed, 18 Dec 2019 05:31:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 131F6800D4C; Wed, 18 Dec 2019 10:31:10 +0000 (UTC) Received: from thuth.com (ovpn-116-150.ams2.redhat.com [10.36.116.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id 967F65C3FA; Wed, 18 Dec 2019 10:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576665072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s3p6EgmUwLNqTAQosjZv8AScevIqcw1SuzyfY+IhmsI=; b=adfXRW/NJW8BpgFZ/7zMOKmM8/MxxwCIS83ZRtYuHLVjlj0gcMsq1zAQwyTeaNXA7aPYLx pPOuA5foNd9S+Cb+afcZblrZ327OUeWqNqj44KlNkaWfdayKAUc9CtVgY4q89pmVzs1PYA hLIHfQ09Ng9e2ufKGTxxhNwxFxZEttM= From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH v2 3/7] tests/Makefile: Remove 'tests/' and '$(EXESUF)' from the check-qtest variables Date: Wed, 18 Dec 2019 11:30:55 +0100 Message-Id: <20191218103059.11729-4-thuth@redhat.com> In-Reply-To: <20191218103059.11729-1-thuth@redhat.com> References: <20191218103059.11729-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: qzgOkxPVONyEik5MCzOK6w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Paolo Bonzini --- tests/Makefile.include | 258 +++++++++++++++++++++-------------------- 1 file changed, 130 insertions(+), 128 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 16eb4aa7ba..9992e0e58c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -152,151 +152,153 @@ 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 ifdef CONFIG_LINUX -check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D tests/ipmi-bt-test$(EXESUF) +check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D ipmi-bt-test endif -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-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-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) +=3D t= ests/usb-hcd-ehci-test$(EXESUF) -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_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 +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) +=3D u= sb-hcd-ehci-test +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/arm-cpu-features$(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/arm-cpu-features$(EXESUF) -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 arm-cpu-features +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 arm-cpu-features +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 @@ -778,7 +780,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 @@ -862,8 +864,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 @@ -913,7 +915,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 @@ -926,7 +928,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 @@ -1195,7 +1197,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 27 16:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576665298; cv=none; d=zohomail.com; s=zohoarc; b=AI8yYGd2R7G63UTIPD0gOvQkPJB4y/P5+0ogYmmAH3d4fFUiYttUbEFNSPZ0KksJm8HQYCxGxy6d7MEiCl5q5CdYymOCm0qGT/jBl/L+WmpIkOgNa6Y6JrQnN+CRY0y/El72zhGc7yuoJb77xDVk/aaToii+s+GBwBaMBM3Q28Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576665298; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=C26hGfTEgupSC1ecDjpBnvNwS4v/JX/Nx0mF9WYzFYo=; b=kqUQDOJs3bjnQ5aPt68jGDA+XQhg0+gG33QxbsJyRFFeWwsGNeaesbZh9Hs4DLxe2MMAVpmYDVqXgx9lct1VSTaRhP/3Qo0L7Kd7TRf8LGP/nUi42TN541HAnctT9z570V+WVJ/cQVWHZiad1fP6okW0QoNQE2s5FDq84Pu6G+I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 15766652983571004.0701414830132; Wed, 18 Dec 2019 02:34:58 -0800 (PST) Received: from localhost ([::1]:52218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWfR-0005hx-2F for importer@patchew.org; Wed, 18 Dec 2019 05:34:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36943) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWbv-0001r0-5J for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWbt-0000Pp-VE for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:19 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:52787 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWbt-0000M5-QV for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:17 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-PST4CEBcOz-mgSSoFKAvHQ-1; Wed, 18 Dec 2019 05:31:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5D2818B9FC9; Wed, 18 Dec 2019 10:31:11 +0000 (UTC) Received: from thuth.com (ovpn-116-150.ams2.redhat.com [10.36.116.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id 884615C3FA; Wed, 18 Dec 2019 10:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576665077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C26hGfTEgupSC1ecDjpBnvNwS4v/JX/Nx0mF9WYzFYo=; b=hh8zN2y+u1c1xxeqX4W/y2ZYuxfh7MkCy71E3oiu4Pnun75xyvQJp5vW+4Mzc9zEgIy8kZ 77ETJv+W2N4SZJ0LyQMdXyQNntrV5abJdz0P0KHbYXsUv/Bggi1OV9sJ3iiTsfPiLclrWC 5DiHMdK66J8MAnw+LOo+WnvGiyNRJDA= From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH v2 4/7] tests/Makefile: Separate unit test dependencies from qtest dependencies Date: Wed, 18 Dec 2019 11:30:56 +0100 Message-Id: <20191218103059.11729-5-thuth@redhat.com> In-Reply-To: <20191218103059.11729-1-thuth@redhat.com> References: <20191218103059.11729-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: PST4CEBcOz-mgSSoFKAvHQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Paolo Bonzini --- tests/Makefile.include | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9992e0e58c..e3b199cf09 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -589,6 +589,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 @@ -830,18 +835,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 27 16:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576665344; cv=none; d=zohomail.com; s=zohoarc; b=n0sBKCbT9ObLCaa7jGba+Cj/JtlQfcfvl1qCOe5+ovZXAPbwRwiK4pchpTIVjdysYOs5mKw1jJkanvUJW+b3EKhjklNKmCew3iiYL6bVNTPr5Tm96j5lu/JXvTGdlzwy59Nmh0aRAnrHf6u3f/Qk7x3okvh622xkr6ln7t06PJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576665344; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Ndu/KcKhXnTzlsoRKFIBHEbeTtnMMbcyNBsJhcRgzB8=; b=KDnZvHFjPprvtKE6biofDGb4vrTmMJhblAdK0f7gtP3CULs34KM7JTo/SbjGSwCNYI7VwCxLKtgp/yoDuVWuBx1wZP50/vNygk/1688TMURmNBw5O2I9TkzCQDxnZn/XLz9oCJ1hl8whFEKZQ+MFw5qEDo3UQDSy805tLYVL7h4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1576665344677645.6438921754831; Wed, 18 Dec 2019 02:35:44 -0800 (PST) Received: from localhost ([::1]:52224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWgB-0006Wn-75 for importer@patchew.org; Wed, 18 Dec 2019 05:35:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39093) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWc4-000237-D4 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWbx-0000fn-EQ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50287 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWbx-0000d1-5y for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:21 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-KQY-0lVMOVuAxB0-u3ypNQ-1; Wed, 18 Dec 2019 05:31:14 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A230B800D4C; Wed, 18 Dec 2019 10:31:13 +0000 (UTC) Received: from thuth.com (ovpn-116-150.ams2.redhat.com [10.36.116.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FFB85C28C; Wed, 18 Dec 2019 10:31:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576665080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ndu/KcKhXnTzlsoRKFIBHEbeTtnMMbcyNBsJhcRgzB8=; b=c4VOQ1P07LYpV1DqAejEAKdm24hMg5CHG6LpOxBj/10VJjujUiexprih0kARKk3hNwVU3h eSFOnocTR5CVfHJYsgmryDuhYvswHWONZEi1Hy4dT1AtW/KCwTBiLr7A4Ldp/6XvnntUhW mVhBndlzDh+0Liwvq3coiOCC4OCzrVc= From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH v2 5/7] test: Move qtests to a separate directory Date: Wed, 18 Dec 2019 11:30:57 +0100 Message-Id: <20191218103059.11729-6-thuth@redhat.com> In-Reply-To: <20191218103059.11729-1-thuth@redhat.com> References: <20191218103059.11729-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: KQY-0lVMOVuAxB0-u3ypNQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Paolo Bonzini --- .gitlab-ci.yml | 11 +- MAINTAINERS | 79 ++++--- configure | 4 +- tests/Makefile.include | 203 +++++++++--------- 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 tests/{ =3D> qtest}/arm-cpu-features.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-emu.c | 0 tests/{ =3D> qtest}/tpm-emu.h | 0 tests/{ =3D> qtest}/tpm-tests.c | 0 tests/{ =3D> qtest}/tpm-tests.h | 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}/tpm-util.h | 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 105 files changed, 148 insertions(+), 149 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}/arm-cpu-features.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-emu.c (100%) rename tests/{ =3D> qtest}/tpm-emu.h (100%) rename tests/{ =3D> qtest}/tpm-tests.c (100%) rename tests/{ =3D> qtest}/tpm-tests.h (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}/tpm-util.h (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 e3db1b847c..9af4fb548a 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 740401bcbb..d571e16cc8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -532,7 +532,7 @@ F: include/hw/misc/arm11scu.h F: include/hw/timer/a9gtimer.h F: include/hw/timer/arm_mptimer.h F: include/hw/timer/armv7m_systick.h -F: tests/test-arm-mptimer.c +F: tests/qtest/test-arm-mptimer.c =20 Exynos M: Igor Mitsyanko @@ -863,7 +863,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 ------------- @@ -1100,9 +1100,9 @@ F: include/hw/*/xics* F: pc-bios/slof.bin F: docs/specs/ppc-spapr-hcalls.txt F: docs/specs/ppc-spapr-hotplug.txt -F: tests/spapr* +F: tests/qtest/spapr* F: tests/libqos/*spapr* -F: tests/rtas* +F: tests/qtest/rtas* F: tests/libqos/rtas* =20 PowerNV (Non-Virtualized) @@ -1115,7 +1115,7 @@ F: hw/intc/pnv* F: hw/intc/xics_pnv.c F: include/hw/ppc/pnv* F: pc-bios/skiboot.lid -F: tests/pnv* +F: tests/qtest/pnv* =20 virtex_ml507 M: Edgar E. Iglesias @@ -1263,7 +1263,7 @@ F: hw/misc/sga.c F: hw/isa/apm.c F: include/hw/isa/apm.h F: tests/test-x86-cpuid.c -F: tests/test-x86-cpuid-compat.c +F: tests/qtest/test-x86-cpuid-compat.c =20 PC Chipset M: Michael S. Tsirkin @@ -1359,9 +1359,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 @@ -1371,7 +1371,7 @@ S: Maintained F: include/hw/ipmi/* F: hw/ipmi/* F: hw/smbios/smbios_type_38.c -F: tests/ipmi* +F: tests/qtest/ipmi* T: git https://github.com/cminyard/qemu.git master-ipmi-rebase =20 Floppy @@ -1380,7 +1380,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 @@ -1418,8 +1418,8 @@ 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/acpi-utils.[hc] +F: tests/qtest/bios-tables-test.c +F: tests/qtest/acpi-utils.[hc] F: tests/data/acpi/ =20 ppc4xx @@ -1442,7 +1442,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 F: docs/virtio-net-failover.rst T: git https://github.com/jasowang/qemu.git net =20 @@ -1459,7 +1459,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 @@ -1469,7 +1469,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 @@ -1482,13 +1482,13 @@ S: Odd Fixes F: include/hw/sd/sd* F: hw/sd/core.c F: hw/sd/sd* -F: tests/sd* +F: tests/qtest/sd* =20 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 @@ -1550,7 +1550,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 @@ -1558,7 +1557,7 @@ S: Odd Fixes 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 @@ -1567,7 +1566,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 @@ -1595,8 +1594,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: Laurent Vivier @@ -1606,7 +1604,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 @@ -1620,7 +1618,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 @@ -1628,7 +1626,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 @@ -1643,7 +1641,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 @@ -1691,7 +1689,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 @@ -1699,7 +1697,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 @@ -1707,7 +1705,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 @@ -1777,7 +1775,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 @@ -1797,9 +1795,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 @@ -2000,7 +1998,7 @@ F: monitor/hmp* F: hmp.h F: hmp-commands*.hx F: include/monitor/hmp-target.h -F: tests/test-hmp.c +F: tests/qtest/test-hmp.c F: include/qemu/qemu-print.h F: util/qemu-print.c =20 @@ -2126,8 +2124,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 @@ -2137,9 +2135,8 @@ R: Paolo Bonzini S: Maintained 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 @@ -2183,7 +2180,7 @@ F: include/hw/acpi/tpm.h F: include/sysemu/tpm* F: qapi/tpm.json F: backends/tpm.c -F: tests/*tpm* +F: tests/qtest/*tpm* T: git https://github.com/stefanberger/qemu-tpm.git tpm-next =20 Checkpatch @@ -2198,7 +2195,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 84b413dbfc..121f1317e2 100755 --- a/configure +++ b/configure @@ -7952,8 +7952,8 @@ 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/lm32 tests/libqos tests/qapi-schema test= s/qemu-iotests tests/vm" -DIRS=3D"$DIRS tests/fp tests/qgraph" +DIRS=3D"tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema test= s/qtest" +DIRS=3D"$DIRS tests/qemu-iotests tests/vm tests/fp tests/qgraph" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios roms/vgabios" diff --git a/tests/Makefile.include b/tests/Makefile.include index e3b199cf09..76154aece8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -508,7 +508,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 @@ -687,12 +687,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/qtest/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/qtest/= tpm-emu.o $(test-io-obj-y) +tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o = tests/qtest/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/qtest/= 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 \ @@ -722,7 +722,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 @@ -755,97 +755,97 @@ 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 $(libqos-obj-y) -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/arm-cpu-features$(EXESUF): tests/arm-cpu-features.o +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 $(libqos-obj-y) +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/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o =20 tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") @@ -864,13 +864,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) @@ -915,7 +915,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 @@ -928,7 +928,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 @@ -1196,8 +1196,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 @@ -1208,6 +1208,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/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c similarity index 100% rename from tests/arm-cpu-features.c rename to tests/qtest/arm-cpu-features.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-emu.c b/tests/qtest/tpm-emu.c similarity index 100% rename from tests/tpm-emu.c rename to tests/qtest/tpm-emu.c diff --git a/tests/tpm-emu.h b/tests/qtest/tpm-emu.h similarity index 100% rename from tests/tpm-emu.h rename to tests/qtest/tpm-emu.h 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-tests.h b/tests/qtest/tpm-tests.h similarity index 100% rename from tests/tpm-tests.h rename to tests/qtest/tpm-tests.h 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/tpm-util.h b/tests/qtest/tpm-util.h similarity index 100% rename from tests/tpm-util.h rename to tests/qtest/tpm-util.h 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 27 16:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576665480; cv=none; d=zohomail.com; s=zohoarc; b=n8DhfAXOZVipeG/A/9BvL0/NbaYlzeNQeGq3HqcMZy0u6oPxPWEtaTRTCUDYFHwQarOINH3r9Rt18HFS9FTmkPGUyDBmn0aI/P4sWfuHagpjm/4hNyxDXaxzAVnTSD3khjB3EQVYqud56ve+CW3PAciw94WVnaB6p4wOlMPIMIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576665480; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=3WnYpyewAudO0Pi2O4/MxrZ9ww/rTTfQOV2cfNEF9f4=; b=By3cRLaCc/dCEKNa3rD857JyKzOK5g4DZqBprK4wkGTbQnVX14iS1j8yvlWw+g+SVJPKBzCG650ZOCnH288zQyjWyw/6L3mLkj+fJoPM2HAnp2FHlJ4ak3EHXQSh8n4xq8wTfcSagiPAip5ljI1O+/28hyPi6UJps/KLNVBc4N8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 157666548070681.22805772214224; Wed, 18 Dec 2019 02:38:00 -0800 (PST) Received: from localhost ([::1]:52258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWiN-0001Bk-1L for importer@patchew.org; Wed, 18 Dec 2019 05:37:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38414) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWc1-0001ze-En for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWbw-0000dP-VC for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27073 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWbw-0000ae-OQ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:20 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-338-zGusXaTWPRuTGpOjzhsSDQ-1; Wed, 18 Dec 2019 05:31:16 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 79761107ACC9; Wed, 18 Dec 2019 10:31:15 +0000 (UTC) Received: from thuth.com (ovpn-116-150.ams2.redhat.com [10.36.116.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id 095815C28C; Wed, 18 Dec 2019 10:31:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576665080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3WnYpyewAudO0Pi2O4/MxrZ9ww/rTTfQOV2cfNEF9f4=; b=W7LPEncUNaqhDOoeJapUdaIp8XqUY6pnmKyvVjtUB9tvboodqEkJaXraSgm/Tb/gtmPRoU Cr3tvs+XDDgWFezbzN1IIPz5/KkErSU3BgNoMZ5l5Vjp2Z3hHsj9xUdcTPr22BDQJXV53W BEXr6ssvPgn+MGetE54tImFcsZZz7Jo= From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH v2 6/7] tests/Makefile: Move qtest-related settings to a separate Makefile.include Date: Wed, 18 Dec 2019 11:30:58 +0100 Message-Id: <20191218103059.11729-7-thuth@redhat.com> In-Reply-To: <20191218103059.11729-1-thuth@redhat.com> References: <20191218103059.11729-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: zGusXaTWPRuTGpOjzhsSDQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Paolo Bonzini --- tests/Makefile.include | 311 +---------------------------------- tests/qtest/Makefile.include | 310 ++++++++++++++++++++++++++++++++++ 2 files changed, 311 insertions(+), 310 deletions(-) create mode 100644 tests/qtest/Makefile.include diff --git a/tests/Makefile.include b/tests/Makefile.include index 76154aece8..9d953097c4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -149,157 +149,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 -ifdef CONFIG_LINUX -check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D ipmi-bt-test -endif -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 -check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) +=3D u= sb-hcd-ehci-test -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 arm-cpu-features -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 arm-cpu-features -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 @@ -687,12 +536,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/qtest/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/qtest/= tpm-emu.o $(test-io-obj-y) -tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o = tests/qtest/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/qtest/= 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 \ @@ -707,146 +550,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-pci-modern.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 $(libqos-obj-y) -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/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o - tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") =20 @@ -859,19 +562,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..f758874e39 --- /dev/null +++ b/tests/qtest/Makefile.include @@ -0,0 +1,310 @@ +# 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-y +=3D qmp-test +check-qtest-generic-y +=3D qmp-cmd-test +check-qtest-generic-y +=3D qom-test +check-qtest-generic-$(CONFIG_MODULES) +=3D modules-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 +ifdef CONFIG_LINUX +check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D ipmi-bt-test +endif +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 +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) +=3D u= sb-hcd-ehci-test +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 arm-cpu-features +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 arm-cpu-features +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-pci-modern.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) + +# QTest dependencies: +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 $(libqos-obj-y) +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/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o +tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o = tests/qtest/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/qtest/= tpm-emu.o $(test-io-obj-y) +tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o = tests/qtest/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/qtest/= tpm-emu.o $(test-io-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 27 16:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576665409; cv=none; d=zohomail.com; s=zohoarc; b=H4nUGU+gLM+JIR7SR8uCDoqcQHhw3KH0kBcxnqNcz7HXQGePV9pOMCr+wW8WeIqdqDZMRjIuTm7f2PnEFCE/QxFGs8dvv2WytD3bB2m568+IIQuc63142uy5zLIe3a57RKMGEOKRHAUbTxCMG8Ct6G/fnv7giMU/NmaPMPBNeGM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576665409; 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; bh=8EKs08U5Urp0x6Ko5TIibUO31+q3ziB1hpd4Rnifa3Y=; b=QtHgmvNhrnfIi31dVzKlXLvfVTUt76iQGGsU/4Xat+QJ3oE3Cxs/XHrk/nOXOn4KoKMcPWs+KMBE5XTuiz9a2THrx4JziPDyjRcozkGEN+zw8RtAzRavG8uEVBTQz9gopeiDvUM1nv5hXVpfk/toj0rzNuFqdSBNJpRSyuR4YWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1576665409740243.9863643858472; Wed, 18 Dec 2019 02:36:49 -0800 (PST) Received: from localhost ([::1]:52246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWhE-0008IW-GX for importer@patchew.org; Wed, 18 Dec 2019 05:36:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWc2-00020S-2d for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWby-0000jX-AU for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28493 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWby-0000hD-2A for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:31:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-HVDZi7e4PVC6ZZsoTPYuJg-1; Wed, 18 Dec 2019 05:31:18 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53B5C800053; Wed, 18 Dec 2019 10:31:17 +0000 (UTC) Received: from thuth.com (ovpn-116-150.ams2.redhat.com [10.36.116.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8C255C28C; Wed, 18 Dec 2019 10:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576665081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8EKs08U5Urp0x6Ko5TIibUO31+q3ziB1hpd4Rnifa3Y=; b=W6k0lZwDCGOlwK3u96iDrkQbo3O995q5iD5sCy6KvSsr37TH2RJ6o7boif09Csbbq+uCNJ Y7g2T75VvUArsusij5WX7DD6e4nh+XWiUwrIi0JJq2aZKVNQDlaWm4zc0GrnXiuUbO/GH5 HjLY25L45Q2QJQ4u8rSkqxR1nHnm49M= From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH v2 7/7] tests/libqos: Move the libqos files under tests/qtest/ Date: Wed, 18 Dec 2019 11:30:59 +0100 Message-Id: <20191218103059.11729-8-thuth@redhat.com> In-Reply-To: <20191218103059.11729-1-thuth@redhat.com> References: <20191218103059.11729-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: HVDZi7e4PVC6ZZsoTPYuJg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Paolo Bonzini --- MAINTAINERS | 9 +-- configure | 4 +- tests/Makefile.include | 2 +- tests/qtest/Makefile.include | 80 +++++++++---------- .../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-modern.c | 0 tests/{ =3D> qtest}/libqos/virtio-pci-modern.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 74 files changed, 47 insertions(+), 48 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-modern.c (100%) rename tests/{ =3D> qtest}/libqos/virtio-pci-modern.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 d571e16cc8..b9456340f3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1101,9 +1101,9 @@ F: pc-bios/slof.bin F: docs/specs/ppc-spapr-hcalls.txt F: docs/specs/ppc-spapr-hotplug.txt F: tests/qtest/spapr* -F: tests/libqos/*spapr* +F: tests/qtest/libqos/*spapr* F: tests/qtest/rtas* -F: tests/libqos/rtas* +F: tests/qtest/libqos/rtas* =20 PowerNV (Non-Virtualized) M: C=C3=A9dric Le Goater @@ -1362,7 +1362,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/libqos/ahci* T: git https://github.com/jnsnow/qemu.git ide =20 IPMI @@ -1774,7 +1774,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/libqos/fw_cfg.c F: tests/qtest/fw_cfg-test.c T: git https://github.com/philmd/qemu.git fw_cfg-next =20 @@ -2135,7 +2135,6 @@ R: Paolo Bonzini S: Maintained F: qtest.c F: accel/qtest.c -F: tests/libqos/ F: tests/qtest/ =20 Register API diff --git a/configure b/configure index 121f1317e2..649d207784 100755 --- a/configure +++ b/configure @@ -7952,8 +7952,8 @@ 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/lm32 tests/libqos tests/qapi-schema test= s/qtest" -DIRS=3D"$DIRS tests/qemu-iotests tests/vm tests/fp tests/qgraph" +DIRS=3D"tests tests/tcg tests/tcg/lm32 tests/qapi-schema tests/qtest/libqo= s" +DIRS=3D"$DIRS tests/qtest tests/qemu-iotests tests/vm tests/fp tests/qgrap= h" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios roms/vgabios" diff --git a/tests/Makefile.include b/tests/Makefile.include index 9d953097c4..d4e3b6c6bb 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -900,6 +900,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 f758874e39..0fe48f9be8 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -148,52 +148,52 @@ 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-pci-modern.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-pci-modern.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-modern.c b/tests/qtest/libqos/virtio-p= ci-modern.c similarity index 100% rename from tests/libqos/virtio-pci-modern.c rename to tests/qtest/libqos/virtio-pci-modern.c diff --git a/tests/libqos/virtio-pci-modern.h b/tests/qtest/libqos/virtio-p= ci-modern.h similarity index 100% rename from tests/libqos/virtio-pci-modern.h rename to tests/qtest/libqos/virtio-pci-modern.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