From nobody Mon Feb 9 12:15:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608049870; cv=none; d=zohomail.com; s=zohoarc; b=I5e73nhAKIiVky2M1qoxUB06VuKf5+dKAi6NDCxwBshcirpJMZqJpQHC1bBKtZDdDu3qcLEThgO3uSX0V/FNtFh5F9SbT2U61p7U/AqOebGgaz/SeAyJ6gsyJiEbHv9pwcgSfmG/3WUfv0YgMsIYlyI20Qf9s20wwjFmYunoSTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608049870; 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=UUtXi2+p1iHJOIKW0Qtw27mjwwE0QHBhUia+tbyf5x8=; b=ViXiT+1TIWbU87fnJ330LxV/cZgXX7FeXVikiK0oosbRtuEkHhHeOe2M+5mmauuEvV4wDGrmU/ftpDZ1QdInmwi2Hg/tWvjFz/MQcUhwURHnh5N4EilRR7EFN07449RpTXtk8aBij99aR/LDnTHsiPmL63iogEJea1+VIMre9pE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160804986915979.4809736065805; Tue, 15 Dec 2020 08:31:09 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-552-4tpQblayNGaOBksAKoFfwQ-1; Tue, 15 Dec 2020 11:26:09 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47963195D593; Tue, 15 Dec 2020 16:25:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F6CC10023B2; Tue, 15 Dec 2020 16:25:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C3A8D5002E; Tue, 15 Dec 2020 16:25:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BFGPgdF025837 for ; Tue, 15 Dec 2020 11:25:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 628DC5D9D7; Tue, 15 Dec 2020 16:25:42 +0000 (UTC) Received: from work.redhat.com (ovpn-114-20.ams2.redhat.com [10.36.114.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 990015D9E4; Tue, 15 Dec 2020 16:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608049624; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UUtXi2+p1iHJOIKW0Qtw27mjwwE0QHBhUia+tbyf5x8=; b=cHrsl2Fv3ElyMG/axLyS/vhbMn6lvA941wvsGRrBZas2cJ72t7fhFkHhHFI1OgdFCBlO59 92mM6GX/I0kcfAyN/v3uQNvPucb4dimzjXBwzD/AnxbD3JU8oLbVns/PHfWs3Vb5cUOtBA SmSjTGUAIhAV437lhX4cIeedoayp9wg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608049866; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UUtXi2+p1iHJOIKW0Qtw27mjwwE0QHBhUia+tbyf5x8=; b=Kb56D35kHfkAKQYSyNAj/vxkEoZ9Nqp7T0+7eFHZoR/AKdeBgjkfLOekYMyjnxA6JMwcLn bmE1oHOCLbaHWhO9MzQRj78d3Rvf6IDAX3wNQpQbFrqHxOlAaqpm9Fu9IcVyGiobENsJkF R8OkameneqMEng07BUzmOTmlCiRYC7g= X-MC-Unique: 4tpQblayNGaOBksAKoFfwQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 22/29] cpu-parse: Move call to cpu-cpuid.py to new script Date: Tue, 15 Dec 2020 17:25:08 +0100 Message-Id: <20201215162515.53742-23-twiederh@redhat.com> In-Reply-To: <20201215162515.53742-1-twiederh@redhat.com> References: <20201215162515.53742-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- tests/cputestdata/cpu-gather.py | 10 ++++++++++ tests/cputestdata/cpu-parse.sh | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather= .py index 2c3f39ab35..373f179c8d 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-gather.py @@ -282,6 +282,16 @@ def parse(args): output_xml(data, filename_xml) output_json(data, filename_json) =20 + if not os.path.isfile(filename_json): + return + if os.path.getsize(filename_json) =3D=3D 0: + return + + output =3D subprocess.check_output( + ["./cpu-cpuid.py", "diff", filename_json], + universal_newlines=3DTrue) + print(output) + os.environ["CPU_GATHER_PY"] =3D "true" os.environ["model"] =3D data["name"] os.environ["fname"] =3D filename diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh index aeb6e4e07f..eea15ded2e 100755 --- a/tests/cputestdata/cpu-parse.sh +++ b/tests/cputestdata/cpu-parse.sh @@ -6,13 +6,3 @@ if [ -z "${CPU_GATHER_PY}" ]; then fi =20 data=3D`cat` - -if [[ -s $fname.json ]]; then - if ! grep -q model-expansion $fname.json; then - echo "Missing query-cpu-model-expansion reply in $name.json" >&2 - exit 1 - fi - $(dirname $0)/cpu-cpuid.py diff $fname.json -else - rm $fname.json -fi --=20 2.26.2