From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677167884; cv=none; d=zohomail.com; s=zohoarc; b=Dct3ytvWdScpX/7Fj+PnMINpEdw1yg5GpHDji/x6djrekTwxKUT9Qspm3cBHq/4JymmIZ7mTrR5Qm8sZxvG3zFJSN4vQrFdSa5FhPv1zxaI3M21A1Q5R5lIZ+u/QWoJBrRQEPLzck3b6350BUXp9Owa7DmOFnX21HXDhPxcvS3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677167884; 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=8CADyRD/0k7m7qbsD3m1XSTlaVYQ9wnpW+IRtBjtl2k=; b=VF/iUzN0hw5xxks2qLGiApY3KDSVdJpnbTRDykYnbVGr7CjiySt9ItdAfDGAf9CrdlXZksexXu4IsxDMdxHdEg3jxz38DUA4taZxGFa55KsuiqG5ygjYZ9+ol2odqR0+eOBNFR9WH64vB7QsvxIIHr8893w53ZgE4B4t85I+0z4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16771678847763.8549475032993996; Thu, 23 Feb 2023 07:58:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyL-00006k-V8; Thu, 23 Feb 2023 10:57:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyI-0008E7-RP for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:26 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyG-0004iL-TJ for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:26 -0500 Received: by mail-wr1-x434.google.com with SMTP id bo30so10492072wrb.0 for ; Thu, 23 Feb 2023 07:57:22 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f5-20020a5d5685000000b002c58f199a49sm8912292wrv.117.2023.02.23.07.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4375E1FFB8; Thu, 23 Feb 2023 15:57:20 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8CADyRD/0k7m7qbsD3m1XSTlaVYQ9wnpW+IRtBjtl2k=; b=Q59x6nRJe0zRJwA66AY/JRM6n8cYXru+djNHIUYsQASr7Gg1ikFBYNxsOpP80V49Fp StnjdUp5tsyZgOQKapDR+aZfzUd2fUwy+4Nabc1+ZeYWmimUQkfAsDE4vu/cLKjgy0d2 P06yDlqpMC6Wnuvw9yhCZCxYQ/36jGwvQd5LO0r7kxU3yju9h8uBe0IHomV0BA/Sv6iA plf2wzdUn2yAAKeqI7m22cHQ75sknRSMgips+pYHkG4lupqV2HLo6aXRtYx4RI+CC933 BzybmytoH7rp4lNw9RlwvpbGm/HPMV0P/vzaplfCsFyNkQYvm4w6CQzQ8FL0FCxqpLXo SxzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8CADyRD/0k7m7qbsD3m1XSTlaVYQ9wnpW+IRtBjtl2k=; b=Jg1s3JYoaHrE7zhFpSbbzKD6SevecuOa/E+SNTP4t9S/MvnrbLjBidopTE9BmV7FL9 Ba265lyx8GS1cXhnL1meyqj7ufAiJ9jynYKiAcnhLRqfUGBI2D5xXO6MOY1tDTxMVWzo M0cAkuOEzNXkzBq9X6uH+kq45uhPSsqXs2hfkfL23OLdiykubcAQYHWz3MR06X0l8fcV ziQUUq/S98di5K3omkbG2YucnTeg4o7AdELeLlA4pJCPJX+ZEomEY2SYsfywolkqS59x 1AA4jcQunlmdsppAKCen7sXuS2C9vtkqTvmk9tGQKX6kA41uMNchIIUitGCnonAaud0P tWOQ== X-Gm-Message-State: AO0yUKUfV6Xndng/HMTLUBcNLcAEIQ3YTW1zJu7HiQH/TtbdT0Vh0oqK ujKwrKqI0TdYkDw6wHQCkDNroI920dQ3p1Ov X-Google-Smtp-Source: AK7set8UAxv6VOF8BB1tYpAEw2WKeSMtJpATQNIGwDNk2wYUkacmUh1L2o12OHNcnoSAtA7K71/gzw== X-Received: by 2002:a5d:63c4:0:b0:2c7:1483:88d6 with SMTP id c4-20020a5d63c4000000b002c7148388d6mr2013430wrw.23.1677167841190; Thu, 23 Feb 2023 07:57:21 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 01/13] tests: don't run socat tests on MacOS as well Date: Thu, 23 Feb 2023 15:57:08 +0000 Message-Id: <20230223155720.310593-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677167885105100004 In preparation for the next patch when we enable socat for our CI images we need to disable this part of the test for MacOS. The bug has been raised here: https://gitlab.com/qemu-project/qemu/-/issues/1495 Once that is fixed we should re-enable the test. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230221094558.2864616-3-alex.bennee@linaro.org> diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-chan= nel-command.c index 425e2f5594..04b75ab3b4 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -31,7 +31,7 @@ =20 static char *socat =3D NULL; =20 -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(CONFIG_DARWIN) static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir =3D g_dir_make_tmp("qemu-test-io-channel.XXXX= XX", NULL); @@ -128,7 +128,7 @@ int main(int argc, char **argv) =20 socat =3D g_find_program_in_path("socat"); =20 -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(CONFIG_DARWIN) g_test_add_func("/io/channel/command/fifo/sync", test_io_channel_command_fifo_sync); g_test_add_func("/io/channel/command/fifo/async", --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677167980; cv=none; d=zohomail.com; s=zohoarc; b=VRyp7sXOdMauq0+HsCWWfTo0fCCVmrrb49u8Br/mTPHEEnoT8oWutagZJ7BjfjGz50VdAGwXRpki2TRjE5SG5KjMbVDy+rQWERzbscMsxGAyKDNFXK9KWKTA2AvXVnUz49yAh1Q/pzYkcETtTi+rCnKmFpFKu9YD9qWpBHv1K7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677167980; 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=xUvMlAVxjh9mOIj9fQ7I15Iz/gw8tjZjJPoErPY6zgI=; b=d87xaMPgxmBu34ksFUaR5VXOcDHMaCWxhX1jpTJB9MHojQyE2NbU17HuEc1SlVuDOqpQlAXWDGtDEaCZFc3bPIfionfVukof3VNdJ+pFySFSByur8Siswtj3dg5hYpPoVyPPi9NZ6FgMlTGOnEgkqcK2vXMCuKrYSWNZoBEN3xg= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677167980965306.19014419161033; Thu, 23 Feb 2023 07:59:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyN-0000HH-Hn; Thu, 23 Feb 2023 10:57:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyL-0008TZ-20 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyG-0004iV-UG for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:28 -0500 Received: by mail-wr1-x435.google.com with SMTP id c12so11054362wrw.1 for ; Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b4-20020adff904000000b002c54f39d34csm13986520wrr.111.2023.02.23.07.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9EC201FFBA; Thu, 23 Feb 2023 15:57:20 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xUvMlAVxjh9mOIj9fQ7I15Iz/gw8tjZjJPoErPY6zgI=; b=TkoyWyhAqWtjnegBSdkllWuNrVN+g6Soz5qZwjhth1vFi7bNpO3nC7OX9jo7rTdvFz nbGNjAzzxdZx2giT3rGApebL258c0ptt2CjqwmCoTCSHtTXUxcAiETFK94F7hO01E30f Tmilpte7z8MAjUAEVy+t3a9qYpdcujxULDAQCalGGHSeyVBOBQ0SPKl8YyIe+sQZUcCe ADperl/ppgmBXtEtf5mth2+Xv27rmq7Dib6aTiHN+V8HOUQPolNllO5yJ1Xu3WYWy/IP Vm2+AvjAxHGUqIZn9BU1iW0UbiYomEYrKmVGuJNva/OyFpp8F6gmA3yuPI/qZbWB7B1z /gUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xUvMlAVxjh9mOIj9fQ7I15Iz/gw8tjZjJPoErPY6zgI=; b=NxNjO3es9I/Rp5YKM16a3lJYsFVgICSCjQZfPs07kpSCIQU2uhCjc8xEa/EoRoVlSt 9S1+5DF5TbGZX8IN21isGMwBmM2WOzIpPJRYxWTxJnKVkTYQkgrBCHTLt0auCwgdNQRO tBKae8vnJH28WuTS87C3hJ7FqUO/GGMrPeTo1I4v/XOVPDUzBVoCs1BrFuuLB+jCCZTr UiO4NJQ15RgHMNKhPbcff3rTujV2mo3VCXGWXzcoUovg5sU0zryuCOyGVcDzh8fB4Osc EzfJhFAmGzkGT38X9rI0AUvA1nMhziSZaVOzl3NcAjwiU9KH9nGfAgTm5tv1hUyMWWd2 hxfQ== X-Gm-Message-State: AO0yUKU4rDLdVCAScyLP+n3C1rhMOnF+aUEK8Z3gdhKd0lyE0KvQnXAB 0Mlvnu8GMg6KIzgJ9Ux+yTpKQA== X-Google-Smtp-Source: AK7set9iaw0Mv04d/CHrm4eLxdSCkngD+I8zNmU2tFKi2WhThI1MiE7r0nn8CSfUf61Rw4tge4WDuw== X-Received: by 2002:a5d:6103:0:b0:2c5:5954:cb7b with SMTP id v3-20020a5d6103000000b002c55954cb7bmr8938918wrt.34.1677167841955; Thu, 23 Feb 2023 07:57:21 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Ed Maste , Li-Wen Hsu , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/13] tests: add socat dependency for tests Date: Thu, 23 Feb 2023 15:57:09 +0000 Message-Id: <20230223155720.310593-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677167981949100003 We only use it for test-io-channel-command at the moment. Unfortunately bringing socat into CI exposed an existing bug in the test-io-channel-command unit test so we disabled it for MacOS in the previous patch. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Cc: Marc-Andr=C3=A9 Lureau Message-Id: <20230221094558.2864616-4-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index 8934e5d57f..44d8a2a511 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-= pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_= image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zst= d' +PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-= pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_= image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vt= e3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-13.vars index 65ce456c48..7622c849b2 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-= pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_= image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zst= d' +PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-= pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_= image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vt= e3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-= 12.vars index 65b78fa08f..da6aa6469b 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -11,6 +11,6 @@ MAKE=3D'/opt/homebrew/bin/gmake' NINJA=3D'/opt/homebrew/bin/ninja' PACKAGING_COMMAND=3D'brew' PIP3=3D'/opt/homebrew/bin/pip3' -PKGS=3D'bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffuti= ls dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo= json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh li= btasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config py= thon3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbre= dir vde vte3 zlib zstd' +PKGS=3D'bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffuti= ls dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo= json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh li= btasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config py= thon3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract= usbredir vde vte3 zlib zstd' PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON=3D'/opt/homebrew/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index 4a569d82f6..56cf14e553 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -94,6 +94,7 @@ RUN apk update && \ sed \ snappy-dev \ sndio-dev \ + socat \ sparse \ spice-dev \ spice-protocol \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index fbc953c6dc..1291ae1b04 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -105,6 +105,7 @@ RUN dnf distro-sync -y && \ rpm \ sed \ snappy-devel \ + socat \ spice-protocol \ spice-server-devel \ systemd-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index 5175095a85..856db95100 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/debian-amd64.docker index b61f664ea2..e3dba71ad5 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -120,6 +120,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ systemtap-sdt-dev \ tar \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index b69958c69f..b00e9e9bcf 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index 96b524fab6..fb1129f256 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index 08a75cebdb..7a2b864a38 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 5930e6fa5d..5a3340e964 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index c65d9830e7..422fdebe8f 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 2ae56c978e..78d7ae6211 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index 0db86a0fcd..d06ea3605a 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index b659c0b8a8..21ed1c6081 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx_rtd_theme \ rpm \ sed \ + socat \ sparse \ spice-protocol \ tar \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 0a404c15bf..95d30e7936 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx_rtd_theme \ rpm \ sed \ + socat \ sparse \ spice-protocol \ tar \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 5d60a96141..8e06d080b8 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -113,6 +113,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm \ sed \ snappy-devel \ + socat \ sparse \ spice-protocol \ spice-server-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 4b2c02d6ab..568c1c979f 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -104,6 +104,7 @@ RUN zypper update -y && \ sed \ snappy-devel \ sndio-devel \ + socat \ sparse \ spice-protocol-devel \ systemd-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 13ab0b6887..f34d88d33d 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -119,6 +119,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ systemtap-sdt-dev \ tar \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 6467bcf08a..2854748f49 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -101,6 +101,7 @@ packages: - sed - snappy - sndio + - socat - sparse - spice-protocol - spice-server --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677167951; cv=none; d=zohomail.com; s=zohoarc; b=mu2lN1zkg+h6OGRnSdo90JXpoTi2uMaY6QkoMYUHUBQPbEW+vhhK1TN6WZqxV0hNZ/4uMEWQO4wj/pn+Gq2DdaEcNvHvunfosDOi7Jn2w429DLdU5WHzSYFq6i/RaG1fT3jpwg4NYqbk2scF/y/J3+GnGHs9TIBL4X/8eSZ2r8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677167951; 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=Y5CagnZd0OC5H3cuEddG4GatnBqEK8bA4UH4sgfkIbo=; b=S7ttmJqkSwKVL1gX5JTeBov/L8WC29TRhWZVs2lQX9vIlnrRfLfDPBlAhi12O2AUsBJLiNAiDg8zXpovLXjFU5i8RMZIVcDLZvsSm5Et7Q+yIhZl781wbrVPjDin74LZcqCciAG+1beBdPQOLiZqd3RZ5F895g/4iRNWd3tjQXI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677167951354489.86294083292387; Thu, 23 Feb 2023 07:59:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyL-00006P-Tj; Thu, 23 Feb 2023 10:57:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyK-0008OW-2u for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:28 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyG-0004iW-Su for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:27 -0500 Received: by mail-wr1-x430.google.com with SMTP id r7so10890763wrz.6 for ; Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t16-20020a5d5350000000b002c53cc7504csm7354786wrv.78.2023.02.23.07.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA4FD1FFBB; Thu, 23 Feb 2023 15:57:20 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y5CagnZd0OC5H3cuEddG4GatnBqEK8bA4UH4sgfkIbo=; b=sxP3WpiOCnEFP/+Ji0UnSZeDb2pvABaXDDuPWJY+0gexmPwyRircxBeC7IrNfVCI/i 5MzDJjisk7UZJYGAstxA65qaFdqNDOFzxh6lXcTzA5nViYBK+CIi69MEGsBSPK5jpR0c nZr2q5qbbKSME85Nu8gcoIZAFdwNC7xf3G5oTol7VknpiOUkKoUjHW00ARmfUVhuueAj CsJ9tNKsWjs6KSCUrLHDLbiptmVEnJuOK8/PA+J9kdqtHwCasESdaLJvs2sfi8zDem42 oEh1bNSekkbkUGGySU3+PwjVpwbmTayK2lMA1hZXrQCNO+DBhFh7eNAYltACm8TB73dR 96Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y5CagnZd0OC5H3cuEddG4GatnBqEK8bA4UH4sgfkIbo=; b=ulcNWMgroZcWZr97SAYd86ZYvZsHoXhGOm7upuJ4mKde97EW0AZzZPPnRZvAVgzH+3 oWWU0/9LxHfrMmOhI2NxoKeSDUKq3IeNucmhtgvo/nrNnEf+9vO8yeMrkSPnd1VNKGBn Q7pmIv4oqnWDBtMzCdzJl4OwQBo3a6Gqc/sM8OLanHKcSI4pQMIKdlsscjnFzT51iSDT SwLXlceOlu5hm2BDI9Y6UNpwcix2lZeYzM7a5SeiXACPr1OnfuGGsYgBH1xkGWgXbPTt wXim2YcqoxFvO11ix8GISWhuCqEZi5MzJ0mBO5MCej6gzw9Y6Grg9WIiaZNVNwSi5jOd H2UQ== X-Gm-Message-State: AO0yUKVzSMGZScPFW1WYMbCbH6BlYz0ZftRXjP9Jw82sEgGEQM67kMYE QHbMLvOoioj2uIc9yD41vbqwGA== X-Google-Smtp-Source: AK7set9Rm8mHHNjh2MHRXPUbzV916lwWv9bohSdKaA2oT9S2qYlLSvEqIv36G+q8jsoueqGE3ZNjtg== X-Received: by 2002:a5d:5308:0:b0:2bf:c0d3:430c with SMTP id e8-20020a5d5308000000b002bfc0d3430cmr11035823wrv.11.1677167842227; Thu, 23 Feb 2023 07:57:22 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 03/13] tests: be a bit more strict cleaning up fifos Date: Thu, 23 Feb 2023 15:57:10 +0000 Message-Id: <20230223155720.310593-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677167953581100003 When we re-factored we dropped the unlink() step which turns out to be required for rmdir to do its thing. If we had been checking the return value we would have noticed so lets do that with this fix. Fixes: 68406d1085 (tests/unit: cleanups for test-io-channel-command) Signed-off-by: Alex Benn=C3=A9e Suggested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20230221094558.2864616-5-alex.bennee@linaro.org> diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-chan= nel-command.c index 04b75ab3b4..c6e66a8c33 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -42,6 +42,7 @@ static void test_io_channel_command_fifo(bool async) g_auto(GStrv) dstargv =3D g_strsplit(dstargs, " ", -1); QIOChannel *src, *dst; QIOChannelTest *test; + int err; =20 if (mkfifo(fifo, 0600)) { g_error("mkfifo: %s", strerror(errno)); @@ -61,7 +62,10 @@ static void test_io_channel_command_fifo(bool async) object_unref(OBJECT(src)); object_unref(OBJECT(dst)); =20 - g_rmdir(tmpdir); + err =3D g_unlink(fifo); + g_assert(err =3D=3D 0); + err =3D g_rmdir(tmpdir); + g_assert(err =3D=3D 0); } =20 static void test_io_channel_command_fifo_async(void) --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677168029; cv=none; d=zohomail.com; s=zohoarc; b=cqEmUdeBagAjHtZSoFHQoLviZ7YFPm6eIvEbACE2sDEomsogfUZNiv/SoOIleGOiyK8xAFXccTBt+yoeHPaKEn4L1uS+5zQlX1kN2w6tllXvz3BfQXJNMfaxAgByKBJUjTuoP8ThoF+QJdhScZ9qI2Xbo7bdbC8faOCUJDAlRWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677168029; 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=yuFDrfczrLdYohvzSOy/QjHAPPmsuwWUGOxoTTLBq+M=; b=Kj0XdQrbaNhif4TFqjtjlL1UJ/YSAA6Sr+urGOnG+MA5AVsR0UdhcVV0gpcsepB9VVBX6vAnb/905Y7mPbBZuS8rfVjtxOTSc7JZX/qkK3h5WcuT7erDhZAZx5Op1zL6TsKAPlgUfsFgYUA6ViBXXKnhfuISae0/ixCGZFMgdrI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677168029765868.1800225056639; Thu, 23 Feb 2023 08:00:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyM-00009v-8S; Thu, 23 Feb 2023 10:57:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyK-0008QC-D3 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:28 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyG-0004ig-Td for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:28 -0500 Received: by mail-wr1-x430.google.com with SMTP id bt28so4393665wrb.8 for ; Thu, 23 Feb 2023 07:57:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z14-20020a5d654e000000b002c5801aa9b0sm10986103wrv.40.2023.02.23.07.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DB2621FFBC; Thu, 23 Feb 2023 15:57:20 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yuFDrfczrLdYohvzSOy/QjHAPPmsuwWUGOxoTTLBq+M=; b=cE0jxZIEtUHqeqY8OlVvNgSbiO38Jz8If3KjyYohM2uhRcYoWg6DIZ5XxgUD9BJYSd qfgMrLmJoLGnDTQItvaqGcCa0wMSGtPS/hZZEmN0+wDDtRkZvEYfw/5vCtrgssqGY/vq 9+t3TkRBN/BemRGhtkfWEtbQpXT6vNVP5qxKmaQ9uZhqo5wpg1DUy2lCiw0/0HCQvQaV 1EsS40W+UlRUgeo65m9YL2nbsV7jKatVz2YTnFxUPeUh4hFIEazuGrFOjI7kdS9/T+VC /FWC9fPsjo1iC0EfRH9UWKwNpzS8hp8Qjpo0Ub1lt7JuFXfCIBS2flWhS1FmtUMU2lNJ 5g0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yuFDrfczrLdYohvzSOy/QjHAPPmsuwWUGOxoTTLBq+M=; b=R8wfJ+fu9ucfLQp82ti0vC9Efc9tlvDvZeKrT/R4bkLNcUHW7am+06Njj31oBltto6 9KFkL+f97Kuw1ouP7cqwDZcA3o8x8pVokbFRsILyFfn5d/pWXhKkZKJ/n+jzOZwpifUP bQyAGquFMO+9lxDECgIp1imjJFzxzlv3g2FMh9IlZUccQEb7Qbgr40QxfJ2hUjjiY/Uz FfxOiE26W99TRgtDHxF9UnWw0pb1n3+uTW7JU8XJ+AqsjlvC+VrhZcrc3VM5ZQDmKioG sgVhr0mTMQfpdjVkU2wZ6/7es8Q0VWj43vMNYs2PJrW5TRpZB7m3waC/YjQHxUkfwF7r anzA== X-Gm-Message-State: AO0yUKW+oaUfpR57lPcWrET0Wv+yWdvof1tdQ90CXnPg00j0Y92uBhJI XgMatBk7Ba2sussqhVMmLKuv/g== X-Google-Smtp-Source: AK7set/38j/cK+ia9dK2b4b3AuedsdJmcff/g4oTjfwhzOo+WBnnJDsHEg8yHpR7ghnffAiwn+HMDA== X-Received: by 2002:adf:ed11:0:b0:2c5:5ff8:6b02 with SMTP id a17-20020adfed11000000b002c55ff86b02mr9096109wro.0.1677167843257; Thu, 23 Feb 2023 07:57:23 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Aurelien Jarno Subject: [PULL 04/13] tests: make fp-test less chatty when running from test suite Date: Thu, 23 Feb 2023 15:57:11 +0000 Message-Id: <20230223155720.310593-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677168030447100002 As we like to run tests under CI with V=3D1 flags the softfloat tests can add up to a fair amount of extra log lines. With an update to the testfloat library we can now call fp-test with the -q flag and reduce the output to a terse one line per function tested. make check-softfloat V=3D1 | wc -l 759 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-6-alex.bennee@linaro.org> diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c index 35829ad5f7..36b5712cda 100644 --- a/tests/fp/fp-test.c +++ b/tests/fp/fp-test.c @@ -106,7 +106,8 @@ static const char commands_string[] =3D " -l =3D thoroughness level (1 (default), 2)\n" " -r =3D rounding mode (even (default), zero, down, up, tieaway, odd)\= n" " Set to 'all' to test all rounding modes, if applicable\n" - " -s =3D stop when a test fails"; + " -s =3D stop when a test fails\n" + " -q =3D minimise noise when testing, just show each function being te= sted"; =20 static void usage_complete(int argc, char *argv[]) { @@ -190,9 +191,11 @@ static void do_testfloat(int op, int rmode, bool exact) ab_f128M_z_bool true_ab_f128M_z_bool; ab_f128M_z_bool subj_ab_f128M_z_bool; =20 - fputs(">> Testing ", stderr); - verCases_writeFunctionName(stderr); - fputs("\n", stderr); + if (verCases_verbosity) { + fputs(">> Testing ", stderr); + verCases_writeFunctionName(stderr); + fputs("\n", stderr); + } =20 if (!is_allowed(op, rmode)) { not_implemented(); @@ -837,7 +840,7 @@ static void parse_args(int argc, char *argv[]) int c; =20 for (;;) { - c =3D getopt(argc, argv, "he:f:l:r:s"); + c =3D getopt(argc, argv, "he:f:l:r:sq"); if (c < 0) { break; } @@ -874,9 +877,15 @@ static void parse_args(int argc, char *argv[]) } } break; + /* + * The following flags are declared in testfloat/source/verCases_c= ommon.c + */ case 's': verCases_errorStop =3D true; break; + case 'q': + verCases_verbosity =3D 0; + break; case '?': /* invalid option or missing argument; getopt prints error inf= o */ exit(EXIT_FAILURE); diff --git a/tests/fp/berkeley-testfloat-3 b/tests/fp/berkeley-testfloat-3 index 5a59dcec19..40619cbb3b 160000 --- a/tests/fp/berkeley-testfloat-3 +++ b/tests/fp/berkeley-testfloat-3 @@ -1 +1 @@ -Subproject commit 5a59dcec19327396a011a17fd924aed4fec416b3 +Subproject commit 40619cbb3bf32872df8c53cc457039229428a263 diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 312a4d301f..f9ca6a93b4 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -609,7 +609,7 @@ softfloat_tests =3D { # The full test suite can take a bit of time, default to a quick run # "-l 2 -r all" can take more than a day for some operations and is best # run manually -fptest_args =3D ['-s', '-l', '1'] +fptest_args =3D ['-q', '-s', '-l', '1'] fptest_rounding_args =3D ['-r', 'all'] =20 # Conversion Routines: --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677167853; cv=none; d=zohomail.com; s=zohoarc; b=f7XQ7L4JItvJL5AKVdQnT6n40fEb78vNtVSAllgqWjIzSUIA4tFFXnsK3foh0+3L5xPpTYMQgPAIFDIpWvAwzZ5g1X2hH6+BvFb4erMhvLC01jSpG5w3CHTWzunm6kKAmeoNlN5B+5trVZUKRDweNdCHBB7cJj0MGPhhEgZAhwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677167853; 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=cxT8CnhgY0D2r8NxQicEQ9Z5WyfyndJneuRY8lJ1+eo=; b=hQqRFq1y2o3ixWVxaNXhVeQZNItI88juGr27vnNkl+jYmVBhlRjpHA31DGpzTQ6JRVz+hLqQQpeEcDOJlGxlHmKNr+yC8tDylKEspFNw1BP42DL58dyG9YVdvno3tPSmDyuy5yUm/beCNNcD3oJjFw4aq6nzHsah40gm2W/rsHA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677167853962601.1051377080263; Thu, 23 Feb 2023 07:57:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyK-0008RE-P2; Thu, 23 Feb 2023 10:57:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyI-0008CF-Ks for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:26 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyG-0004ib-SU for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:26 -0500 Received: by mail-wr1-x432.google.com with SMTP id r7so10890785wrz.6 for ; Thu, 23 Feb 2023 07:57:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u13-20020a5d434d000000b002c55ec7f661sm9476530wrr.5.2023.02.23.07.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 014771FFB7; Thu, 23 Feb 2023 15:57:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cxT8CnhgY0D2r8NxQicEQ9Z5WyfyndJneuRY8lJ1+eo=; b=BoP902A0sb/FLK02Ci73PsdyvrgfWgqy11RUdU+y6do+xqWOCLMnrOZQGswqb+8xb4 PDP45XuzmPSUAsbRvalmUl+MMBWeTrlsdJnMbb6v2O6iL3kMbo5d5Qpwt1u0ipw7GKT8 0w71zciDreVBB91Wqn+WBYm7tvbMmKfZ5cM+nbk6FUu399wUHi1GwUrB+B9J2taZChyb m27EbCZjZ+dCeF/Pkw3PCYKxvjhkoWt0cSpCpfMaKrEzqk6Z42hvbscAtcgquIMMG7W0 T7CHCFg39wFmPYS/DLaYr/ZF/8R1YmgmNH/AF6k9AUcDuSWmzbE4aAIbLkxhG8GwvIR3 /IPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cxT8CnhgY0D2r8NxQicEQ9Z5WyfyndJneuRY8lJ1+eo=; b=1CKclpgCaP3Q7L8wdZX4RszLclSVNoXqoGzP43RYwhmXXtCELQYryfFPiPemsBZWxO ps5/msVU8VP0zjAHomk46EsNS9z/o3SOWJwaBHWy4XWkwu2eTeR7VF3A92DzeVUpu0xl AGiVIDnuoWvRCjVe+rU7YAdoQxWWiM7kWQwQKXwwHDRCVqwTcysv3+cKOC9ElA1O2HcV thNvry96c4aFC5soiSm6gq4FJzSU79n6RXb2imH1QHBmRQ0q+WYr2D17B6xuCAicL6w8 I/CTJD/P9Z39wL6PrFSW2eF2uOrS2IaL2Q49COP1+h2NfmpTDsx+AJBIUeTmH/+gVJlN 6UzQ== X-Gm-Message-State: AO0yUKXOyE0AFEkiNcLBBxXVHsG3QK2Jq+u0T+tFn7QUcyU2NPzL1mJ7 xD2J69yFGGlpzJUTN5F9Fz3G9A== X-Google-Smtp-Source: AK7set9TdZgpYoOFg/ZGG9f7rsz3mp5UXPhepYKKEwyUdHnX/mqgFBM7IcppQWmvfg8oO6GKHxrsaw== X-Received: by 2002:a5d:4851:0:b0:2c7:1159:dfde with SMTP id n17-20020a5d4851000000b002c71159dfdemr2126472wrs.31.1677167842962; Thu, 23 Feb 2023 07:57:22 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/13] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs Date: Thu, 23 Feb 2023 15:57:12 +0000 Message-Id: <20230223155720.310593-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677167854907100012 From: Thomas Huth The meson log files can get very big, especially if running the tests in verbose mode. So dumping those logs to the console was a bad idea, since gitlab truncates the output if it is getting too big. Let's publish the logs as artifacts instead. This has the disadvantage that you have to look up the logs on cirrus-ci.com now instead, but that's still better than not having the important part of the log at all since it got truncated. Fixes: 998f334722 ("gitlab: show testlog.txt contents ...") Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20230215142503.90660-1-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20230221094558.2864616-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml index 7ef6af8d33..a9444902ec 100644 --- a/.gitlab-ci.d/cirrus/build.yml +++ b/.gitlab-ci.d/cirrus/build.yml @@ -32,6 +32,9 @@ build_task: - $MAKE -j$(sysctl -n hw.ncpu) - for TARGET in $TEST_TARGETS ; do - $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=3D1 - || { cat meson-logs/testlog.txt; exit 1; } ; + $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=3D1 ; done + always: + build_result_artifacts: + path: build/meson-logs/*log.txt + type: text/plain --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677168028; cv=none; d=zohomail.com; s=zohoarc; b=Pp+sY2L/dl8q/7Ntz2dYoudcAhwnW0GJIN77+7wHRacY5t1eFdNp2EHFbpJmS9ute5eDFe/RqhYD1pFzAAJN2J8BEfBZt/eAjk+o5bNhKD9m9XKYCd1NzfKlWXJocGEsvbnw2mseHb8XlL5VDv5Cu9C4eyMuJ7GEhnXOsDQk+ck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677168028; 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=Iz2ihtkdSEiRDQ6YWUZ8LNK4Np/JnVHiwDlZX5etuf8=; b=FsuZpAqIHcA03po5QV3viietCjeghrf2jQXfQYXv1i1/tuTMBZnQhQkoF1HbCz0JBCeFmlMDz2mv8pSf/T088eOZdsItF272q9TMPIUpdsE6R6KVhB1sZtCPGw9c1lr63mN4PJJrWTkRwI3EBeOZo9GIj/IIU52jQWWSOEkQG4I= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677168028058863.649738314891; Thu, 23 Feb 2023 08:00:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyO-0000RJ-VA; Thu, 23 Feb 2023 10:57:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyL-000079-QV for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyH-0004iy-HG for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: by mail-wr1-x42d.google.com with SMTP id h14so2387652wru.4 for ; Thu, 23 Feb 2023 07:57:25 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o18-20020a05600c4fd200b003e9ded91c27sm4676210wmq.4.2023.02.23.07.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2AC7F1FFBD; Thu, 23 Feb 2023 15:57:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Iz2ihtkdSEiRDQ6YWUZ8LNK4Np/JnVHiwDlZX5etuf8=; b=p5cCn6gvoNIv0von55aEg5nsq2kCL25XFTkATql70Q3uVz5xCFG2nHtSXxP3mjLu2i 7BgcK/ZUhffequlr3q+44DKkGc1pnsSKHwBKWrIwRLurIe7rQTZAPu53dIKzl7efmnV8 6AXdLoSD2xruc3EnA0YemqzV/jkYtTY2OCEQhx4R605GxCmi9yFxdUUTICbbRMcWeYKn UivZN5aOPqJtyDzaQCBCSD2HLmcqW/kOmzYof0B/twwhOXJKGRXlAPyjnMvXBBpwZT74 ksdD9622u3WD8lkd3q6rLZfv0ATyswlGqhT/4Xrxl24/2gITfC7elXhpC779umZs7fmn 6lvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Iz2ihtkdSEiRDQ6YWUZ8LNK4Np/JnVHiwDlZX5etuf8=; b=iNcu6bEI/cAAjDitcOx9yTIAf9x6AzRabNCOksRofnuqyPnOxKgs9zuSlXfG2S3AFL DzpciQQkTGaQMFN4cTXurqR3uU8GJDpDMcTaNok4GQfnERE0K6npKgRazN5tEXV7xX0s NU7yIZ3QTwlAsU09My2T1VNXiIUQoq5oXopX8oWzGMxPDZ3LNUClYne+/43GjLXKy8Vx /njbs23n7ND1hwWF6RpN2yMWHCepCEe8964BbP/UXJWL8UYWtwS4XAVfiAmOw+rDxf9L tbVahynFQMmJvAJY7PLfxchnhEfaD8JyQJchcaouiE/+Ip8GddP9lvbyaELpEH6jAK6/ rE2w== X-Gm-Message-State: AO0yUKU6Fcv6vvZW1VylWhYcdObFuFLvapHm7kJLSGQB9/ybU1+kopBL Ki9tQQ+EmO2uotEmZXpBo0WOHg== X-Google-Smtp-Source: AK7set+YQB6HgzKZNxzGF461guwVqJ7zFZk0k7KEnSd4sTV3yVrmdFsTWQDB2cL4V6jG1AGR6oavMA== X-Received: by 2002:a5d:6b4d:0:b0:2c6:67eb:a9d7 with SMTP id x13-20020a5d6b4d000000b002c667eba9d7mr12092814wrw.27.1677167844137; Thu, 23 Feb 2023 07:57:24 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 06/13] gitlab: extend custom runners with base_job_template Date: Thu, 23 Feb 2023 15:57:13 +0000 Message-Id: <20230223155720.310593-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677168030430100001 The base job template is responsible for controlling how we kick off testing on our various branches. Rename and extend the custom_runner_template so we can take advantage of all that control. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-8-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml index 9fdc476c48..34a1e6f327 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -15,7 +15,8 @@ variables: =20 # All custom runners can extend this template to upload the testlog # data as an artifact and also feed the junit report -.custom_artifacts_template: +.custom_runner_template: + extends: .base_job_template artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-c= i.d/custom-runners/ubuntu-20.04-s390x.yml index f512eaeaa3..cdae6c5212 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04/20.04" =20 ubuntu-20.04-s390x-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-20.04-s390x-all-linux-static: - make --output-sync -j`nproc` check =20 ubuntu-20.04-s390x-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -43,7 +43,7 @@ ubuntu-20.04-s390x-all: - make --output-sync -j`nproc` check =20 ubuntu-20.04-s390x-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -66,7 +66,7 @@ ubuntu-20.04-s390x-alldbg: - make --output-sync -j`nproc` check =20 ubuntu-20.04-s390x-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -108,7 +108,7 @@ ubuntu-20.04-s390x-tci: - make --output-sync -j`nproc` =20 ubuntu-20.04-s390x-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab= -ci.d/custom-runners/ubuntu-22.04-aarch32.yml index 42137aaf2a..50e5646a44 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" =20 ubuntu-22.04-aarch32-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab= -ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 8ba85be440..13e14a0f87 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" =20 ubuntu-22.04-aarch64-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-22.04-aarch64-all-linux-static: - make --output-sync -j`nproc --ignore=3D40` check =20 ubuntu-22.04-aarch64-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -46,7 +46,7 @@ ubuntu-22.04-aarch64-all: - make --output-sync -j`nproc --ignore=3D40` check =20 ubuntu-22.04-aarch64-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -65,7 +65,7 @@ ubuntu-22.04-aarch64-alldbg: - make --output-sync -j`nproc --ignore=3D40` check =20 ubuntu-22.04-aarch64-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -107,7 +107,7 @@ ubuntu-22.04-aarch64-tci: - make --output-sync -j`nproc --ignore=3D40` =20 ubuntu-22.04-aarch64-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677167983; cv=none; d=zohomail.com; s=zohoarc; b=ZZqgttv/tS2B+c//y9MgYc90wSfk2nhym+vd2lf334N2+270SZOGx3Fq4qeL3PRauvpCMZXywmMrWEq5n62gqWA0zn6cA1IGsL9El2h+v8u2q707x1UThUUwP4T2B4eds09fOPeaLiQq3YhdVJKYi8ui7EJlbpepBoD6SrB0dTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677167983; 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=mTbcs71BJ5fbDDQYM5nzbWXk07NL6w1/1OQA+EWPMg8=; b=l376v7Imu0yqyiyP1QOu42VGSFyCsIiwxzVaEOTTZ0zg5FnDzhcvsbjqIpG+1vfLsbqZ6lrwIA+vIUwmHWIFk3Uz5olsjWUjeH4YvexTQwG/PxFtaEQhiQyYrTzNvPJxVMrqXKEA+yl918Q7yKThS+19ZKtoi9OmpIarxBtaKfM= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677167983795953.6665812602702; Thu, 23 Feb 2023 07:59:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyN-0000Ir-NL; Thu, 23 Feb 2023 10:57:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyL-00008O-T7 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyI-0004jF-Mz for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: by mail-wm1-x329.google.com with SMTP id ay29-20020a05600c1e1d00b003e9f4c2b623so4436805wmb.3 for ; Thu, 23 Feb 2023 07:57:25 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j16-20020a056000125000b002c5706f7c6dsm7259209wrx.94.2023.02.23.07.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 464A41FFB8; Thu, 23 Feb 2023 15:57:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mTbcs71BJ5fbDDQYM5nzbWXk07NL6w1/1OQA+EWPMg8=; b=grSE/Au5SikIWpyQtOn/NSdkUNhbK0DSXXQxsOy4y+X/CTLTLn9InrZIgKxoOqoZV+ XVNByZAKRuSnI1MhwV1Y2OLCtkjHH2YlR+9wsnQpcAMPuSg25AYSfSTAWEooSs4qSnRU oKzV6fuKGbd+tJTRu9yN4MqwTCwcFoJQjF5DzfTDYWUc6kPgCFlOIiQrMdyf4mRSEh49 bhFJXrLfc3oMQxrtVaQcNXGLHd84z/cyYk1n4BDvy/8Hatu/Z7TDGZwBe/NSoRxnh6LR 6/rHKsuKPdbXDcyOGLDHSGKWyxe/Oc+FrJ0ZTya+qRU46Gej8QQ3j4xkq0TcnI5gYz1f Qsvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mTbcs71BJ5fbDDQYM5nzbWXk07NL6w1/1OQA+EWPMg8=; b=AUO2zY0VSP11rlGoK3tim+JUUfvRqvgyO2I9Un1dbhAqPjBjnxpElcgso/fszWr6Yp Qm1oOlhA725IdZHQyd2u3adVn/H6HtyWrBkC3bmtdB7ncwMn9mvVtT+E56dj5GZHHlNQ 3Syn+QQytxppFiu3YnjUbZ7xrNQ8i4msGijQm7qTqFkVmS07KFvS4iJR8j9dS/uLzdDx nweUj8FKC9o2KZH1f49hqLRYoCJ/wLVm5/aI3p5PX9KhxLj6IvmMXTUzecHx3CimLhHl FcPa8Ei1KLv+yjKnkC9umDHiem9ybI17ryI5+S7vA0YyyJQm/zjawHIQonvTl86oowzW KAyw== X-Gm-Message-State: AO0yUKWf1e0+B5kN8nJnVXOE3MVKvmh94g9ESJFfzy6jTXb7mY/SN7Kd Hu63060TeU257zdHMFZ5BHIBxw== X-Google-Smtp-Source: AK7set/Qd4HDhScV/cAqQc40IxLxdfj+3VKivhDDyO26idcEiW0ZL1J8fwMqWWltLXYdW+zkJvDaYw== X-Received: by 2002:a05:600c:907:b0:3dc:573c:6601 with SMTP id m7-20020a05600c090700b003dc573c6601mr9639524wmp.36.1677167845123; Thu, 23 Feb 2023 07:57:25 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 07/13] tests: don't run benchmarks for the tsan build Date: Thu, 23 Feb 2023 15:57:14 +0000 Message-Id: <20230223155720.310593-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677167985821100003 All we are really doing here is checking that TSAN builds compile and are therefor a tool available to developers. The benchmarks are not representative of QEMU's actual threading behaviour and they burn precious CI time. Indeed switching to check-unit reveals many unaddressed issues which have been logged at: https://gitlab.com/qemu-project/qemu/-/issues/1496 So for now disable the make check and make this a build only test. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-9-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 8f332fc36f..e9a67e0191 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -465,7 +465,6 @@ tsan-build: CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 --enable-trace-backends=3Dust --enable-fdt=3Dsystem --disable-sl= irp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user - MAKE_CHECK_ARGS: bench V=3D1 =20 # gcov is a GCC features gcov: --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677167998; cv=none; d=zohomail.com; s=zohoarc; b=WNwBWFBtiumn5ROd8iOmELfg8q4LgRoSYCrWB5MSF7jIKTWh5qXRSeQb68li6e85VjoOeMXDPR4rzdIRicP68h71gXW/YI562PuzIzRwiJORzjwpYqsjQfx1G8y0su+98oxzN2TB7Qi3+ctBAkcl7FT9pkMz9JuZBLb/nwI5LPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677167998; 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=/dY/mkOpNaD9Lhy7FtSJoogDXQumSFzgCf70QV8dCOQ=; b=dgV3ZShDWycwHFWOZvVX6tLiPpVfl1E8IrjkPLjtpDAM2kpR9/UPNAYbGJ8sow/tmuO5So3ZrKMYENI0ow7OiN8wE1YXZdojI1HkCPaHE9fajS0d2OD5M2ZIUg3rgwKbk/+dZMwUKu8fh044iWhkNKO0gZWjIZtnwPAnWUZIpvc= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677167998032971.6543225089382; Thu, 23 Feb 2023 07:59:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyN-0000J7-QQ; Thu, 23 Feb 2023 10:57:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyL-0008UJ-52 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyH-0004dY-8o for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:28 -0500 Received: by mail-wr1-x431.google.com with SMTP id i11so4889395wrp.5 for ; Thu, 23 Feb 2023 07:57:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r26-20020a05600c2f1a00b003eae73ee4a1sm307828wmn.17.2023.02.23.07.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 795391FFBE; Thu, 23 Feb 2023 15:57:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/dY/mkOpNaD9Lhy7FtSJoogDXQumSFzgCf70QV8dCOQ=; b=RSoLr63Amd8RjI1deqJMJSDpGSjJc9439dKyoM0zPnyAjp3nE3tueVZS1aoDsZ1FIc BPv8QftrNO8XD9S2cuE+gfk8/tvS0AoyG43kr1ueTNJ/w9N7Yqbc7Qi58UwWp7dVGDh7 yLwT9clayhda3Kke6osu8ubODd2KvV7NjKPNcFm4k1+yAlWB4O+ft/L+GjtVlgOZRVDF BUmR1eesTtqq5OeZ1xVnoIN/vmksCORgAYtY077vJK+PndY+MB+FniAaDcN8lEBiPZ2i NqgDv2bEE98MRsREFrRjhfoaP0cZV2J9aMBCzWXwnCxyWhU69fWzLe/tXpzw2nutTR6E h2IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/dY/mkOpNaD9Lhy7FtSJoogDXQumSFzgCf70QV8dCOQ=; b=c27ARmq+lIFYKeaR26L6aC37Y0DfZZkjMX207Uc62w6mGFJXXX4fWc/7dQlOmrPv7f eytnOhcRtbAfjXsu3BnlWhK68JOa7DqxywJw8l+DU6um4xZoTyGUzV+TY59yhKc7Sz1/ CH9U4y2eu3+1eNdZm2FCAG5wVe7m1wSNUF6eNBjcuUBBPUdMtLoARkhiTHfTGS/Slx8y WpPIZUh93cxSpvg08db/FLYNOiO522MZN4YAXLf62h8DxVlIj2t4zZ4zUghXwOyBT5nI vFWRMV3xEJLUTftctXZAwG64foiM0MzFvGhsJEC3eipnfOfpz34rbBiK71szC52PXUOs 9V3A== X-Gm-Message-State: AO0yUKX0Iqt5Mqxpx7c1Zp4y4Fkkfhmr2eAQgk0DXbt+XXVSHvZoA9Y8 6d9ETlKL1PIcR6U8odhVIuAphw== X-Google-Smtp-Source: AK7set/emUlJDzRGCNR5v49XZpsnbSO7Jm3qXvPcLmUB8UcM+osZYE3btvjjyfRSbAge1GgzAUHZtw== X-Received: by 2002:adf:f7d1:0:b0:2c7:bd6:68fd with SMTP id a17-20020adff7d1000000b002c70bd668fdmr5144383wrq.47.1677167844420; Thu, 23 Feb 2023 07:57:24 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Snow , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 08/13] testing: update ubuntu2004 to ubuntu2204 Date: Thu, 23 Feb 2023 15:57:15 +0000 Message-Id: <20230223155720.310593-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677167999932100003 The 22.04 LTS release has been out for almost a year now so its time to update all the remaining images to the current LTS. We can also drop some hacks we need for older clang TSAN support. We will keep the ubuntu2004 container around for those who wish to test builds on the currently still supported baseline. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: John Snow Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-10-alex.bennee@linaro.org> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index e10c47b5a7..309a575abe 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -574,13 +574,13 @@ https://github.com/google/sanitizers/wiki/ThreadSanit= izerCppManual =20 Thread Sanitizer in Docker ~~~~~~~~~~~~~~~~~~~~~~~~~~ -TSan is currently supported in the ubuntu2004 docker. +TSan is currently supported in the ubuntu2204 docker. =20 The test-tsan test will build using TSan and then run make check. =20 .. code:: =20 - make docker-test-tsan@ubuntu2004 + make docker-test-tsan@ubuntu2204 =20 TSan warnings under docker are placed in files located at build/tsan/. =20 diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index e9a67e0191..1686558d80 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -38,9 +38,9 @@ avocado-system-alpine: build-system-ubuntu: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-capstone TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu @@ -56,7 +56,7 @@ check-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 MAKE_CHECK_ARGS: check =20 avocado-system-ubuntu: @@ -65,7 +65,7 @@ avocado-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 MAKE_CHECK_ARGS: check-avocado =20 build-system-debian: @@ -459,10 +459,10 @@ avocado-cfi-x86_64: tsan-build: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 + IMAGE: ubuntu2204 + CONFIGURE_ARGS: --enable-tsan --cc=3Dclang --cxx=3Dclang++ --enable-trace-backends=3Dust --enable-fdt=3Dsystem --disable-sl= irp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user =20 @@ -470,10 +470,10 @@ tsan-build: gcov: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container timeout: 80m variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu MAKE_CHECK_ARGS: check @@ -538,9 +538,9 @@ build-tci: build-coroutine-sigaltstack: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack --disable-tcg --enable-trace-backends=3Dftrace MAKE_CHECK_ARGS: check-unit diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 96d2a3b58b..8637a13d86 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -13,10 +13,10 @@ amd64-debian-container: variables: NAME: debian-amd64 =20 -amd64-ubuntu2004-container: +amd64-ubuntu2204-container: extends: .container_job_template variables: - NAME: ubuntu2004 + NAME: ubuntu2204 =20 amd64-opensuse-leap-container: extends: .container_job_template diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index f34d88d33d..75233064de 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -146,6 +146,3 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -# Apply patch https://reviews.llvm.org/D75820 -# This is required for TSan in clang-10 to compile with QEMU. -RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/inc= lude/sanitizer/tsan_interface.h diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dock= erfiles/ubuntu2204.docker new file mode 100644 index 0000000000..30b9e56793 --- /dev/null +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -0,0 +1,147 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all ubuntu-2204 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/ubuntu:22.04 + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbpf-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcmocka-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg-turbo8-dev \ + libjson-c-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libsndio-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + meson \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + socat \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + xfslibs-dev \ + zlib1g-dev && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff --git a/tests/docker/test-tsan b/tests/docker/test-tsan index 53d90d2f79..f6d6590e39 100755 --- a/tests/docker/test-tsan +++ b/tests/docker/test-tsan @@ -21,7 +21,7 @@ setup_tsan() tsan_log_dir=3D"/tmp/qemu-test/build/tsan" mkdir -p $tsan_log_dir > /dev/null || true EXTRA_CONFIGURE_OPTS=3D"${EXTRA_CONFIGURE_OPTS} --enable-tsan \ - --cc=3Dclang-10 --cxx=3Dclang++-10 \ + --cc=3Dclang --cxx=3Dclang++ \ --disable-werror --extra-cflags=3D-O0" # detect deadlocks is false currently simply because # TSan crashes immediately with deadlock detector enabled. diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index a5ea0efc3b..cc9e34ac87 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -69,13 +69,6 @@ def generate_cirrus(target, trailer=3DNone): generate(filename, cmd, trailer) =20 =20 -ubuntu2004_tsanhack =3D [ - "# Apply patch https://reviews.llvm.org/D75820\n", - "# This is required for TSan in clang-10 to compile with QEMU.\n", - "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.= 0/include/sanitizer/tsan_interface.h\n" -] - - # Netmap still needs to be manually built as it is yet to be packaged # into a distro. We also add cscope and gtags which are used in the CI # test @@ -113,8 +106,8 @@ try: trailer=3D"".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") - generate_dockerfile("ubuntu2004", "ubuntu-2004", - trailer=3D"".join(ubuntu2004_tsanhack)) + generate_dockerfile("ubuntu2004", "ubuntu-2004") + generate_dockerfile("ubuntu2204", "ubuntu-2204") =20 # # Cross compiling builds --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677168021; cv=none; d=zohomail.com; s=zohoarc; b=TSePfhWIvnxctNCA/3UHpjjMwH76kxzvgr04sINhINXh9eYOrCmzWMgj3WA5UI61QDB4lZtBOwraUynSemspC20tH8FmOX1n3zTOMF2YzCMFEXJn+ymMgiFJC/XhhunKhXFgyf1oy2wyIVWFZ3OldDHJfruDfDaRNsWO38k3UM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677168021; 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=yvuUayscMkC2c3KbAMvmXRQxmgZ4kcV89BQYaBiAfTM=; b=V+glvyWkBfsPw+bUd3odlsb/j7uIAr6tGLEveZooDl8IYhCkiEVR7dE7pdjXNzgxulUWQcitNuldgbqpnplqg+hzhwretdAve5Ryq3FX6jLTPG08OW7EmNfye7lEPwu04AOkHyi1y4ncrzQ6FxePYQxzuUUtwfJMoV/IG4S7uqI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677168021168735.3284026995618; Thu, 23 Feb 2023 08:00:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyU-0000kn-Mz; Thu, 23 Feb 2023 10:57:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyM-00009Z-22 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:30 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyJ-0004jg-4q for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: by mail-wm1-x335.google.com with SMTP id p3-20020a05600c358300b003e206711347so8604943wmq.0 for ; Thu, 23 Feb 2023 07:57:26 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k18-20020a05600c409200b003db06224953sm12888900wmh.41.2023.02.23.07.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 94B241FFBF; Thu, 23 Feb 2023 15:57:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yvuUayscMkC2c3KbAMvmXRQxmgZ4kcV89BQYaBiAfTM=; b=ML6CEDPukqzgBuNPO9yvj1A+t4TxArAHh+B/2uyQcRFPtbgmlf11C8EmSNcEJ9xOXY fFYfVVvnrtmda+cciKcMsjqHJ7DjxozywbA3syuWtlEq5Gz2eCZ23HR8YBvtePVgg0BJ b/DRY2DOl++pAKbulQvzGov4GB7hApRgQWP8t9uHrsXxfII4eGQBD7omPrGusxWRE5s9 oxFvuIrbyOMhegRlsfll2uATtkpxaJOVuZkUSO1Jj5SC/lQtXlesmP8jgbndUNiTKm9V CG58fw8V5Ab13axna6qQKb2mC/CZ8ic1cI6mwoxg9H1uHe/DyKWU+fQNb2fX5cQGgCxM vOZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yvuUayscMkC2c3KbAMvmXRQxmgZ4kcV89BQYaBiAfTM=; b=0AWa7uTvZ/L+wf1NULxq16PWfyTV6GtnGVDp1teA/wQ8AeyXsdaOhvibHZIXL/mfZo j2wts+Ez9xHRhpAGDfH/iDmlZa4lhTc1mFeyZ4xte91vLB0gzK1A/9g6ISfVgZ4W/fFc U86V5QgzEKG0omIyFgHguxQGNVLi9cRnYKleJ1Reg4EBBFNjQCH9tZGq0f8sjFKmzP9n UGC3DofK7pjdA41IvYnG/+VNIdNeJKUi381kCkpG/vSyXiXkXzcHYeiATPZ8i3RPLVdR YYKzj4F49j5osDZa/mjMtBl4pDc8uG30bVNjiylFnFWBHtgTQUDnMgWLjkpqUGhDPKgO 9ObQ== X-Gm-Message-State: AO0yUKXEuQ08BppVgfsnlDaX0l2EqGNqmw3nmgJSrqPfYHJVPPM/Rd58 aEeEg6+bbLxw5ZsC5PtpcknNrQ== X-Google-Smtp-Source: AK7set9HpsFjAFyCBd9gmXXyAnOWAwuqKfBd7hPvEzJwKN5GO79zdH1Vv4/wHJpXMqeyBt6a/pkRug== X-Received: by 2002:a05:600c:5253:b0:3dd:1a8b:7374 with SMTP id fc19-20020a05600c525300b003dd1a8b7374mr9036073wmb.5.1677167845386; Thu, 23 Feb 2023 07:57:25 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pavel Dovgalyuk , Paolo Bonzini , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 09/13] tests: skip the nios2 replay_kernel test Date: Thu, 23 Feb 2023 15:57:16 +0000 Message-Id: <20230223155720.310593-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677168022472100003 It is buggy and keeps failing. Suggested-by: Peter Maydell Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230221094558.2864616-11-alex.bennee@linaro.org> diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index 00a26e4a0c..f13456e1ec 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -349,6 +349,7 @@ def test_or1k_sim(self): file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'vmlinux') =20 + @skip("nios2 emulation is buggy under record/replay") def test_nios2_10m50(self): """ :avocado: tags=3Darch:nios2 --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677167992; cv=none; d=zohomail.com; s=zohoarc; b=L8pGcfNauF/0Qf+rSWsuGoKXiCt9qF9/HQGVqDSduJZl5AZdQAP2H/Yp4x2miIYEJf+zQI//3D50vO+mNUvf5yVg0GqeBGWsgbrV+NGxMHBhG+XZrha0Jdop2xsgah0oE1cJP8RnhJodA/R7eyF1DqXbggNVg4UNEL083q3cixQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677167992; 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=rj/Cc/CvRFiRB2ALtgdKEmBbCtr9jBbT1P796n6M+Ak=; b=NHGUCVYZjCeCoW02hJS1uZB8Ucb+rLIfiAy1+bHC/zruKptbccr/ekSFOURcJyRvmqFsiyUrdghHWn/P73pUp8j1n2KPmzTsVSs6vW5oK/ODPn/gV/xPZKgs7bFqY9OTqHcPQ6i5K2WZyAb0zWtFlht5gUSfBx039KQZViKhr8I= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677167992682271.6276089549709; Thu, 23 Feb 2023 07:59:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyU-0000kz-No; Thu, 23 Feb 2023 10:57:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyN-0000Ja-NN for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:31 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyK-0004kf-03 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:31 -0500 Received: by mail-wm1-x32b.google.com with SMTP id p23-20020a05600c1d9700b003ead4835046so414765wms.0 for ; Thu, 23 Feb 2023 07:57:27 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p8-20020a05600c468800b003e2232d0960sm13563446wmo.23.2023.02.23.07.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BAAFB1FFC0; Thu, 23 Feb 2023 15:57:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rj/Cc/CvRFiRB2ALtgdKEmBbCtr9jBbT1P796n6M+Ak=; b=zf8jPnWp+RQYBTrhYOeUCBX79HdlvIeFapZKTcrJmjU3T9ZbQ7Iq/ij3VfdfFiNadq ZAhx3GetA99KcTF2pKYFlVmx1+BV6zzmtnTjhtT+oC2iun2zPsfTcQYiFOEzFDJ/DsaD 6qjPRSWCmx0/v+yUELmGc3vOFUVnEnEQfsg1GqXQr/pdqORbRWc11J/US9Uqikl80NJZ QbY1XVxWAj5X/6lTuCuBEEzDO3Y3YLekVhAKKu/eGRZMH8+0Hm8jkwgya81a5sqfoOV2 pPi+JptQfpgnbuze0fAyFXBaRXO+R1QYPwkklC6pkpa+U3Uu67xbLor5cksydXrFbOpf ISmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rj/Cc/CvRFiRB2ALtgdKEmBbCtr9jBbT1P796n6M+Ak=; b=fd6QWh/d6DIbUkNoDEOwXBFkQBG+Z/dC36AAG/YamqiEpgC5kFV1GJejtASPFMSvA8 WVbP6EhiMCKKFn/iH5GmLj80QrEUqy3Cw1cHDbcYvS/yuuvFDICxV287RFYagApNdlDG aOUNIiLVil9ECeT9X2Rdn9T9xiISaxg1i60J7kG7IH7l6KiJYEQS0LlfaVAINfoAtu73 lPSdk2jLdw5mXaq9ikCEYwZqXldf0ceX0N7XZBVrxF9WIB5R3hvsMQhnOMC8E2uj0Fd2 bKNO6ugjXE5IdEHUUo5TDPU9UmmXfff0XeWB+UHgdRnyoOVs/pWIb/wSVYUDinL52j/x p3+g== X-Gm-Message-State: AO0yUKUACy1OP9zN+nbA8ehNGFUzNcWOLus7NyHcObNZ1hlc8543MxuM iMPdPay1JZwzGYLQESyy3IqX9g== X-Google-Smtp-Source: AK7set+R/ZW4otVrD8+DkgbeF/aoipx6+ruwYnx0hQ/XkK0rOmTK99GblDOTHhB+E/ywhSHNd6PUsg== X-Received: by 2002:a05:600c:3d88:b0:3df:de27:4191 with SMTP id bi8-20020a05600c3d8800b003dfde274191mr9586870wmb.16.1677167846368; Thu, 23 Feb 2023 07:57:26 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anders Roxell , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa Subject: [PULL 10/13] tests: add tuxrun baseline test to avocado Date: Thu, 23 Feb 2023 15:57:17 +0000 Message-Id: <20230223155720.310593-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677167993874100003 The TuxRun project (www.tuxrun.org) uses QEMU to run tests on a wide variety of kernel configurations on wide range of our emulated platforms. They publish a known good set of images at: https://storage.tuxboot.com/ to help with bisecting regressions in either the kernel, firmware or QEMU itself. The tests are pretty lightweight as they contain just a kernel with a minimal rootfs which boots a lot faster than most of the distros. In time they might be persuaded to version their known good baselines and we can then enable proper checksums. For a couple of tests we currently skip: - mips64, a regression against previous stable release - sh4, very unstable with intermittent oops Total run time: 340s (default) -> 890s (debug) Overall coverage rate (tested targets + disabled tests): lines......: 16.1% (126894 of 789848 lines) functions..: 20.6% (15954 of 77489 functions) branches...: 9.3% (40727 of 439365 branches) Signed-off-by: Alex Benn=C3=A9e Cc: Anders Roxell Acked-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230221094558.2864616-12-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 9adb628627..71bdbbd04c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3757,6 +3757,7 @@ F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ +F: tests/avocado/tuxrun_baselines.py F: scripts/archive-source.sh F: docs/devel/testing.rst W: https://gitlab.com/qemu-project/qemu/pipelines diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_basel= ines.py new file mode 100644 index 0000000000..30aaefc1d3 --- /dev/null +++ b/tests/avocado/tuxrun_baselines.py @@ -0,0 +1,423 @@ +# Functional test that boots known good tuxboot images the same way +# that tuxrun (www.tuxrun.org) does. This tool is used by things like +# the LKFT project to run regression tests on kernels. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Author: +# Alex Benn=C3=A9e +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import time + +from avocado import skip, skipIf +from avocado_qemu import QemuSystemTest +from avocado_qemu import exec_command, exec_command_and_wait_for_pattern +from avocado_qemu import wait_for_console_pattern +from avocado.utils import process +from avocado.utils.path import find_command + +class TuxRunBaselineTest(QemuSystemTest): + """ + :avocado: tags=3Daccel:tcg + """ + + KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0' + # Tests are ~10-40s, allow for --debug/--enable-gcov overhead + timeout =3D 100 + + def get_tag(self, tagname, default=3DNone): + """ + Get the metadata tag or return the default. + """ + utag =3D self._get_unique_tag_val(tagname) + print(f"{tagname}/{default} -> {utag}") + if utag: + return utag + + return default + + def setUp(self): + super().setUp() + + # We need zstd for all the tuxrun tests + # See https://github.com/avocado-framework/avocado/issues/5609 + zstd =3D find_command('zstd', False) + if zstd is False: + self.cancel('Could not find "zstd", which is required to ' + 'decompress rootfs') + self.zstd =3D zstd + + # Process the TuxRun specific tags, most machines work with + # reasonable defaults but we sometimes need to tweak the + # config. To avoid open coding everything we store all these + # details in the metadata for each test. + + # The tuxboot tag matches the root directory + self.tuxboot =3D self.get_tag('tuxboot') + + # Most Linux's use ttyS0 for their serial port + self.console =3D self.get_tag('console', "ttyS0") + + # Does the machine shutdown QEMU nicely on "halt" + self.shutdown =3D self.get_tag('shutdown') + + # The name of the kernel Image file + self.image =3D self.get_tag('image', "Image") + + # The block device drive type + self.drive =3D self.get_tag('drive', "virtio-blk-device") + + self.root =3D self.get_tag('root', "vda") + + # Occasionally we need extra devices to hook things up + self.extradev =3D self.get_tag('extradev') + + def wait_for_console_pattern(self, success_message, vm=3DNone): + wait_for_console_pattern(self, success_message, + failure_message=3D'Kernel panic - not syn= cing', + vm=3Dvm) + + def fetch_tuxrun_assets(self, dt=3DNone): + """ + Fetch the TuxBoot assets. They are stored in a standard way so we + use the per-test tags to fetch details. + """ + base_url =3D f"https://storage.tuxboot.com/{self.tuxboot}/" + kernel_image =3D self.fetch_asset(base_url + self.image) + disk_image_zst =3D self.fetch_asset(base_url + "rootfs.ext4.zst") + + cmd =3D f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs= .ext4" + process.run(cmd) + + if dt: + dtb =3D self.fetch_asset(base_url + dt) + else: + dtb =3D None + + return (kernel_image, self.workdir + "/rootfs.ext4", dtb) + + def prepare_run(self, kernel, disk, dtb=3DNone, console_index=3D0): + """ + Setup to run and add the common parameters to the system + """ + self.vm.set_console(console_index=3Dconsole_index) + + # all block devices are raw ext4's + blockdev =3D "driver=3Draw,file.driver=3Dfile," \ + + f"file.filename=3D{disk},node-name=3Dhd0" + + kcmd_line =3D self.KERNEL_COMMON_COMMAND_LINE + kcmd_line +=3D f" root=3D/dev/{self.root}" + kcmd_line +=3D f" console=3D{self.console}" + + self.vm.add_args('-kernel', kernel, + '-append', kcmd_line, + '-blockdev', blockdev) + + # Sometimes we need extra devices attached + if self.extradev: + self.vm.add_args('-device', self.extradev) + + # Some machines already define a drive device + if self.drive !=3D "none": + self.vm.add_args('-device', + f"{self.drive},drive=3Dhd0") + + # Some machines need an explicit DTB + if dtb: + self.vm.add_args('-dtb', dtb) + + def run_tuxtest_tests(self, haltmsg): + """ + Wait for the system to boot up, wait for the login prompt and + then do a few things on the console. Trigger a shutdown and + wait to exit cleanly. + """ + self.wait_for_console_pattern("Welcome to TuxTest") + time.sleep(0.2) + exec_command(self, 'root') + time.sleep(0.2) + exec_command(self, 'cat /proc/interrupts') + time.sleep(0.1) + exec_command(self, 'cat /proc/self/maps') + time.sleep(0.1) + exec_command(self, 'uname -a') + time.sleep(0.1) + exec_command_and_wait_for_pattern(self, 'halt', haltmsg) + + # Wait for VM to shut down gracefully if it can + if self.shutdown =3D=3D "nowait": + self.vm.shutdown() + else: + self.vm.wait() + + def common_tuxrun(self, dt=3DNone, haltmsg=3D"reboot: System halted", + console_index=3D0): + """ + Common path for LKFT tests. Unless we need to do something + special with the command line we can process most things using + the tag metadata. + """ + (kernel, disk, dtb) =3D self.fetch_tuxrun_assets(dt) + + self.prepare_run(kernel, disk, dtb, console_index) + self.vm.launch() + self.run_tuxtest_tests(haltmsg) + + # + # The tests themselves. The configuration is derived from how + # tuxrun invokes qemu (with minor tweaks like using -blockdev + # consistently). The tuxrun equivalent is something like: + # + # tuxrun --device qemu-{ARCH} \ + # --kernel https://storage.tuxboot.com/{TUXBOOT}/{IMAGE} + # + + def test_arm64(self): + """ + :avocado: tags=3Darch:aarch64 + :avocado: tags=3Dcpu:cortex-a57 + :avocado: tags=3Dmachine:virt + :avocado: tags=3Dtuxboot:arm64 + :avocado: tags=3Dconsole:ttyAMA0 + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_arm64be(self): + """ + :avocado: tags=3Darch:aarch64 + :avocado: tags=3Dcpu:cortex-a57 + :avocado: tags=3Dendian:big + :avocado: tags=3Dmachine:virt + :avocado: tags=3Dtuxboot:arm64be + :avocado: tags=3Dconsole:ttyAMA0 + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_armv5(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dcpu:arm926 + :avocado: tags=3Dmachine:versatilepb + :avocado: tags=3Dtuxboot:armv5 + :avocado: tags=3Dimage:zImage + :avocado: tags=3Ddrive:virtio-blk-pci + :avocado: tags=3Dconsole:ttyAMA0 + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun(dt=3D"versatile-pb.dtb") + + def test_armv7(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dcpu:cortex-a15 + :avocado: tags=3Dmachine:virt + :avocado: tags=3Dtuxboot:armv7 + :avocado: tags=3Dimage:zImage + :avocado: tags=3Dconsole:ttyAMA0 + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_armv7be(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dcpu:cortex-a15 + :avocado: tags=3Dendian:big + :avocado: tags=3Dmachine:virt + :avocado: tags=3Dtuxboot:armv7be + :avocado: tags=3Dimage:zImage + :avocado: tags=3Dconsole:ttyAMA0 + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_i386(self): + """ + :avocado: tags=3Darch:i386 + :avocado: tags=3Dcpu:coreduo + :avocado: tags=3Dmachine:q35 + :avocado: tags=3Dtuxboot:i386 + :avocado: tags=3Dimage:bzImage + :avocado: tags=3Ddrive:virtio-blk-pci + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_mips32(self): + """ + :avocado: tags=3Darch:mips + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dcpu:mips32r6-generic + :avocado: tags=3Dendian:big + :avocado: tags=3Dtuxboot:mips32 + :avocado: tags=3Dimage:vmlinux + :avocado: tags=3Ddrive:driver=3Dide-hd,bus=3Dide.0,unit=3D0 + :avocado: tags=3Droot:sda + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_mips32el(self): + """ + :avocado: tags=3Darch:mipsel + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dcpu:mips32r6-generic + :avocado: tags=3Dtuxboot:mips32el + :avocado: tags=3Dimage:vmlinux + :avocado: tags=3Ddrive:driver=3Dide-hd,bus=3Dide.0,unit=3D0 + :avocado: tags=3Droot:sda + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + @skip("QEMU currently broken") # regression against stable QEMU + def test_mips64(self): + """ + :avocado: tags=3Darch:mips64 + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dtuxboot:mips64 + :avocado: tags=3Dendian:big + :avocado: tags=3Dimage:vmlinux + :avocado: tags=3Ddrive:driver=3Dide-hd,bus=3Dide.0,unit=3D0 + :avocado: tags=3Droot:sda + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_mips64el(self): + """ + :avocado: tags=3Darch:mips64el + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dtuxboot:mips64el + :avocado: tags=3Dimage:vmlinux + :avocado: tags=3Ddrive:driver=3Dide-hd,bus=3Dide.0,unit=3D0 + :avocado: tags=3Droot:sda + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_ppc32(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:ppce500 + :avocado: tags=3Dcpu:e500mc + :avocado: tags=3Dtuxboot:ppc32 + :avocado: tags=3Dimage:uImage + :avocado: tags=3Ddrive:virtio-blk-pci + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_ppc64(self): + """ + :avocado: tags=3Darch:ppc64 + :avocado: tags=3Dmachine:pseries + :avocado: tags=3Dcpu:POWER8 + :avocado: tags=3Dendian:big + :avocado: tags=3Dconsole:hvc0 + :avocado: tags=3Dtuxboot:ppc64 + :avocado: tags=3Dimage:vmlinux + :avocado: tags=3Dextradev:driver=3Dspapr-vscsi + :avocado: tags=3Ddrive:scsi-hd + :avocado: tags=3Droot:sda + """ + self.common_tuxrun() + + def test_ppc64le(self): + """ + :avocado: tags=3Darch:ppc64 + :avocado: tags=3Dmachine:pseries + :avocado: tags=3Dcpu:POWER8 + :avocado: tags=3Dconsole:hvc0 + :avocado: tags=3Dtuxboot:ppc64le + :avocado: tags=3Dimage:vmlinux + :avocado: tags=3Dextradev:driver=3Dspapr-vscsi + :avocado: tags=3Ddrive:scsi-hd + :avocado: tags=3Droot:sda + """ + self.common_tuxrun() + + def test_riscv32(self): + """ + :avocado: tags=3Darch:riscv32 + :avocado: tags=3Dmachine:virt + :avocado: tags=3Dtuxboot:riscv32 + """ + self.common_tuxrun() + + def test_riscv64(self): + """ + :avocado: tags=3Darch:riscv64 + :avocado: tags=3Dmachine:virt + :avocado: tags=3Dtuxboot:riscv64 + """ + self.common_tuxrun() + + def test_s390(self): + """ + :avocado: tags=3Darch:s390x + :avocado: tags=3Dendian:big + :avocado: tags=3Dtuxboot:s390 + :avocado: tags=3Dimage:bzImage + :avocado: tags=3Ddrive:virtio-blk-ccw + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun(haltmsg=3D"Requesting system halt") + + # Note: some segfaults caused by unaligned userspace access + @skipIf(os.getenv('GITLAB_CI'), 'Skipping unstable test on GitLab') + def test_sh4(self): + """ + :avocado: tags=3Darch:sh4 + :avocado: tags=3Dmachine:r2d + :avocado: tags=3Dcpu:sh7785 + :avocado: tags=3Dtuxboot:sh4 + :avocado: tags=3Dimage:zImage + :avocado: tags=3Droot:sda + :avocado: tags=3Ddrive:driver=3Dide-hd,bus=3Dide.0,unit=3D0 + :avocado: tags=3Dconsole:ttySC1 + """ + # The test is currently too unstable to do much in userspace + # so we skip common_tuxrun and do a minimal boot and shutdown. + (kernel, disk, dtb) =3D self.fetch_tuxrun_assets() + + # the console comes on the second serial port + self.prepare_run(kernel, disk, console_index=3D1) + self.vm.launch() + + self.wait_for_console_pattern("Welcome to TuxTest") + time.sleep(0.1) + exec_command(self, 'root') + time.sleep(0.1) + exec_command_and_wait_for_pattern(self, 'halt', + "reboot: System halted") + + def test_sparc64(self): + """ + :avocado: tags=3Darch:sparc64 + :avocado: tags=3Dtuxboot:sparc64 + :avocado: tags=3Dimage:vmlinux + :avocado: tags=3Droot:sda + :avocado: tags=3Ddrive:driver=3Dide-hd,bus=3Dide.0,unit=3D0 + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() + + def test_x86_64(self): + """ + :avocado: tags=3Darch:x86_64 + :avocado: tags=3Dmachine:q35 + :avocado: tags=3Dcpu:Nehalem + :avocado: tags=3Dtuxboot:x86_64 + :avocado: tags=3Dimage:bzImage + :avocado: tags=3Droot:sda + :avocado: tags=3Ddrive:driver=3Dide-hd,bus=3Dide.0,unit=3D0 + :avocado: tags=3Dshutdown:nowait + """ + self.common_tuxrun() --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677168450; cv=none; d=zohomail.com; s=zohoarc; b=J96WjMCWvgi6Poi/fv7YwwWwuvmlUcowRxx8yrqxWv7CgQZGdXID4pKFu+b7SqSzOuxI6NuSEu32TkktVS92Yvpvo4hgH/O0oqVjegTDXSw/fwAgaNlB+6A8ZN8XwCYIF3MviDTnJmpgxvVAfnrCmRtGEH2CLJaLqw/bQ9EKeio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677168450; 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=2CI8mPdmlSDFBM0Iuuk2sgvCkUlxxqmzVR2TxPIYk6c=; b=I3erbqA2l+DYw9dyhWJHmjB1xzpbt+TcIbfS8DuFHSv4cMy0CXRbOXfiHyILlh5SI6S26HOfQuOmO/s8U0XsW0MZj4tWU1GAAsahnVivzVbabgOQb3UVzSkO44BDy+VtdX725AsFOrM1FmKeYUXBAGTuqqRf42NLGEmxlZhwDR8= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677168450715935.9945554542616; Thu, 23 Feb 2023 08:07:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVE7a-0007P7-Nc; Thu, 23 Feb 2023 11:07:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVE7Y-0007Oa-Pw for qemu-devel@nongnu.org; Thu, 23 Feb 2023 11:07:00 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVE7W-0006z5-Nt for qemu-devel@nongnu.org; Thu, 23 Feb 2023 11:07:00 -0500 Received: by mail-wm1-x329.google.com with SMTP id l7-20020a05600c4f0700b003e79fa98ce1so6728640wmq.2 for ; Thu, 23 Feb 2023 08:06:58 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e9-20020a05600c218900b003dc434b39c7sm5280995wme.0.2023.02.23.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 08:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DB67F1FFC1; Thu, 23 Feb 2023 15:57:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2CI8mPdmlSDFBM0Iuuk2sgvCkUlxxqmzVR2TxPIYk6c=; b=Ekxdl68RwRsv80jubOBfgd/zmGaJPYFGQSygxDexs25G3F8gWEtWHDjohjZLUUFhVu kpuBnjspAxndw8xBGg/D89w8C0Ap9rgzeDN9NVXlI4UvU+sRUNGyDFOQlsMGkgrOh354 fsNm+hp/bVuHM14DNix66glACGsuitaKBmxw2gi6CZjaTUcr7K9JyVGpPh5bRxq9G114 2C1+CxfNqOwWO76l7sqkftF5IU1HhwEpo8mZs7b1UmQ3OPgQBnNpEpvQEJcqC7ECFl84 GpcGIGkihTrND40F0TzO2/iEAoBWDMjUF9qEc9aBCrOndcDbgLQzU9hq94pTb//C84WD QCSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2CI8mPdmlSDFBM0Iuuk2sgvCkUlxxqmzVR2TxPIYk6c=; b=w/YeVyVhj7OPJrxTRoagUohmSukTYkcve5ceowGrS1cvWBPto6Y55KnIuNgdBedAkS YV0hu+LJ9L/95odQw4X49sV7bsoLS/zu7W/L7RuGtHkT4dUpn8+YdzJSmCJb2uIrcvZS v6P3T6BcEzqVHRJIaa1PhiBAcOcCCqhNi/qUeqs5LpdIN00op5GYRV8X7x0b5DEuw6fW bft1WVFZ8Qow6+tW5oTXW+Gfl9AWXTG5nu1KO2VN6ALI5Hc3Wz9TjVxRAHJplz5wrJdx Y45klwhj5tnMvV/lXcqaCy+somxZ/+JBGxyelqFf1i8SR8/NPYOiHqzfFP5Z5SsUdqI0 U/gg== X-Gm-Message-State: AO0yUKWHagN2bLcz30SabhAOT23mCnEBfBnG0dlQlrIGTibmXgsJ8XoQ f7o4nOzPORiGyXYlNuWLQFp0mw== X-Google-Smtp-Source: AK7set8OOH81xE0d9WuzwXoJofjSOE9iC++uXbxXvT3OfLVUjMrDZhA2eiTaItQWOA/wsm9pMOlMFA== X-Received: by 2002:a05:600c:170a:b0:3e2:d81:3564 with SMTP id c10-20020a05600c170a00b003e20d813564mr7727000wmn.3.1677168416594; Thu, 23 Feb 2023 08:06:56 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Bastian Koppelmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 11/13] tests/docker: Use binaries for debian-tricore-cross Date: Thu, 23 Feb 2023 15:57:18 +0000 Message-Id: <20230223155720.310593-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677168452911100003 From: Bastian Koppelmann since binutils is pretty old, it fails our CI repeatedly during the compilation of tricore-binutils. We created a precompiled version using the debian docker image and download it instead of building it ourself. We also updated the package to include a newer version of binutils, gcc, and newlib. The default TriCore ISA version used by tricore-as changed from the old version, so we have to specify it now. If we don't 'test_fadd' fails with 'unknown opcode'. The new assembler also picks a new encoding in ld.h which fails the 'test_ld_h' test. We fix that by using the newest TriCore CPU for QEMU. The old assembler accepted an extra ')' in 'test_imask'. The new one does not, so lets remove it. Signed-off-by: Bastian Koppelmann Message-Id: <20230209145812.46730-1-kbastian@mail.uni-paderborn.de> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20230221094558.2864616-13-alex.bennee@linaro.org> diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index ec4f5bff52..3df2e0de82 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -174,7 +174,7 @@ test_ ## num: = \ TEST_CASE_E(num, res_lo, res_hi, \ LI(DREG_RS1, rs1); \ rstv; \ - insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2); \ + insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2; \ ) =20 =20 diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index 5ae58efa09..82e4576485 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -20,6 +20,7 @@ RUN apt update && \ bzip2 \ ca-certificates \ ccache \ + curl \ flex \ g++ \ gcc \ @@ -34,13 +35,8 @@ RUN apt update && \ python3-setuptools \ python3-wheel =20 -RUN git clone --single-branch \ - https://github.com/bkoppelmann/tricore-binutils.git \ - /usr/src/binutils && \ - cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=3D-w ./configure --prefix=3D/usr/local --disable-nls --target= =3Dtricore && \ - make && make install && \ - rm -rf /usr/src/binutils +RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download= /tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \ + | tar -xzC /usr/local/ =20 # This image can only build a very minimal QEMU as well as the tests ENV DEF_TARGET_LIST tricore-softmmu diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/= Makefile.softmmu-target index d2446af8b4..b3cd56fffc 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -1,7 +1,7 @@ TESTS_PATH =3D $(SRC_PATH)/tests/tcg/tricore =20 -LDFLAGS =3D -T$(TESTS_PATH)/link.ld -ASFLAGS =3D +LDFLAGS =3D -T$(TESTS_PATH)/link.ld --mcpu=3Dtc162 +ASFLAGS =3D -mtc162 =20 TESTS +=3D test_abs.tst TESTS +=3D test_bmerge.tst @@ -19,7 +19,7 @@ TESTS +=3D test_madd.tst TESTS +=3D test_msub.tst TESTS +=3D test_muls.tst =20 -QEMU_OPTS +=3D -M tricore_testboard -nographic -kernel +QEMU_OPTS +=3D -M tricore_testboard -cpu tc27x -nographic -kernel =20 %.pS: $(TESTS_PATH)/%.S $(HOST_CC) -E -o $@ $< --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677168021; cv=none; d=zohomail.com; s=zohoarc; b=SqGkAUurUWGdh2n7DmOB8A0IP6L3ddtHrr27klBje4CVwVrjdsWhjpEw2F2+8qWaOu/oQiS9KwaiM3VEuAXrF3s8SCpujasJIm8AbR6a8kuUWEOR1Pxkc6rgYbodP24q6XoRT2lqLbyKPHbIx23fA+CEPvM9Gq+SDcfI7YUB868= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677168021; 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=N0gT91TwddcekKpXGf8wUv0YctxEtYUGFWLQ38Ww0OA=; b=JBrxABashASc58XpCpnuQ9dO30rinSQltbb9+qHIAsRaGek/MhK1Yyrl/UQD9L7JSnYODxW3SL/qNHnpzhdQMzojtt+VKMG0KfRfCveRPghHzo+Pq2L/Qdp5BXYlI1froEp0CvoduZsie3kAFst+z0Tcmc3lcy3G7CVRp9t2PzM= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677168021206721.490433365618; Thu, 23 Feb 2023 08:00:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyU-0000gR-0B; Thu, 23 Feb 2023 10:57:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyM-0000DH-IA for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:30 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyJ-0004kX-Qx for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:30 -0500 Received: by mail-wm1-x32c.google.com with SMTP id o4-20020a05600c4fc400b003e1f5f2a29cso11048256wmq.4 for ; Thu, 23 Feb 2023 07:57:27 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r26-20020a05600c2f1a00b003eae73ee4a1sm307879wmn.17.2023.02.23.07.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 044421FFC2; Thu, 23 Feb 2023 15:57:22 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N0gT91TwddcekKpXGf8wUv0YctxEtYUGFWLQ38Ww0OA=; b=tWcmn04Ni5qFG25NrV+kVowGr37vhOaHoghCfuPNm3Pj8mhb4Pvr1Kc+QKih1b0EtX e65tKaMEglDV6Ua00DIgfe7f9Yxyyka72RFAF98k3BpDOFCQLl14um8fK/NebTlYj/5c TZkU7ChKC8icSmqo5VGWsvcvvANFg2NG9wACt59Gy+nIRV3+8P8jB6l1hRWlyFI7biQl woXJYshDIxl/U29iXSdRyCbM5qXxox0cXGmNj6AZGqRpCN68pQfPT7KVLvklRbu/+8uC HM19sCC4gm/pKNJ4OXFwqbgXaNURVh7tWxQAt+LrZ481eTLccC1ptwXJMzjY48ckQiXV FDIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N0gT91TwddcekKpXGf8wUv0YctxEtYUGFWLQ38Ww0OA=; b=azeLpSqK6lR7kNKhfMwTkF4qb2NvdzVrEfuODPg+ytw5sBbApkmVmcgie5kuxbwSQS UQ9Ebiu4RZMkDf+4nhwaOIqDIPbBks4fv2/c02rdFGKRfRLMY4tpXeqVZIdPqY+PjHOU QzzZtFZxN8j4poZx9I5NRurpZFRL+bGYj7b2X1dZe0lwakX96EXWE8dzC38T0T30zcHO WirZMtwSLML8dMJkGPi4l1//EgccKDGbxfvC2kmrWK1mwVMVqRRephSFrRaSFCnoNODs t0JeENS18eMFLjvpNIbDUylhDUwXHu/JRIX1+lQo74eK66uudRObT5d3Nb/iEOtTXrYY hG9w== X-Gm-Message-State: AO0yUKVQp3nK9UmlQvDceoYMDyd11eQx9W0A2vM4wWGkiyor0XGGlZew pjLMGGbXpiE6WIOMpqqvfvE9SA== X-Google-Smtp-Source: AK7set/A1zbHglEJdotSya1unAvXqW7OPaS5mnq7u+uUhL2UjuWZwJrlhGcK5wz22QzQ/m/daJ4DGw== X-Received: by 2002:a05:600c:2e93:b0:3e1:f8af:8ef1 with SMTP id p19-20020a05600c2e9300b003e1f8af8ef1mr8569068wmn.22.1677167846073; Thu, 23 Feb 2023 07:57:26 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 12/13] tests: ensure we export job results for some cross builds Date: Thu, 23 Feb 2023 15:57:19 +0000 Message-Id: <20230223155720.310593-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677168022205100001 We do run tests on some cross builds. Provide a template to ensure we export the testlog to the build artefacts and report the test results via the junit. Signed-off-by: Alex Benn=C3=A9e Reported-by: Peter Maydell Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-14-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index 6d709628f1..24a41a7b21 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -48,3 +48,14 @@ nios2-linux-user or1k-linux-user ppc-linux-user sparc-linux-user xtensa-linux-user $CROSS_SKIP_TARGETS" - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS + +# We can still run some tests on some of our cross build jobs. They can ad= d this +# template to their extends to save the build logs and test results +.cross_test_artifacts: + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + expire_in: 7 days + paths: + - build/meson-logs/testlog.txt + reports: + junit: build/meson-logs/testlog.junit.xml diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 74d6259b90..bbc013725c 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -44,7 +44,9 @@ cross-arm64-user: IMAGE: debian-arm64-cross =20 cross-i386-system: - extends: .cross_system_build_job + extends: + - .cross_system_build_job + - .cross_test_artifacts needs: job: i386-fedora-cross-container variables: @@ -52,7 +54,9 @@ cross-i386-system: MAKE_CHECK_ARGS: check-qtest =20 cross-i386-user: - extends: .cross_user_build_job + extends: + - .cross_user_build_job + - .cross_test_artifacts needs: job: i386-fedora-cross-container variables: @@ -60,7 +64,9 @@ cross-i386-user: MAKE_CHECK_ARGS: check =20 cross-i386-tci: - extends: .cross_accel_build_job + extends: + - .cross_accel_build_job + - .cross_test_artifacts timeout: 60m needs: job: i386-fedora-cross-container --=20 2.39.1 From nobody Fri Nov 1 00:32:35 2024 Delivered-To: importer@patchew.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677168070; cv=none; d=zohomail.com; s=zohoarc; b=DJE0F76qzzZIpC+lJCQ8rZpFSOsThH/K9UyhtSX0FahxA3/6+owDwAc5XhSIqQCOIX9POQ6J9Vpe6c3zG+1N+hCOwP0j1dL3DyRlw1GDtPd01Wt89poFJ7bdsRLTPPDRZNzLW47MWXPAQqFxMV25V3Jztjg1AvyIUBAPtufDWJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677168070; 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=5fsqVCJzyU8Zu1hd7YxbL1fFqIKEFqPvKFe+eNwWlZU=; b=eUt4Jy1u0vS/aHcXAno7bek0+ZZNCM+MP9gUf+Z+QPskw+5sPpFbV2+/Dxj6Fae/XCOTayc2bWZnucVZCkh6tkcy69swVdT0PSjhBT/zLCyp1wnSyURxAjnOG2VMAYs9dUnimlVk+tdbtVIVrxlfXA97oxbXxBm/Z846pIMQxZI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677168070380468.7629503090043; Thu, 23 Feb 2023 08:01:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVDyV-0000o4-Nn; Thu, 23 Feb 2023 10:57:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVDyN-0000KH-Qy for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:31 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyK-0004ko-TG for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:31 -0500 Received: by mail-wm1-x333.google.com with SMTP id p26so9309847wmc.4 for ; Thu, 23 Feb 2023 07:57:28 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id q6-20020a05600c46c600b003dc47d458cdsm12930248wmo.15.2023.02.23.07.57.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F8521FFBA; Thu, 23 Feb 2023 15:57:22 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5fsqVCJzyU8Zu1hd7YxbL1fFqIKEFqPvKFe+eNwWlZU=; b=TuzNjlHTo4iHXdy8b6ZGBS/QLQ2jiJ5abHiIR+5u+4YqAWJ+d6fQkrcbRCraDA/g7a NIrJPgzq5PxElX1Rg7gl73vS6C7Vvj/JUrrhtDX55FxYbVLE6uP14MVUHvRHy4ruacA9 RAzdfbzT0T+23gLeqoJISqAFIJtNiwosKmTMH7yNaWS33fQBK34UymgQEAYXlOJd4S0a DIYkcbZ0T7m4P5yllyXzbxFfzL9ffoGRZhnXSy2O+LLsQ6c1N0IbTz/C9dzSemct/X78 foUaE+WnW51lWVXPr4z3OpuOctM2hQcxSRDntKRpVWGLpNkRCsxS9Paa85BsZqND2T56 oVmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5fsqVCJzyU8Zu1hd7YxbL1fFqIKEFqPvKFe+eNwWlZU=; b=rBQ8l4VBVfE8p1snG+pQMzaJZ0kaQLQZj31t/7w6zn5/KfkJNJH0enEJDqpbpoZ5Ki KevEjxNBT0CHPSUCmpPPbQtbafQrqRZM53YmRzcrI65dlObX7CY3XK9rIqckbEkbsuSs EGoNTE9AKSn48vsDT4a5Eo+ywU5IxdlOdLwMG0sKK/mH+//GvePaWBSJyQa4m1bjEtBF ARvgR6l49jm2GjJc9P9EYHrKrwftDKxQDGghfgRt/NI2EgkeiLsQ1DOXa0KfLaBDj9l+ SmO05FQLC8tnQf60O5ja2SMIGllGnADNYdrccXnUXBPCJXcWxMoe1ZQ3PqGPituYf6+r wt9w== X-Gm-Message-State: AO0yUKWPlKzT51MBhnM7ld1izTqDZEpZcqgyrfxJNRer+sodfjhrkIn0 I93nO6CSBZuOF2g/IsgZY5F+nBtMzZwt1U2Z X-Google-Smtp-Source: AK7set8UxMwn0NG3maORCvlavTUb1vWydXqGKjTXp2zXWZ+L7z0tqup066YEupOCETNLTQdubLzR2A== X-Received: by 2002:a05:600c:2cd8:b0:3ea:d610:f062 with SMTP id l24-20020a05600c2cd800b003ead610f062mr645127wmc.30.1677167847116; Thu, 23 Feb 2023 07:57:27 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo Subject: [PULL 13/13] cirrus.yml: Improve the windows_msys2_task Date: Thu, 23 Feb 2023 15:57:20 +0000 Message-Id: <20230223155720.310593-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677168072889100003 From: Thomas Huth There's no need to run a full-blown bash just to create a directory. And we can skip the "cd build" each time by doing it once at the beginning. Additionally, let's exclude some targets (that we already compile-test with MinGW in the gitlab jobs) from the build, since the build time of this task is very long already (between 80 and 90 minutes). Signed-off-by: Thomas Huth Message-Id: <20230208103046.618154-1-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230221094558.2864616-15-alex.bennee@linaro.org> diff --git a/.cirrus.yml b/.cirrus.yml index 4895987da4..5fb00da73d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -100,9 +100,11 @@ windows_msys2_task: tar xf C:\tools\archive\msys64.tar Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start= _time))" script: - - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --pyt= hon=3Dpython3" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" + - mkdir build + - cd build + - C:\tools\msys64\usr\bin\bash.exe -lc "../configure --python=3Dpython3 + --target-list-exclude=3Di386-softmmu,ppc64-softmmu,aarch64-softmmu= ,mips64-softmmu,mipsel-softmmu,sh4-softmmu" + - C:\tools\msys64\usr\bin\bash.exe -lc "make -j8" - exit $LastExitCode test_script: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=3D1 check" --=20 2.39.1