From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsq5-0005Lc-I7 for qemu-devel@nongnu.org; Thu, 24 May 2018 12:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLsq0-0001xv-Ek for qemu-devel@nongnu.org; Thu, 24 May 2018 12:11:41 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54260 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 1fLsq0-0001xT-95 for qemu-devel@nongnu.org; Thu, 24 May 2018 12:11:36 -0400 Date: Thu, 24 May 2018 19:11:34 +0300 From: "Michael S. Tsirkin" Message-ID: <1527178151-181781-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6b3cad0d-b849-6ba9-64cb-6a36a37cd19d@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/1] libqtest: add more exit status checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eric Blake , Thomas Huth , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Markus Armbruster 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 Anything else is illegal. Include explicit asserts on bad behaviour encountered to make debugging easier. Signed-off-by: Michael S. Tsirkin --- Changes from v2: - bugfix - assert returned pid - rework complex asserts for clarity Changes from v1: - drop SIGTERM as suggested by Eric tests/libqtest.c | 5 +++++ tests/libqtest.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index f869854..36ca859 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -109,9 +109,19 @@ static void kill_qemu(QTestState *s) kill(s->qemu_pid, SIGTERM); pid = waitpid(s->qemu_pid, &wstatus, 0); - if (pid == s->qemu_pid && WIFSIGNALED(wstatus)) { + /* waitpid returns child PID on success */ + assert(pid == s->qemu_pid); + + /* If exited on signal - check the reason: core dump is never OK */ + if (WIFSIGNALED(wstatus)) { assert(!WCOREDUMP(wstatus)); } + /* If exited normally - check exit status */ + if (WIFEXITED(wstatus)) { + assert(!WEXITSTATUS(wstatus)); + } + /* Valid ways to exit: right now only return from main or exit */ + assert(WIFEXITED(wstatus)); } } -- MST