From patchwork Wed Dec 16 16:48:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 344518 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp507870ejs; Wed, 16 Dec 2020 08:57:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuYS+NIf4xQscbFCWFI39nPmND2bSYCG+8ehlpy3GkyF7axM1lgDI3lgw85YWDRoqKwKUd X-Received: by 2002:a25:c054:: with SMTP id c81mr42570856ybf.469.1608137832393; Wed, 16 Dec 2020 08:57:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608137832; cv=none; d=google.com; s=arc-20160816; b=ee31wyuI+tHQyWPR0+f/Ais8/OUEvah6u274iZvcgiNoKlOf1/EiT+8Z4dRX2fITXo d7+K9bqH6K1bCHWBOQMSxpxKxtr3tShH6GmZK15q2FLMDBEG6lR6k2UZwR84Z90ZGEqG G219MzEcwbYeehdbX1eVtmWxlivE6GM/d1Amgn0FHgerxBvdiHCExk0cAvoEcRXUf80r X2CfvCm+mLxsrKVoYcnAUe6A5O6m0wK3UUUXLIXj1g7c3mafBJv1eSoSFP2MG1uI9tlG Stx5lKq3QsZGzbnFOHb+qoE5L1qyWPZmZycPklzCxBJwVXXCj5KSRh//sJlXRYLsESnn j7jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=2eVOlhod5aYsfnXeJBxVOLpS1FoyFiYktCGQIZA6BEI=; b=FByOMwJe7lD3Ej7sz2KzHWUOtxP15+mPujQA3lBZQLDN7t6i6EEd7QFm+xhtKDmac0 y4oEuG2FIhZo13AW7jUMLZL1XRAgmnL53VWb1jrcvv7U0VjO0BZ2+x0gK/FTAHyC2Z3X ZzymXun50igAzVf0sNXMIzJmDUjHgErJjwWy0WVu5w3cA+1uJsgmcBkTNuNZpM/2mXXZ 2GOHvL62hRMfG2gJzdszuJHiMZwY9jKfGHva6TvAPRnvWBnwNBNu4nsqdjT9CNR7/22X Y6gRUe4qseZ7w4NXQx5x84A4uIvoag1mZ1n/8YL5e1DdoNR0zoKPRYpC9NZCX7x2dL90 Xmlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=M7yZQxuN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x16si1586376ybp.212.2020.12.16.08.57.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Dec 2020 08:57:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=M7yZQxuN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpa6x-0001uM-QZ for patch@linaro.org; Wed, 16 Dec 2020 11:57:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZyp-0008Fu-GS for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:48:47 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZyn-0002PN-M6 for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:48:47 -0500 Received: by mail-wr1-x42c.google.com with SMTP id a12so23816104wrv.8 for ; Wed, 16 Dec 2020 08:48:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2eVOlhod5aYsfnXeJBxVOLpS1FoyFiYktCGQIZA6BEI=; b=M7yZQxuNESFLxC8e3Xr2DO6fLSWyl7x/wlT6B7SivBQ0T+kaZTEqlOuSh+vTTNBBWK Cmyh6RemptgZKGsu2t9UiNFyz3I8IQS8nl64Xpwnh+J7y+aKR+bIrAKj+IzH42lkx77I j5Cz5OTmyo1cavJGL0BO9oOmE1Sky+EBybPfZ9rzWtJ8mfcakrvVYC3Ayi+eQzNAvPyq hmCnpAyNfM8pYQMFQeF+4ZZs/RBtTR/uHiKzU/YU30QmMMiifqAICLIwGPHFJEOxu9Mk CaoW0UOFrgG6nLaa5ap5bLkf5ni9+AAoHENnCxdRSiQpxyY0fDl5gwH5Ye/YSNOw0lgl 2hJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2eVOlhod5aYsfnXeJBxVOLpS1FoyFiYktCGQIZA6BEI=; b=eyEq65Eh2qKZmzixDXYsqgz5FKcX0qy97jmjVLTbzntcSoeMsLLXVw/T7IU1ruHjR1 xxx+v2uspawGw98cWfvuq1BfAwaiNnYrCRE1h6zd5BXBoNDNqyg80BCdBmQZ+Ewc6KMo 6TzIS5RrI+Y17q4vBOYr7b91CbzttRSKgLSvzUpasG39Ie81Pbi2KzjKZ+Di0H7wdwqy iBSETluf8quldbWDY5c/Ii7JM9xrUfAQ18eUCGj5Sh8cjYWOFJjfcZIA7XH0/eyjHpgC 6CA/db9MjQd53ml/R6RQCXaH11iuvQlaHIxjHpBTGuDN81wIj93e7AbGxjwc/GwX2oC7 ImhQ== X-Gm-Message-State: AOAM531Q9JW2p6pZxMlRV1RFw1ZKY/8JhuLnPIfUEjQTnjkrsHNsFH+c VpB/1Og1b55tMell6fTjShzEwQ== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr7985246wrx.6.1608137324335; Wed, 16 Dec 2020 08:48:44 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w3sm3743673wma.3.2020.12.16.08.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:48:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AFC771FF98; Wed, 16 Dec 2020 16:48:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/11] gitlab-CI: Test 32-bit builds with the fedora-i386-cross container Date: Wed, 16 Dec 2020 16:48:25 +0000 Message-Id: <20201216164827.24457-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201216164827.24457-1-alex.bennee@linaro.org> References: <20201216164827.24457-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Fam Zheng , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth After adding some missing packages, it's possible to check 32-bit builds and tests with the fedora-i386-cross container in the gitlab-CI, too. Unfortunately, the code in subprojects/ ignores the --extra-cflags (on purpose), so the vhost-user part has to be disabled for this. While we're at it, update the container to Fedora 31. Unfortunately the gcc from the later versions emits some very dubious format-truncation warnings, so Fedora 32 and 33 are currently unsuitable for this job. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20201215083451.92322-1-thuth@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index fcc1b95290..66547b6683 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -10,7 +10,7 @@ --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" - - make -j$(expr $(nproc) + 1) all check-build + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS # Job to cross-build specific accelerators. # @@ -37,7 +37,7 @@ - cd build - PKG_CONFIG_PATH=$PKG_CONFIG_PATH ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-system - - make -j$(expr $(nproc) + 1) all check-build + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS cross-armel-system: extends: .cross_system_build_job @@ -69,6 +69,18 @@ cross-arm64-user: variables: IMAGE: debian-arm64-cross +cross-i386-system: + extends: .cross_system_build_job + variables: + IMAGE: fedora-i386-cross + MAKE_CHECK_ARGS: check-qtest + +cross-i386-user: + extends: .cross_user_build_job + variables: + IMAGE: fedora-i386-cross + MAKE_CHECK_ARGS: check + cross-mips-system: extends: .cross_system_build_job variables: diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index cd16cd1bfa..a6e411291b 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -1,14 +1,26 @@ -FROM fedora:30 +FROM fedora:31 ENV PACKAGES \ + bzip2 \ + diffutils \ + findutils \ gcc \ + git \ + libtasn1-devel.i686 \ + libzstd-devel.i686 \ + make \ + meson \ + ninja-build \ glib2-devel.i686 \ glibc-devel.i686 \ glibc-static.i686 \ gnutls-devel.i686 \ nettle-devel.i686 \ + perl-Test-Harness \ pixman-devel.i686 \ - zlib-devel.i686 \ - libzstd-devel.i686 + zlib-devel.i686 + +ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user +ENV PKG_CONFIG_PATH /usr/lib/pkgconfig RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt