From nobody Sat Oct 25 19:45:42 2025 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520627805226426.1729572265457; Fri, 9 Mar 2018 12:36:45 -0800 (PST) Received: from localhost ([::1]:47979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euOku-0006B0-AS for importer@patchew.org; Fri, 09 Mar 2018 15:36:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euOd9-0008L2-W3 for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:28:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euOd6-0006nt-Ss for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:28:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49742) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euOd6-0006nj-N8 for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:28:40 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F264581DF3; Fri, 9 Mar 2018 20:28:39 +0000 (UTC) Received: from localhost (ovpn-116-64.gru2.redhat.com [10.97.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C18D1798B; Fri, 9 Mar 2018 20:28:37 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 17:28:22 -0300 Message-Id: <20180309202827.12085-4-ehabkost@redhat.com> In-Reply-To: <20180309202827.12085-1-ehabkost@redhat.com> References: <20180309202827.12085-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 09 Mar 2018 20:28:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/8] device-crash-test: Accept machine=DEFAULT to test the default machine 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: Peter Maydell , Thomas Huth , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This will be useful for running a smaller test set on "make check", instead of testing every single machine-type/device combination. Signed-off-by: Eduardo Habkost --- scripts/device-crash-test | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 364c779cdb..632b128e44 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -41,6 +41,11 @@ Test a single QEMU binary: =20 device-crash-test /path/to/qemu/binary =20 +Test all QEMU binaries found in the current directory, using only the defa= ult +machine-type: + + device-crash-test -t machine=3DDEFAULT + """ =20 import sys @@ -357,7 +362,7 @@ class QemuBinaryInfo(object): # there's no way to query DeviceClass::user_creatable using QM= P, # so use 'info qdm': self.no_user_devs =3D set([d['name'] for d in infoQDM(vm, ) if= d['no-user']]) - self.machines =3D list(m['name'] for m in vm.command('query-ma= chines')) + self.machines =3D vm.command('query-machines') self.user_devs =3D self.alldevs.difference(self.no_user_devs) self.kvm_available =3D vm.command('query-kvm')['enabled'] finally: @@ -390,6 +395,19 @@ class QemuBinaryInfo(object): self._machine_info[machine] =3D mi return mi =20 + def defaultMachine(self): + """Default machine-type for the QEMU binary + + If no default machine-type is returned by query-machines, return t= he + first machine-type in the list. + """ + machines =3D self.machines + defmachine =3D [m['name'] for m in self.machines if m.get('is-defa= ult')] + if defmachine: + return defmachine[0] + else: + return self.machines[0]['name'] + =20 BINARY_INFO =3D {} =20 @@ -455,7 +473,7 @@ def accelsToTest(args, testcase): =20 =20 def machinesToTest(args, testcase): - return getBinaryInfo(args, testcase['binary']).machines + return [m['name'] for m in getBinaryInfo(args, testcase['binary']).mac= hines] =20 =20 def devicesToTest(args, testcase): @@ -580,6 +598,13 @@ def main(): return 1 =20 for t in casesToTest(args, tc): + + # expand some test case variables to their actual values before + # using them: + # "-t machine=3DDEFAULT" can be used to use the default machine-ty= pe + if t['machine'] =3D=3D 'DEFAULT': + t['machine'] =3D getBinaryInfo(args, t['binary']).defaultMachi= ne() + logger.info("running test case: %s", formatTestCase(t)) total +=3D 1 =20 --=20 2.14.3