From nobody Thu May 2 21:24:10 2024 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=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532101301994515.1157905017328; Fri, 20 Jul 2018 08:41:41 -0700 (PDT) Received: from localhost ([::1]:48653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgXX6-00086z-SA for importer@patchew.org; Fri, 20 Jul 2018 11:41:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgXVJ-0006wu-Ag for qemu-devel@nongnu.org; Fri, 20 Jul 2018 11:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgXVI-0007uI-AC for qemu-devel@nongnu.org; Fri, 20 Jul 2018 11:39:37 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgXVI-0007rY-1Z for qemu-devel@nongnu.org; Fri, 20 Jul 2018 11:39:36 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fgXVF-00052b-6o; Fri, 20 Jul 2018 16:39:33 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2018 16:39:32 +0100 Message-Id: <20180720153932.8507-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH for-3.0 ?] tests/libqtest: Improve kill_qemu() assert 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: "Michael S . Tsirkin" , patches@linaro.org 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" In kill_qemu() we have an assert that checks that the QEMU process didn't dump core: assert(!WCOREDUMP(wstatus)); Unfortunately the WCOREDUMP macro here means the resulting message is not very easy to comprehend on at least some systems: ahci-test: tests/libqtest.c:113: kill_qemu: Assertion `!(((__extension__ ((= (union { __typeof(wstatus) __in; int __i; }) { .__in =3D (wstatus) }).__i))= ) & 0x80)' failed. and it doesn't identify what signal the process took. Instead of using a raw assert, print the information in an easier to understand way: /i386/ahci/sanity: libqtest.c: kill_qemu() tried to terminate QEMU process = but it dumped core with signal 11 ahci-test: tests/libqtest.c:118: kill_qemu: Assertion `0' failed. Aborted (core dumped) (Of course, the really useful information would be why the QEMU process dumped core in the first place, but we don't have that by the time the test program has picked up the exit status.) Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- In particular, the travis test config that enables gprof seems to (a) run into this every so often and (b) have the really unhelpful assertion text quoted above: https://travis-ci.org/qemu/qemu/jobs/406192798 Maybe for 3.0 since it's only test code. tests/libqtest.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 098af6aec44..99341e1b47d 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -110,7 +110,13 @@ static void kill_qemu(QTestState *s) pid =3D waitpid(s->qemu_pid, &wstatus, 0); =20 if (pid =3D=3D s->qemu_pid && WIFSIGNALED(wstatus)) { - assert(!WCOREDUMP(wstatus)); + if (WCOREDUMP(wstatus)) { + fprintf(stderr, + "libqtest.c: kill_qemu() tried to terminate QEMU " + "process but it dumped core with signal %d\n", + WTERMSIG(wstatus)); + assert(0); + } } } } --=20 2.17.1