From nobody Tue Feb 10 05:10:42 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; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506467504216393.95637975298644; Tue, 26 Sep 2017 16:11:44 -0700 (PDT) Received: from localhost ([::1]:51418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwz0s-0002qO-GL for importer@patchew.org; Tue, 26 Sep 2017 19:11:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwywg-0007jU-Kl for qemu-devel@nongnu.org; Tue, 26 Sep 2017 19:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwywf-0005KE-SF for qemu-devel@nongnu.org; Tue, 26 Sep 2017 19:07:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52880) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwywf-0005Ig-Lh for qemu-devel@nongnu.org; Tue, 26 Sep 2017 19:07:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4F46883AE for ; Tue, 26 Sep 2017 23:07:16 +0000 (UTC) Received: from localhost (ovpn-116-64.gru2.redhat.com [10.97.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D5EB702FA; Tue, 26 Sep 2017 23:07:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D4F46883AE Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ehabkost@redhat.com From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 26 Sep 2017 20:07:06 -0300 Message-Id: <20170926230709.22958-4-ehabkost@redhat.com> In-Reply-To: <20170926230709.22958-1-ehabkost@redhat.com> References: <20170926230709.22958-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 26 Sep 2017 23:07:16 +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] [RFC 3/6] device-crash-test: Allow checkOneCase() to report multiple results 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: Thomas Huth , "Dr. David Alan Gilbert" , 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 allow the test code to be improved to test multiple devices in a single run. Signed-off-by: Eduardo Habkost --- scripts/device-crash-test | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 782d7fd6c2..0bd599d395 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -384,7 +384,8 @@ def getBinaryInfo(args, binary): def checkOneCase(args, testcase): """Check one specific case =20 - Returns a dictionary containing results of test case. + Generates a list of dictionaries containing results of testing. If + multiple devices are being tested, multiple entries can be returned. """ binary =3D testcase['binary'] accel =3D testcase['accel'] @@ -413,7 +414,7 @@ def checkOneCase(args, testcase): vm.shutdown() r['exitcode'] =3D vm.exitcode() r['log'] =3D vm.get_log() - return r + yield r =20 def binariesToTest(args, testcase): if args.qemu: @@ -572,22 +573,20 @@ def main(): if args.dry_run: continue =20 - try: - f =3D checkOneCase(args, t) - except KeyboardInterrupt: - break =20 - i, wl =3D checkResultWhitelist(f) - dbg("testcase: %r, whitelist match: %r", t, wl) - wl_stats.setdefault(i, []).append(f) - level =3D wl.get('loglevel', logging.DEBUG) - logResult(f, level) + for r in checkOneCase(args, t): + i, wl =3D checkResultWhitelist(r) + dbg("testcase: %r, whitelist match: %r", t, wl) + wl_stats.setdefault(i, []).append(r) + level =3D wl.get('loglevel', logging.DEBUG) + logResult(r, level) + + if wl.get('fatal') or (args.strict and level >=3D logging.WARN= ): + fatal_failures.append(r) =20 - if wl.get('fatal') or (args.strict and level >=3D logging.WARN): - fatal_failures.append(f) + if expected_match and expected_match[0] !=3D i: + logger.warn("Didn't fail as expected: %s", formatTestCase(= t)) =20 - if expected_match and expected_match[0] !=3D i: - logger.warn("Didn't fail as expected: %s", formatTestCase(t)) =20 logger.info("Total: %d test cases", total) if skipped: --=20 2.13.5