From nobody Sat Apr 27 18:15:48 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508332765595268.1362008497938; Wed, 18 Oct 2017 06:19:25 -0700 (PDT) Received: from localhost ([::1]:44634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4oFb-0006hr-6x for importer@patchew.org; Wed, 18 Oct 2017 09:19:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4oCD-0004W3-9F for qemu-devel@nongnu.org; Wed, 18 Oct 2017 09:15:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4oC7-0005aa-Ht for qemu-devel@nongnu.org; Wed, 18 Oct 2017 09:15:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39300) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4oC7-0005aG-Bd for qemu-devel@nongnu.org; Wed, 18 Oct 2017 09:15:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 793A8C04AC4F for ; Wed, 18 Oct 2017 13:15:34 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 470456F11A; Wed, 18 Oct 2017 13:15:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 793A8C04AC4F Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Wed, 18 Oct 2017 14:15:28 +0100 Message-Id: <20171018131529.19453-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 18 Oct 2017 13:15:34 +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: report errors when iasl exits with non-zero status 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: Igor Mammedov , "Michael S. Tsirkin" 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" If iasl exits with non-zero status, the test unhelpfully just reports that the AML did not match, because the data files it thought iasl generated do not exist. This adds an explicit check for the exit status of iasl and prints stderr if it was non-zero. Thus gives us a fighting chance of diagnosing why iasl failed. Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/bios-tables-test.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 564da45f65..ee441f1e17 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -304,6 +304,7 @@ static bool load_asl(GArray *sdts, AcpiSdtTable *sdt) gchar *out, *out_err; gboolean ret; int i; + int status; =20 fd =3D g_file_open_tmp("asl-XXXXXX.dsl", &sdt->asl_file, &error); g_assert_no_error(error); @@ -324,14 +325,25 @@ static bool load_asl(GArray *sdts, AcpiSdtTable *sdt) g_string_append_printf(command_line, "-d %s", sdt->aml_file); =20 /* pass 'out' and 'out_err' in order to be redirected */ - ret =3D g_spawn_command_line_sync(command_line->str, &out, &out_err, N= ULL, &error); + ret =3D g_spawn_command_line_sync(command_line->str, &out, &out_err, &= status, &error); g_assert_no_error(error); if (ret) { - ret =3D g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl, - &sdt->asl_len, &error); - g_assert(ret); - g_assert_no_error(error); - ret =3D (sdt->asl_len > 0); + if (status !=3D 0) { + g_printerr("'%s' exited with status %d", command_line->str, st= atus); + if (!g_str_equal(out, "")) { + g_printerr("%s", out); + } + if (!g_str_equal(out_err, "")) { + g_printerr("%s", out_err); + } + ret =3D FALSE; + } else { + ret =3D g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl, + &sdt->asl_len, &error); + g_assert(ret); + g_assert_no_error(error); + ret =3D (sdt->asl_len > 0); + } } =20 g_free(out); --=20 2.13.6