From patchwork Fri Mar 9 20:28:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 883984 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zyfFf1HfJz9sf2 for ; Sat, 10 Mar 2018 07:32:38 +1100 (AEDT) Received: from localhost ([::1]:47959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euOgu-0002gS-0b for incoming@patchwork.ozlabs.org; Fri, 09 Mar 2018 15:32:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euOdL-00007F-BU for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:28:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euOdI-0006sg-70 for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:28:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36586) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euOdI-0006sU-1O for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:28:52 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57F7BC0587E5; Fri, 9 Mar 2018 20:28:51 +0000 (UTC) Received: from localhost (ovpn-116-64.gru2.redhat.com [10.97.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF8E7183B7; Fri, 9 Mar 2018 20:28:45 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 17:28:24 -0300 Message-Id: <20180309202827.12085-6-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 09 Mar 2018 20:28:51 +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 5/8] device-crash-test: Remove runnable-machine check 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This optimization to skip tests if the machine is not runnable is unreliable and makes the script ignore actual QEMU crashes, so we're safer simply removing it. Signed-off-by: Eduardo Habkost --- scripts/device-crash-test | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index b9a7470efc..f406890519 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -372,33 +372,6 @@ class QemuBinaryInfo(object): finally: vm.shutdown() - def machineInfo(self, machine): - """Query for information on a specific machine-type - - Results are cached internally, in case the same machine- - type is queried multiple times. - """ - if machine in self._machine_info: - return self._machine_info[machine] - - mi = {} - args = ['-S', '-machine', '%s' % (machine)] - dbg("querying machine info for binary=%s machine=%s", self.binary, machine) - vm = QEMUMachine(binary=self.binary, args=args) - try: - vm.launch() - mi['runnable'] = True - except KeyboardInterrupt: - raise - except: - dbg("exception trying to run binary=%s machine=%s", self.binary, machine, exc_info=sys.exc_info()) - dbg("log: %r", vm.get_log()) - mi['runnable'] = False - - vm.shutdown() - self._machine_info[machine] = mi - return mi - def defaultMachine(self): """Default machine-type for the QEMU binary @@ -613,9 +586,7 @@ def main(): total += 1 expected_match = findExpectedResult(t) - if (args.quick and - (expected_match or - not getBinaryInfo(args, t['binary']).machineInfo(t['machine'])['runnable'])): + if args.quick and expected_match: dbg("skipped: %s", formatTestCase(t)) skipped += 1 continue