From nobody Sat May 18 21:45:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579680443; cv=none; d=zohomail.com; s=zohoarc; b=eISLNAWkj5g6YvMiu82YlV4T+g6gBm11F+7UoBoTKhHR1Zcveu7+h5/v85P5Go/o8t9PFABYfH9k8M/I6SY0388eFC6aDOcfOSUlbDwh8gWuPjfkR9Vhv35tqEJoywN6XLOx2HEzjuMLzDF8NjY7bruYtGyLLx6szXPe27RcELg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579680443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xgQZE+CAHPfxOe90xsEJw1km1zHj+aED1ZfJaWHIImw=; b=h8c+1x4COH1hmi8o4cnSGoE3xngWPIZ6APYs6LWlHTM3pbCJ38zYdCMYKS1xtpVrkYPo52Ll6e7lUomqxxtDUvOuwk7rxdVUb7d5nTgaL1YpyUhlXpjNav0aBuWGwlHIgFND2j5DOdmk3srsqPXu2BqKwpuHXyrEq17+3KlxQxY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579680443222286.9209433050238; Wed, 22 Jan 2020 00:07:23 -0800 (PST) Received: from localhost ([::1]:38294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB2o-0006xv-5t for importer@patchew.org; Wed, 22 Jan 2020 03:07:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43923) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB1U-0005i1-71 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuB1T-0006IA-A6 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:00 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:26619 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuB1T-0006Hy-6Q for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:05:59 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-229-k9U782qAPKK9S0nqxSO2xw-1; Wed, 22 Jan 2020 03:05:56 -0500 Received: by mail-wr1-f72.google.com with SMTP id j4so2677831wrs.13 for ; Wed, 22 Jan 2020 00:05:56 -0800 (PST) Received: from redhat.com (bzq-79-176-0-156.red.bezeqint.net. [79.176.0.156]) by smtp.gmail.com with ESMTPSA id s15sm52470666wrp.4.2020.01.22.00.05.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 00:05:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579680358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xgQZE+CAHPfxOe90xsEJw1km1zHj+aED1ZfJaWHIImw=; b=CmsaRJDOlhOYMZmeHWEdwwqhNhOCr6OxUKv8Nos4LiLhXqInr1YyQXaEoIyyWjIioSpp+o MuTUZ/XxXHJ+meKtfLyxjs6ePK9lIFVeYwbGnwq4c8mnRVL6/5KFJwQluIp7QAkYqdgxxZ +VGXtfxcmy0MvQlpxrLbirPR25obeo0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ohtvbpi6C3mgUqd4HNTl8GS6jn6LfpItHWheVW3ZFjc=; b=GqLl8Ca3/JjqHGD8neDDqloTXjDLHZ2I4aa0iEkJplIEuMsqKc77qah5EXuZwRyFuD lRBx1k67JZyBCkQeepLn3tN4PWmQqqYkcCdKJ+aeeOQdE2y09hAlwDsQWjz22LUeeCLv 2c8+hcZJLIoZ1iNpMZBsylpG512V8d11WS5HSxZUIstvM0alHr77yuOck5pxNkMI7bLt 8dnYsTcFJ2Lpi1OJ+F8jzAONF5rmLjZS2xB9m+Hgo5frRVAA2Nf8ml8maDV8SoVb5Ooc 6DBm5go41iibkC/NsRq692JziX/EKWvYSDk1hyyzsZ7r6iUvixx1CCfG0djw6SQrilnE GwYw== X-Gm-Message-State: APjAAAUaInhCj6e7PeWHu9JCd3qjV6ksTcwerPxsHARMLvhxizC8wL7i SfsanqHjupAml7jWPZgXqX5d3pnKAf1pxj0NrJVbd1xZehI0jN7dV+A0Ranqp6S3onV5txdNHtl OJflc4Ayo3BJgTD8= X-Received: by 2002:a7b:cd0a:: with SMTP id f10mr1579853wmj.56.1579680355135; Wed, 22 Jan 2020 00:05:55 -0800 (PST) X-Google-Smtp-Source: APXvYqyPDWCvFnPzwcDxatN6Yk8YM6eA4EOIaOOJnfGb3Q/pdkGca3wCPrGOEOmTxcvf/l+Lf7sMUw== X-Received: by 2002:a7b:cd0a:: with SMTP id f10mr1579834wmj.56.1579680354918; Wed, 22 Jan 2020 00:05:54 -0800 (PST) Date: Wed, 22 Jan 2020 03:05:52 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PATCH 1/5] bios-tables-test: tell people how to update Message-ID: <20200122080538.591734-2-mst@redhat.com> References: <20200122080538.591734-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200122080538.591734-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: k9U782qAPKK9S0nqxSO2xw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Igor Mammedov , Thomas Huth , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" For now just a pointer to the source file. Signed-off-by: Michael S. Tsirkin Reviewed-by: Laurent Vivier Reviewed-by: Thomas Huth --- tests/qtest/bios-tables-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 3ab4872bd7..6b5f24bf62 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -426,7 +426,9 @@ static void test_acpi_asl(test_data *data) =20 fprintf(stderr, "acpi-test: Warning! %.4s binary file mismatch. " - "Actual [aml:%s], Expected [aml:%s].\n", + "Actual [aml:%s], Expected [aml:%s].\n" + "See source file tests/qtest/bios-tables-test.c " + "for instructions on how to update expected files.\n", exp_sdt->aml, sdt->aml_file, exp_sdt->aml_file); =20 all_tables_match =3D all_tables_match && --=20 MST From nobody Sat May 18 21:45:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579680568; cv=none; d=zohomail.com; s=zohoarc; b=SVYt9elshpSn5aHTAh61Vyhp1FjViYzj3KVTwi5rLG5074lSZ6VzStfSMNJB7V62G6AJeLh5UIDGNL+RhMqjsQDpXa7TRKonu7YtLoDqz6ansCqgfaByU83hZabVGem02+/FcoWfhVYSyuHwdJ150dNLwHG5+N4Yd+KlZBDYDZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579680568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0D/foY0xfnPxSgAusOSLmGZ39GfCQPMvI9GzghkGMfg=; b=DpTdI62cXhoZ2hyNY2EWuR+o54rs1LxYeUtFKzR/AyXwh+2ItHhjggHnN9gqMaBcztZGJl+vJN03yxVbIa1AS0oO6tnu9n+1fCDj49RuIioBnR7esbeI0cYPqtOvv8gnyPJZDYWRhSFWLPJ37ldnEbeezppSs/Fx9y5iO6JQnbo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579680568456502.17326529112484; Wed, 22 Jan 2020 00:09:28 -0800 (PST) Received: from localhost ([::1]:38316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB4o-00017w-Ux for importer@patchew.org; Wed, 22 Jan 2020 03:09:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43942) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB1Z-0005kU-81 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuB1X-0006JA-8f for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:05 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24320 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuB1X-0006Iz-4s for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:03 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-339-ugO3wcoVMHuwJCw76nYSyw-1; Wed, 22 Jan 2020 03:05:59 -0500 Received: by mail-wr1-f70.google.com with SMTP id i9so2694474wru.1 for ; Wed, 22 Jan 2020 00:05:59 -0800 (PST) Received: from redhat.com (bzq-79-176-0-156.red.bezeqint.net. [79.176.0.156]) by smtp.gmail.com with ESMTPSA id w83sm2872198wmb.42.2020.01.22.00.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 00:05:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579680362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0D/foY0xfnPxSgAusOSLmGZ39GfCQPMvI9GzghkGMfg=; b=Rfq/oel6wGk2xmBvDfZ1DfA4so2Evaesu1HIIoCcndbSHQRuka6vygHv0yN7YFWFxyZm+I uQJZMMFwrpwK/aXwDEVs+RPNEb4QZxrftOwuacIsjJ1nNNIaVgu/R4e0nbeJtoLUGkXPEC xbC843GqY9u/O8RFhksvG+QxnxNPxy4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=+KuxNZk9Kx5kRe0gipOUTAqT/cDTELiu4iT30gbrRvM=; b=rZH5aOGrdsk+PWtonIEdi7kfaoOjvWGSV1VB5rR9lIYKClFa7rtbF9PPvDg12F/Jpe 6sOb/ordmJorTHR7Q/4W/dLIH5SBJtFYXzY41UZzVDjA2JxskUUvC7UI+AmKXji8noYF tImCm6yoOl5wJC0Fn2UEQXF63La7ExKAOrBidb6DJzAJHudd42vSslyObTi7/ITEbI7a GJFWuOU0n1+n/2U7wZan9CNh+WgcKjEmsReeS0PxIzj1w08E0/OxdQ4a0aAppWQQ0DGx WZmYsQ9NPILh9pFYfufacr3Uwa7dlTbqT8fFoNnbtU/568TFvsLKVafTJ9C1YFlZBtvr oiZw== X-Gm-Message-State: APjAAAWezQcHAeY4y+uyucDqSdU6FXoI73BAmLQRqYg66bueT0r/s/Cn 4OGkKNgV+qlVmpuHjDryD1pQ2UTvXq5Ovw8QCYNTr6Km5+42oGUqrG4ZWnIYvi9xACQKi8iz/r9 R8M6Qmib28uAH2OE= X-Received: by 2002:a05:600c:2503:: with SMTP id d3mr1539005wma.84.1579680357795; Wed, 22 Jan 2020 00:05:57 -0800 (PST) X-Google-Smtp-Source: APXvYqzd+NDj/PeCldrH/WuoF6v0uIyKNoO4F8mNQpAlHgvEFwpDjbyxtfkoN0i0L9ikKbqeBYvvjw== X-Received: by 2002:a05:600c:2503:: with SMTP id d3mr1538990wma.84.1579680357631; Wed, 22 Jan 2020 00:05:57 -0800 (PST) Date: Wed, 22 Jan 2020 03:05:55 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PATCH 2/5] bios-tables-test: fix up DIFF generation Message-ID: <20200122080538.591734-3-mst@redhat.com> References: <20200122080538.591734-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200122080538.591734-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: ugO3wcoVMHuwJCw76nYSyw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Igor Mammedov , Thomas Huth , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Turns out it goes to stdout which is suppressed even with V=3D1. Force DIFF output to stderr to make it visible. Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 6b5f24bf62..c8db2839b2 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -463,13 +463,18 @@ static void test_acpi_asl(test_data *data) "Actual [asl:%s, aml:%s], Expected [asl:%s, aml:%s= ].\n", exp_sdt->aml, sdt->asl_file, sdt->aml_file, exp_sdt->asl_file, exp_sdt->aml_file); + fflush(stderr); if (getenv("V")) { const char *diff_cmd =3D getenv("DIFF"); if (diff_cmd) { - int ret G_GNUC_UNUSED; char *diff =3D g_strdup_printf("%s %s %s", diff_cm= d, exp_sdt->asl_file, sdt->asl_file); + int out =3D dup(STDOUT_FILENO); + int ret G_GNUC_UNUSED; + + dup2(STDERR_FILENO, STDOUT_FILENO); ret =3D system(diff) ; + dup2(out, STDOUT_FILENO); g_free(diff); } else { fprintf(stderr, "acpi-test: Warning. not showing " --=20 MST From nobody Sat May 18 21:45:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579680453; cv=none; d=zohomail.com; s=zohoarc; b=kAmz5Rge92lj3OoIT3sB9AazcI5auBIjt5aMcdE5TbxmPOOuIARmys5UMptC0zmvoxtgf+TU1rkPR+EaAWaMbkPnexrhm92cLcJ1mIuyRl8CXC9Nqski3BDKrlhWjpgiDBEvP1HGtl3FkmS1QVpWSkarJ3Ec90YsmEC9e1aMVTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579680453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vlJnjJ+3ZP4ePljRJ/JkAaxMtB/9rVGyvi25BcNdQGg=; b=dqzP1ApNc/zpEjSmtY46XmP58mSlyKvb0RS6REHteUusQZMTpKAzTMXEhRbRuN8bX0yhbt1VEI1Dd+x92YQO8B9yOrXCIciu7ex28hNqr6mFov6krkkjTcwfW62a59JNyyLJwuHZQnnNz01Z4kf3PCCdMIqieTRG731z7nSFqFE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579680453478552.8438494433834; Wed, 22 Jan 2020 00:07:33 -0800 (PST) Received: from localhost ([::1]:38296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB2x-00077j-HR for importer@patchew.org; Wed, 22 Jan 2020 03:07:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43953) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB1a-0005nh-Rx for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuB1Z-0006Jz-Ox for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41275 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuB1Z-0006Jm-Ku for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:05 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-7ZZfYgwwP7ypZGOK58MqIw-1; Wed, 22 Jan 2020 03:06:02 -0500 Received: by mail-wm1-f72.google.com with SMTP id q206so1724971wme.9 for ; Wed, 22 Jan 2020 00:06:02 -0800 (PST) Received: from redhat.com (bzq-79-176-0-156.red.bezeqint.net. [79.176.0.156]) by smtp.gmail.com with ESMTPSA id m10sm57021564wrx.19.2020.01.22.00.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 00:06:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579680365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vlJnjJ+3ZP4ePljRJ/JkAaxMtB/9rVGyvi25BcNdQGg=; b=bavI0jMeqZv+MmCZygyT13Uf5yeZuyr1PuCRUgrb3p6ssECYJpxsjVLAun9co6iH898wtu BMiWKN79nZDH0K9iCVsvSu/x8Nj0/MQpha64y0BKc4UwtanzDVKVUFbZsdEHE1myOecD2v 4fYWuYOst/9wewBZA/1CCQMGNU4wH8E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=XG/sn9pQFsKpaxx2vC6q2UHSVL54RMJxUz70n6+fTLs=; b=GJYVTEFBGVfnD6YGyUgLsyKhy2zQlv3N944dTtlMRl+YRlQ2ZJF26tF/aRMZcZ6k/3 LAatjEy6zJqVCiXAHVmg2JJxtZvzrZFPWHpst41imiWzwnjtkzGs2AWLmPqWAAs7GyB/ ImclXmCKbeeVSeCjxK5aw1bDlIsbQRVFlDZB54xK8XC5JHJDzYnykPJOUWZ6KEeNC8ll sasO4LKyCTewai9Fr62bQn/vW8aer1vfzF7rZsUk9vRVCh62VfM5MFmNCKZilV3PAkHg UzUH4htjDcVqs/mUwvLBh07g3Y0KrXwuxKFNQ36v07WtUk6EbFfK76JK87/i951ydvqz TBOA== X-Gm-Message-State: APjAAAVokt8rMsis8wdfVxTAKVUEcMqs1CKsCSjXdPT/ej6T0HCu6Ip2 leUeAv2wCTFXDF3xNfcc7MTxiozCns7/AOC1J4Os5pMhd+u3SuQeXrz9KxVBRbD2FJPq/yz0NJx v8hwCnymktRwfMsU= X-Received: by 2002:a7b:c386:: with SMTP id s6mr1524469wmj.105.1579680360939; Wed, 22 Jan 2020 00:06:00 -0800 (PST) X-Google-Smtp-Source: APXvYqwleuJBJphWkqgFJZtCRqq6y5p2J0YH4D5z0h9M8fuS9mP7Ddf+Qn2dYx3QM1NAIrs7vmAa+Q== X-Received: by 2002:a7b:c386:: with SMTP id s6mr1524449wmj.105.1579680360705; Wed, 22 Jan 2020 00:06:00 -0800 (PST) Date: Wed, 22 Jan 2020 03:05:58 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PATCH 3/5] bios-tables-test: default diff command Message-ID: <20200122080538.591734-4-mst@redhat.com> References: <20200122080538.591734-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200122080538.591734-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: 7ZZfYgwwP7ypZGOK58MqIw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Igor Mammedov , Thomas Huth , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Most people probably just want diff -u. So let's use that as the default. Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index c8db2839b2..6ec1c5be64 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -465,24 +465,17 @@ static void test_acpi_asl(test_data *data) exp_sdt->asl_file, exp_sdt->aml_file); fflush(stderr); if (getenv("V")) { - const char *diff_cmd =3D getenv("DIFF"); - if (diff_cmd) { - char *diff =3D g_strdup_printf("%s %s %s", diff_cm= d, - exp_sdt->asl_file, sdt->asl_file); - int out =3D dup(STDOUT_FILENO); - int ret G_GNUC_UNUSED; + const char *diff_env =3D getenv("DIFF"); + const char *diff_cmd =3D diff_env ? diff_env : "diff -= u"; + char *diff =3D g_strdup_printf("%s %s %s", diff_cmd, + exp_sdt->asl_file, sdt->a= sl_file); + int out =3D dup(STDOUT_FILENO); + int ret G_GNUC_UNUSED; =20 - dup2(STDERR_FILENO, STDOUT_FILENO); - ret =3D system(diff) ; - dup2(out, STDOUT_FILENO); - g_free(diff); - } else { - fprintf(stderr, "acpi-test: Warning. not showing " - "difference since no diff utility is specified= . " - "Set 'DIFF' environment variable to a preferre= d " - "diff utility and run 'make V=3D1 check' again= to " - "see ASL difference."); - } + dup2(STDERR_FILENO, STDOUT_FILENO); + ret =3D system(diff) ; + dup2(out, STDOUT_FILENO); + g_free(diff); } } } --=20 MST From nobody Sat May 18 21:45:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579680566; cv=none; d=zohomail.com; s=zohoarc; b=dif/lOiLFgbZ9H28txxNAlnt25+p5HnnFRk2gSRoG0QnmDUyEEfaAjw9vebmVwZ58ufMKvlxBAKjQMjdDe8/CoZ3Rm5gSe0apZSvNh6fS7O685zzHCuW/b3OebhxWGjkZgPd7P0cMjqN92LJp+XHP19BZVBELa4K8rhuEkOkODM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579680566; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1TNpFnh0cmBnEC63KMUrlWRs2Qj4E3E6VTgKkSdjRI0=; b=U7kYLk48f03yW/Eqfs+by0RGWAuScDldHAb+yHqd5jy4Mkj6lRjJXzqI8JEtq1i/CMNbk+sq+EJGNmRlqhI7BZta5IdqEYYa2o2xmpdQJ5rMNtZsa4ILG6JKRUa0QLI51MwOMiEaj1zDvPPqo6UUipxzmF2F+XRJcg99ZtG4tyc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157968056622112.947120908393913; Wed, 22 Jan 2020 00:09:26 -0800 (PST) Received: from localhost ([::1]:38312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB4m-00014F-LH for importer@patchew.org; Wed, 22 Jan 2020 03:09:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43967) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB1c-0005sd-Qo for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuB1b-0006Ki-RB for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:08 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58549 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuB1b-0006KY-Nk for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:07 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-rc3pOGPFPAWtvfXzdoWZGA-1; Wed, 22 Jan 2020 03:06:05 -0500 Received: by mail-wm1-f69.google.com with SMTP id c4so1724262wmb.8 for ; Wed, 22 Jan 2020 00:06:04 -0800 (PST) Received: from redhat.com (bzq-79-176-0-156.red.bezeqint.net. [79.176.0.156]) by smtp.gmail.com with ESMTPSA id g9sm56239815wro.67.2020.01.22.00.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 00:06:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579680367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1TNpFnh0cmBnEC63KMUrlWRs2Qj4E3E6VTgKkSdjRI0=; b=IqhM8LoIheqiX2pq1UPqY5QJFevMJrYV7IrMvS41Deg9uW908x3yr6dQXmEoSaafkxTYrj vINUl5X7gyTe4ENaxvki5kIiF/zewYiBqtUeOLdUBJsb9FX4dNOXpp2zD0k6qPZmNMcml6 rPUDHdEqYU6/FDMK4oySHjIOr3kJWjs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/mOXF1TD9+1yrGDb4R2TxgSp1NSRuXORauWLHI+ot/g=; b=lfX/qUgq+m3IAhV00N+2KSINdld4EGxY3xKHqtuNIUNH0k8zjiHpPYshj6f572qPGQ SFDXjFqHXKTalz04PyZtl9SHDuO0U4kog+f9BIZUEK6u67OEY8NgXWTgykYpNiDY+cVS VPiKStYTQDlna743lumWd0aOXlftfvqwrdxete9H++nlcVC1if4LpJB5jReBY2oYD5AC WpY42MLS41pETXvEXD8ijtB3NNMmJh4uqbWPBwOwLqH80ICDdlCcSNFdbsHOJ27lFUdS nCQjFriGLBW91il5ZhVTe9zrg+4ZQFVe8X960DmWwET2wpAu6rTuSPjxsu4G/c5k58x1 nnrA== X-Gm-Message-State: APjAAAWS6UhVqW4LWiTr4ig6DknVEJcWM1Fb969PUrRqxlV967blxazk dLXWH+5CARBPHfRFlJ+FBrsK5ggPjtmy6+RH18qzISXz1BRpHJYXr9jjDLWbhkXTXTuWRhV10sM /P0g3Jm65fjqXW9Q= X-Received: by 2002:a7b:cb46:: with SMTP id v6mr1628557wmj.117.1579680363871; Wed, 22 Jan 2020 00:06:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxq0iSrvMspRcYoBpFUqg2DopUjgwJijtnjefYy9oA5H3UXQlQd8h907Om1+5MnRUt4Ch3CJA== X-Received: by 2002:a7b:cb46:: with SMTP id v6mr1628537wmj.117.1579680363713; Wed, 22 Jan 2020 00:06:03 -0800 (PST) Date: Wed, 22 Jan 2020 03:06:01 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PATCH 4/5] bios-tables-test: fix path to allowed diff Message-ID: <20200122080538.591734-5-mst@redhat.com> References: <20200122080538.591734-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200122080538.591734-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: rc3pOGPFPAWtvfXzdoWZGA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Igor Mammedov , Thomas Huth , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Fixes: 1e8a1fae7464 ("test: Move qtests to a separate directory") Signed-off-by: Michael S. Tsirkin Reviewed-by: Laurent Vivier Reviewed-by: Thomas Huth --- tests/qtest/bios-tables-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 6ec1c5be64..6535ab7f04 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -21,7 +21,7 @@ * in binary commit created in step 6): * * After 1-3 above tests will pass but ignore differences with the expecte= d files. - * You will also notice that tests/bios-tables-test-allowed-diff.h lists + * You will also notice that tests/qtest/bios-tables-test-allowed-diff.h l= ists * a bunch of files. This is your hint that you need to do the below: * 4. Run * make check V=3D1 --=20 MST From nobody Sat May 18 21:45:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579680682; cv=none; d=zohomail.com; s=zohoarc; b=HBQs35fnO+tKiXqY1n0/o3KWYngSGY9oEt+cPVE2MjcKGbe4EvORRLNOklVcdKy/zJ9y0xHj3rn2bsVqrZmdMbXGZx/+hqmoV9Sw07oA86TvPv408SR6k89DAhCUpd6IlV4m3nJp5+d+yY/D4qYiQcGt7dfak+juU2g4GJfn3XM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579680682; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4HnVvdO9PVG27yQKQDqqOF3A6bmqC4jZ3lSftCc+CzU=; b=Zki974ZmEsT9TmeyeHaNx0Dnmvau0Nl4QvmUYQooe9Ddpoi4kRix9xN+yStzwJUDvN8QfaDsRqsjCRXlpVoItqpvNO34I0Y7R77c46wqcUHoKwuWvk0sYb8l60maYlUVz9XwRETUuFaBidBuKJj9TskVf0F1ku5DAjpXY7k8Vb4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579680682831166.90775186134545; Wed, 22 Jan 2020 00:11:22 -0800 (PST) Received: from localhost ([::1]:38350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB6f-0003x9-RS for importer@patchew.org; Wed, 22 Jan 2020 03:11:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43980) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuB1h-0005wc-SB for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuB1g-0006Lz-Or for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:13 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:37787 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuB1g-0006Ln-Jm for qemu-devel@nongnu.org; Wed, 22 Jan 2020 03:06:12 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-166-daXC4Lh_MYmjhD6P3MZYkQ-1; Wed, 22 Jan 2020 03:06:08 -0500 Received: by mail-wr1-f72.google.com with SMTP id f17so2681167wrt.19 for ; Wed, 22 Jan 2020 00:06:08 -0800 (PST) Received: from redhat.com (bzq-79-176-0-156.red.bezeqint.net. [79.176.0.156]) by smtp.gmail.com with ESMTPSA id x16sm2778527wmk.35.2020.01.22.00.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 00:06:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579680372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4HnVvdO9PVG27yQKQDqqOF3A6bmqC4jZ3lSftCc+CzU=; b=CKbCTB+JrdDKpFrRGkDb3ZpzGI+krTfH6QpdsdlilAM5YbcRp6JOo9NdH48MdooLKc8Cik PNYuKbd7rHe4jcKnmMZR1myBFtWmGNHXfLrsgmJ9tHEjfqBGxZH9+zH0ei3UmwKN+ReRy1 P0XuWEueneQZwNwkVs0tlFqnYdpaHaY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=8uqNcJ577hXSJJzPx9aMtc0hri4nmxSoPvEVTfUrw5Y=; b=czTjld3/3YtWuH09Ru3jW14M9kMaS75DegQS4tsjgt8lkxHkEYXWDtxb3qADPH+ZHT Cu5+KkJNuwCXsJZgwMgAELXj51nJA54iWnoxlI0mm4sm53qPps3VrPj4eP/EHb9sl11J jBLgY/fHCgJElFeVC4WbKtpfO93u0x6W40hh7Yp0/R7C/aGWskUQpQVBA43jgNgtpkmj ULxj9jVogaBGsHop0DEBpi/OlLHxBM66lmcrSfRdLrz6ulS6ZoC/uotIE8PJu07yYm+o 7Z69jkFi2L/WCzwqERpvdb6hdSKhdi2CIPkktYTI3NLhRfVcXIzg9s+YtlnIyZG5m3o/ /njA== X-Gm-Message-State: APjAAAXOjtu7Gpq0N1x3YjgcIj0eSAG8DnQawj0nTxg1yX4iTJopRmTB 1N8jOmCnBZL4ZDVZtMEQ08yOJt+DKA9RRSh8qoFFjjCnjsS/XqNvHQUBEpDftwlHGx5zqVJfJF5 nQtvml2/nxFQRNVY= X-Received: by 2002:a05:600c:108a:: with SMTP id e10mr1536312wmd.38.1579680366612; Wed, 22 Jan 2020 00:06:06 -0800 (PST) X-Google-Smtp-Source: APXvYqxn8l3dPD1tZzvB0xGrwe1h07gnoP7bGkFAN9glkPTj1Hn/9xRbA3wQo85OhgsGtCI7KOp0hw== X-Received: by 2002:a05:600c:108a:: with SMTP id e10mr1536290wmd.38.1579680366390; Wed, 22 Jan 2020 00:06:06 -0800 (PST) Date: Wed, 22 Jan 2020 03:06:04 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PATCH 5/5] rebuild-expected-aml.sh: remind about the process Message-ID: <20200122080538.591734-6-mst@redhat.com> References: <20200122080538.591734-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200122080538.591734-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: daXC4Lh_MYmjhD6P3MZYkQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Remind users of rebuild-expected-aml.sh about the process to follow. Suppress the warning if allowed file list exists - that's a big hint user is already aware of the process. Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/rebuild-expected-aml.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebu= ild-expected-aml.sh index d44e511533..9cbaab1a4d 100755 --- a/tests/data/acpi/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -31,6 +31,13 @@ done =20 eval `grep SRC_PATH=3D config-host.mak` =20 +old_allowed_dif=3D`grep -v -e 'List of comma-separated changed AML files t= o ignore' ${SRC_PATH}/tests/qtest/bios-tables-test-allowed-diff.h` + echo '/* List of comma-separated changed AML files to ignore */' > ${SRC_P= ATH}/tests/qtest/bios-tables-test-allowed-diff.h =20 echo "The files were rebuilt and can be added to git." + +if [ -z "$old_allowed_dif" ]; then + echo "Note! Please do not commit expected files with source changes" + echo "Note! Please follow the process documented in ${SRC_PATH}/tests/= qtest/bios-tables-test.c" +fi --=20 MST