From nobody Wed May 8 04:58:39 2024 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=1604071920; cv=none; d=zohomail.com; s=zohoarc; b=e0FJCsCLj3BL5G/4YK2WWRhcOvf0NhbTXDL9uID3VOzGX9kwmGSUIgeksbiqMU621g+ngwtgpOIOUiS3EtaZcjXW2idjjGi1ijU4OKQ+fpwRQuNORADw4Xsgh5BZVyr9egCojTpC3ImZB1RpwEBGOBiqJUjmZZZHJoQ4jzhWMts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604071920; 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=lePbVqC6uFtFwZygB+3ZSKYRiDlHqwG0ocRyFjsqTRk=; b=Dl5MipoGb6pxrYmDaPkHh+bk0lV94rvevfyR6J8eQDvDNaP4q28pC3AjN6ChrkvzYBcI1iyvJ6rTmz+Ux5XpC1Y3eWdPAHjVOTD9b9jhpcKKskTbNlRwbtAF5zY+AnCwY+gHuQdr/U1HBZ3jYTaw0gvnWUejCzDcC7RqIO6PQIg= 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 1604071920947803.1059380145595; Fri, 30 Oct 2020 08:32:00 -0700 (PDT) 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-301-sGsygw5FPKyHYMcccfjSfA-1; Fri, 30 Oct 2020 11:31:55 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 999A91019633; Fri, 30 Oct 2020 15:31:49 +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 4316A19656; Fri, 30 Oct 2020 15:31:49 +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 03CBE5810D; Fri, 30 Oct 2020 15:31: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 09UFSHZQ010221 for ; Fri, 30 Oct 2020 11:28:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8308F5D9D5; Fri, 30 Oct 2020 15:28:17 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-50.ams2.redhat.com [10.36.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 947715D9D2; Fri, 30 Oct 2020 15:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604071919; 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=lePbVqC6uFtFwZygB+3ZSKYRiDlHqwG0ocRyFjsqTRk=; b=h8QBORtmQYrO9uDIxTJd8E+UyvK4qgrPZhIUmGo0E3Fi6xd/UsKsYvCIKXQ8cQfr1StJni +QSaLaHx2/wSuhBeSnsmBX4ER5vhi1cR9v3LCttQ0q1RKoVarkeEct6X9GaOAQvQKdNGFU Mzy5FsSzTWLMCwbsTK3Bvz4ImfSeh7I= X-MC-Unique: sGsygw5FPKyHYMcccfjSfA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] gitlab: run unit tests in i686 cross build Date: Fri, 30 Oct 2020 15:28:09 +0000 Message-Id: <20201030152810.119728-2-berrange@redhat.com> In-Reply-To: <20201030152810.119728-1-berrange@redhat.com> References: <20201030152810.119728-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Michal Privoznik 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.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In most cross builds we can't run tests since we can't assume QEMU user mode emulators are loaded. i686 is special though because x86_64 can run i686 natively, so we should run unit tests there. The key benefit is that this gives us 32-bit unit test coverage in CI. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Erik Skultety --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 887bc30242..725c76e9ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,6 +115,7 @@ stages: script: - meson build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.= txt && exit 1) - ninja -C build + - if test "$CROSS" =3D "i686" ; then ninja -C build test ; fi =20 =20 # Native container build jobs --=20 2.28.0 From nobody Wed May 8 04:58:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1604071925; cv=none; d=zohomail.com; s=zohoarc; b=oCHD/evE8LW2vDdJweVTwGeRQUzetws/pTafIpfffeDdoHVXQ3eRkf4H32Q6wys/MYA7t6gyzKD7PuTm3KeOHaMo5uoshMAbHdncy475+hBx8w5yazmPU0IIHOEy8hh9xJfnUVO5zbttc9PncJ+90kVguZhJVw9Cf0rNyvFFIWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604071925; 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=Q6fJj7ifaaSfszazVo42Rgc5v6DH7/JHEhH44DApVTQ=; b=GlKTs/PA3eeNUlKZoILWawbY4jsbsPD1Emz/yB1XzdzwH6GZAQ6JDKuNCLdhfhX1c8+InBXI2w2Iw4A8lnIo31VQ0KwYn89N4nHuyrh/JGHi61UCl0bN4V0LA4IivZC1WSwXr4LuxDDbhXoGbqOBrMx9IJgauYH7LkPRGoOeuRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604071925704669.8668258849392; Fri, 30 Oct 2020 08:32:05 -0700 (PDT) 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-534-hO4wpDDXM4KW6L5ATnbrkg-1; Fri, 30 Oct 2020 11:32:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7797D87950C; Fri, 30 Oct 2020 15:31:53 +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 5203B5B4CF; Fri, 30 Oct 2020 15:31:53 +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 3AD715811A; Fri, 30 Oct 2020 15:31:52 +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 09UFSIW3010231 for ; Fri, 30 Oct 2020 11:28:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id E55465D9E2; Fri, 30 Oct 2020 15:28:18 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-50.ams2.redhat.com [10.36.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5A605D9D2; Fri, 30 Oct 2020 15:28:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604071923; 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=Q6fJj7ifaaSfszazVo42Rgc5v6DH7/JHEhH44DApVTQ=; b=EvxkTxDx+FbPuO5I6fqvkbcV3jAQs/42FeiLPFZkq1eouj2O97dOjrik7BGZetVZAQCNYg 8kyUMU0bdNHcxZrrs710mJD5DgNIqc3Dh2Vx8F8cWmPiNoTi1qM60U1a2kN5Ki0hi/N7rk lBZ8khoKvj5KdeDRgtt6aworLsRQ0TY= X-MC-Unique: hO4wpDDXM4KW6L5ATnbrkg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] scripts: trim "__attribute__((packed))" in RPC struct diff Date: Fri, 30 Oct 2020 15:28:10 +0000 Message-Id: <20201030152810.119728-3-berrange@redhat.com> In-Reply-To: <20201030152810.119728-1-berrange@redhat.com> References: <20201030152810.119728-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Michal Privoznik 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.79 on 10.5.11.11 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) i686 builds on x86_64 host on Debian 10 result in the RPC structs getting "__attribute__((packed))" annotations added to them. This is harmless since we know the XDR protocol aligns and pads struct fields suitably on the wire. Thus we can safely cull the attribute before doing the diff comparison. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Erik Skultety --- scripts/check-remote-protocol.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protoc= ol.py index 0a6135376e..cd96e894a7 100644 --- a/scripts/check-remote-protocol.py +++ b/scripts/check-remote-protocol.py @@ -123,6 +123,12 @@ if n < 1: =20 diff =3D subprocess.Popen(["diff", "-u", expected, "-"], stdin=3Dsubproces= s.PIPE) actualstr =3D "\n".join(actual) + "\n" +# i686 builds on x86_64 host add __attribute__(packed)) to +# the structs. This doesn't matter functionally because we +# know our RPC structs are suitably aligned to not need +# packing, so we can just trim the attribute. +actualstr =3D re.sub(r'''} __attribute__\(\(__packed__\)\);''', "};", actu= alstr) + diff.communicate(input=3Dactualstr.encode("utf-8")) =20 sys.exit(diff.returncode) --=20 2.28.0