From nobody Tue Feb 10 06:25:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513201587153530.0552108422714; Wed, 13 Dec 2017 13:46:27 -0800 (PST) Received: from localhost ([::1]:37886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePEr7-0007g3-Gc for importer@patchew.org; Wed, 13 Dec 2017 16:46:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePEhh-00012m-N4 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 16:36:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePEhe-0002HW-JF for qemu-devel@nongnu.org; Wed, 13 Dec 2017 16:36:37 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:46671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePEhe-0002H2-F9 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 16:36:34 -0500 Received: by mail-qk0-x244.google.com with SMTP id b184so3858984qkc.13 for ; Wed, 13 Dec 2017 13:36:34 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id x23sm1617150qkb.4.2017.12.13.13.36.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 13:36:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r3k9x7IohuY82sgFUPa8p0EE4sIhiLYE2ewWjmyZWkM=; b=XLWxrlDgZeg6awmQjyJlTORBfAr5xeyKidWLH7mp2m3L1W/FariWeMEXgdgkQlIGqe QISYTg/sczi7hStLqcWvP86Qi20GQ1PF+1umUHNY0biKOjgzQ2BuHwLqbQ/AyflgdI2R 0SPX7ey0qZ7OQ3BnIeKV24LziDa7hshmfEH33+WleVlANLw8eWsmqVyFlPnU1PVI4BJk QsMSoq46GkMkocKmJKSGd/K3dV6CxKD0q+1WyOYtjntt0KukfBawJQylKkKd+KTvrjMP pa8OeEtkMkPNwJw8YesHySeHQAu43CsGiTLx6qb4Upe3IIYTFckyvTFpUd35KnK11DFH rHtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=r3k9x7IohuY82sgFUPa8p0EE4sIhiLYE2ewWjmyZWkM=; b=IrrdVaTAvDMeG25Fz219VO3tjXcPuReuo4K5yYfwy8XhgXJiwSkDyYJ2vvrawtsqPl uTQf3aA1hE9RAl2vl4pG3jDiXUizNXRLcLvfg/G3+Eta4tDyullPYh+lUZNdKJqmJr+m gVXHvz8IwBZHeyc87g7AaGK45ZLBCfg16B8SCyACa0h7qeq39L96ku3+5baLdGL2PGqJ qtISg1dtTRk4bBMmERR9588JF4clkcj23sNoER32eL61ZR/VKc7P05agbshiBMB6+FmQ nk8zj+RBUazs+tjdXMvKArWigpHiBVsvEBppvOzVqQVrP5Qm48ZakrdcCyEyYXZKGUcG 8lkQ== X-Gm-Message-State: AKGB3mKjPGNJMXh/DUFlS7NnPfq3l0LbHYu5e5IVvGDpa81+gtDyKpRP 1seQisEgI4zXwKanY7eW3vs= X-Google-Smtp-Source: ACJfBouvnVGKiXRbEuBhDO3uVaePcUtv1+ER01vEXyi/4pwSwrvXHxiai58lTTBFuVPSv3vkI5Pw9A== X-Received: by 10.55.122.135 with SMTP id v129mr13122259qkc.104.1513200993933; Wed, 13 Dec 2017 13:36:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Cleber Rosa , Kevin Wolf , Max Reitz , John Snow , Eduardo Habkost , =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , "Daniel P . Berrange" , Eric Blake , Stefan Hajnoczi , Fam Zheng , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Date: Wed, 13 Dec 2017 18:35:57 -0300 Message-Id: <20171213213557.26561-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213213557.26561-1-f4bug@amsat.org> References: <20171213213557.26561-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH 6/6] tests: add a Makefile rule to run Python qtests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We can now add Python qtests to the common $(check-qtest-y) / $(check-qtest-$(TARGET)-y) variable. Using the $(filter...) function, the check-qtest-% rule splits between C/Py= thon qtests and can run both types. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/Makefile.include | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index c002352134..13673f6d1d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -828,7 +828,7 @@ endif 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$(foreach TARGET,$(TARGETS), $(filter-out %.py, $(check-qt= est-$(TARGET)-y))) check-qtest-y +=3D $(check-qtest-generic-y) else QTEST_TARGETS =3D @@ -843,6 +843,7 @@ tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) SPEED =3D quick GTESTER_OPTIONS =3D -k $(if $(V),--verbose,-q) GCOV_OPTIONS =3D -n $(if $(V),-f,) +QPYTHONS_OPTIONS =3D $(if $(V),-v,) =20 # gtester tests, possibly with verbose output =20 @@ -852,11 +853,15 @@ $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check= -qtest-%: subdir-%-softmmu $(call quiet-command,QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF) \ MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ - gtester $(GTESTER_OPTIONS) -m=3D$(SPEED) $(check-qtest-$*-y) $(check-qte= st-generic-y),"GTESTER","$@") + gtester $(GTESTER_OPTIONS) -m=3D$(SPEED) $(filter-out %.py,$(check-qtest= -$*-y) $(check-qtest-generic-y)),"GTESTER","$@") $(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y);= do \ echo Gcov report for $$f:;\ $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ done,) + $(if $(filter %.py,$(check-qtest-$*-y)), \ + $(call quiet-command,PYTHONPATH=3D$(SRC_PATH)/scripts \ + QEMU_PROG=3D$*-softmmu/qemu-system-$* \ + $(PYTHON) $(SRC_PATH)/$(filter %.py,$(check-qtest-$*-y)) $(QPYTHONS_OPT= IONS),"PYTEST","$@"),) =20 .PHONY: $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)) $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)): check-%: % @@ -874,7 +879,7 @@ $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)= ): check-%: % $(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qt= est-%.xml: $(check-qtest-y) $(call quiet-command,QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF) \ - gtester -q $(GTESTER_OPTIONS) -o $@ -m=3D$(SPEED) $(check-qtest-$*-y) $= (check-qtest-generic-y),"GTESTER","$@") + gtester -q $(GTESTER_OPTIONS) -o $@ -m=3D$(SPEED) $(filter-out %.py,$(c= heck-qtest-$*-y) $(check-qtest-generic-y)),"GTESTER","$@") =20 check-report-unit.xml: $(check-unit-y) $(call quiet-command,gtester -q $(GTESTER_OPTIONS) -o $@ -m=3D$(SPEED) $^= ,"GTESTER","$@") --=20 2.15.1