From nobody Tue Feb 10 05:10:41 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 1506467371039810.9468937983341; Tue, 26 Sep 2017 16:09:31 -0700 (PDT) Received: from localhost ([::1]:51407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwyyc-0000VE-1V for importer@patchew.org; Tue, 26 Sep 2017 19:09:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwywf-0007it-90 for qemu-devel@nongnu.org; Tue, 26 Sep 2017 19:07:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwywe-0005Gh-7w for qemu-devel@nongnu.org; Tue, 26 Sep 2017 19:07:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35970) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwywd-0005F7-Uf for qemu-devel@nongnu.org; Tue, 26 Sep 2017 19:07:16 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 19DA5C047B66 for ; Tue, 26 Sep 2017 23:07:15 +0000 (UTC) Received: from localhost (ovpn-116-64.gru2.redhat.com [10.97.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id A488171CAD; Tue, 26 Sep 2017 23:07:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 19DA5C047B66 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.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:05 -0300 Message-Id: <20170926230709.22958-3-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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 26 Sep 2017 23:07:15 +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 2/6] device-crash-test: Log detailed info on success too 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" Instead of making checkOneCase() return None on success, return detailed info even if no problems were found. This will make handling of device_add errors simpler, and improve debug output. As logFailure() won't handle only failures, rename it to logResult() and make it a bit more flexible about missing fields. Signed-off-by: Eduardo Habkost --- scripts/device-crash-test | 61 ++++++++++++++++++++++---------------------= ---- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 598720ffa9..782d7fd6c2 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -234,6 +234,9 @@ ERROR_WHITELIST =3D [ {'exitcode':-11, 'device':'arm-gicv3', 'loglevel':logging.ERROR, 'expe= cted':True}, {'exitcode':-11, 'machine':'isapc', 'device':'.*-iommu', 'loglevel':lo= gging.ERROR, 'expected':True}, =20 + # 0 exit code means test succeeded, so we just log it as logging.DEBUG: + {'exitcode':0}, + # everything else (including SIGABRT and SIGSEGV) will be a fatal erro= r: {'exitcode':None, 'fatal':True, 'loglevel':logging.FATAL}, ] @@ -381,8 +384,7 @@ def getBinaryInfo(args, binary): def checkOneCase(args, testcase): """Check one specific case =20 - Returns a dictionary containing failure information on error, - or None on success + Returns a dictionary containing results of test case. """ binary =3D testcase['binary'] accel =3D testcase['accel'] @@ -397,26 +399,21 @@ def checkOneCase(args, testcase): dbg("will launch QEMU: %s", cmdline) vm =3D QEMUMachine(binary=3Dbinary, args=3Dargs) =20 - exc_traceback =3D None + r =3D {'testcase':testcase, + 'cmdline':cmdline} + try: vm.launch() except KeyboardInterrupt: raise except: - exc_traceback =3D traceback.format_exc() + r['exc_traceback'] =3D traceback.format_exc() dbg("Exception while running test case") - finally: - vm.shutdown() - ec =3D vm.exitcode() - log =3D vm.get_log() - - if exc_traceback is not None or ec !=3D 0: - return {'exc_traceback':exc_traceback, - 'exitcode':ec, - 'log':log, - 'testcase':testcase, - 'cmdline':cmdline} =20 + vm.shutdown() + r['exitcode'] =3D vm.exitcode() + r['log'] =3D vm.get_log() + return r =20 def binariesToTest(args, testcase): if args.qemu: @@ -490,17 +487,18 @@ def casesToTest(args, testcase): return cases =20 =20 -def logFailure(f, level): +def logResult(f, level): t =3D f['testcase'] - logger.log(level, "failed: %s", formatTestCase(t)) + logger.log(level, "result: %s", formatTestCase(t)) logger.log(level, "cmdline: %s", f['cmdline']) - for l in f['log'].strip().split('\n'): + for l in f.get('log', '').strip().split('\n'): logger.log(level, "log: %s", l) - logger.log(level, "exit code: %r", f['exitcode']) - if f['exc_traceback']: + logger.log(level, "exit code: %r", f.get('exitcode')) + if 'exc_traceback' in f: logger.log(level, "exception:") for l in f['exc_traceback'].split('\n'): logger.log(level, " %s", l.rstrip('\n')) + dbg('raw result dictionary: %r', f) =20 =20 def main(): @@ -579,18 +577,17 @@ def main(): except KeyboardInterrupt: break =20 - if f: - 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) - logFailure(f, level) - if wl.get('fatal') or (args.strict and level >=3D logging.WARN= ): - fatal_failures.append(f) - else: - dbg("success: %s", formatTestCase(t)) - if expected_match: - logger.warn("Didn't fail as expected: %s", formatTestCase(= t)) + 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) + + 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 logger.info("Total: %d test cases", total) if skipped: --=20 2.13.5