From nobody Mon Apr 29 20:59:00 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.zoho.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 1495238140875921.4260625492179; Fri, 19 May 2017 16:55:40 -0700 (PDT) Received: from localhost ([::1]:60655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBrkB-0007IM-BR for importer@patchew.org; Fri, 19 May 2017 19:55:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBrj7-0006jV-SJ for qemu-devel@nongnu.org; Fri, 19 May 2017 19:54:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBrj4-0000ZN-Pi for qemu-devel@nongnu.org; Fri, 19 May 2017 19:54:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35240) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dBrj4-0000Xk-KO; Fri, 19 May 2017 19:54:30 -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 4CA9C624CF; Fri, 19 May 2017 23:54:28 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AE88777D0; Fri, 19 May 2017 23:54:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4CA9C624CF Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4CA9C624CF From: Thomas Huth To: qemu-devel@nongnu.org Date: Sat, 20 May 2017 01:54:25 +0200 Message-Id: <1495238065-15846-1-git-send-email-thuth@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.39]); Fri, 19 May 2017 23:54:28 +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] tests/libqtest: Print error instead of aborting when env variable is missing 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: qemu-trivial@nongnu.org, Markus Armbruster 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" When you currently try to run a test directly from the command line without setting the QTEST_QEMU_BINARY environment variable first, you are presented with an unhelpful assertion message like this: ERROR:tests/libqtest.c:163:qtest_init_without_qmp_handshake: assertion failed: (qemu_binary !=3D NULL) Aborted (core dumped) Let's replace the assert() with a more user friendly error message instead. Signed-off-by: Thomas Huth --- tests/libqtest.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 84ecbd2..f0fd682 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -160,7 +160,11 @@ QTestState *qtest_init_without_qmp_handshake(const cha= r *extra_args) const char *qemu_binary; =20 qemu_binary =3D getenv("QTEST_QEMU_BINARY"); - g_assert(qemu_binary !=3D NULL); + if (!qemu_binary) { + fprintf(stderr, "The environment variable QTEST_QEMU_BINARY has to= be " + "set before running the test.\n"); + exit(1); + } =20 s =3D g_malloc(sizeof(*s)); =20 --=20 1.8.3.1