From patchwork Thu May 24 15:17:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 919936 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 40sCgt0ZJwz9s0x for ; Fri, 25 May 2018 01:18:18 +1000 (AEST) Received: from localhost ([::1]:39140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLs0N-00019P-JM for incoming@patchwork.ozlabs.org; Thu, 24 May 2018 11:18:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLrzj-00017m-AE for qemu-devel@nongnu.org; Thu, 24 May 2018 11:17:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLrzg-00042K-78 for qemu-devel@nongnu.org; Thu, 24 May 2018 11:17:35 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52700 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fLrzg-000420-2C for qemu-devel@nongnu.org; Thu, 24 May 2018 11:17:32 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF311406E897; Thu, 24 May 2018 15:17:31 +0000 (UTC) Received: from redhat.com (ovpn-125-25.rdu2.redhat.com [10.10.125.25]) by smtp.corp.redhat.com (Postfix) with SMTP id 44D3410AF9EA; Thu, 24 May 2018 15:17:31 +0000 (UTC) Date: Thu, 24 May 2018 18:17:31 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1527174955-160019-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6b3cad0d-b849-6ba9-64cb-6a36a37cd19d@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 24 May 2018 15:17:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 24 May 2018 15:17:31 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mst@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 2/1] libqtest: add more exit status checks 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 , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= , Markus Armbruster Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add more checks on how did QEMU exit. Legal ways to exit right now: - exit(0) or return from main - kill(SIGTERM) - sent by testing infrastructure Signed-off-by: Michael S. Tsirkin Suggested-by: Thomas Huth --- TODO: refactor testing infrastructure to stop QEMU through QMP as opposed to SIGTERM. tests/libqtest.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/libqtest.c b/tests/libqtest.c index f869854..2470f57 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -110,7 +110,14 @@ static void kill_qemu(QTestState *s) pid = waitpid(s->qemu_pid, &wstatus, 0); if (pid == s->qemu_pid && WIFSIGNALED(wstatus)) { + /* Core dump is never OK */ assert(!WCOREDUMP(wstatus)); + /* Either exit normally or get killed */ + assert((WIFEXITED(wstatus) || WIFSIGNALED(wstatus))); + /* Exited normally - check exit status. */ + assert(!WIFEXITED(wstatus) || WEXITSTATUS(wstatus) == 0); + /* Killed - we only ever send SIGTERM. */ + assert(!WIFSIGNALED(wstatus) || WTERMSIG(wstatus) == SIGTERM); } } }