From patchwork Wed Mar 1 15:15:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657806 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3543876wrb; Wed, 1 Mar 2023 07:17:30 -0800 (PST) X-Google-Smtp-Source: AK7set+Z76ecNvL03mwbDFwSX1ekgdjDHYFQ0YERwrSnbO8Jt2wYgBSLGZivFjgZBJLimTXJxRLA X-Received: by 2002:a67:f601:0:b0:416:7e77:f243 with SMTP id k1-20020a67f601000000b004167e77f243mr3467485vso.16.1677683850333; Wed, 01 Mar 2023 07:17:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683850; cv=none; d=google.com; s=arc-20160816; b=Tkym26FukT8iWjtNVk3ZVdLG68uXElTmr9ydJMcgkMQOAQk9feHocoFSGINEaVH8jh sxns3MFCdtKw2mlGTy8Aeks2sDrnqKL4pmznN2JwlVuyWxIQWqHrX9LiIhC+kNHXbzcP nyi69lnzr/SfNSJJqlGiAO7t99dRhdNkLunnqbFuCGp7hpeHbmnOxhHavX+1Ey41Eg0k bc7Memv6+hGSVVP8XX6UN7iloX9qlkPW7yxJAxUmi3WT2hdMWmEjseC9B6wpLgqc//GS voiNPla1qThWK3zZY4nlQEPDfgvbIslBM+vy95uBfb/0hJhk7zquTDfBtwTeiUDJpnUD FFpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EqFhRBXrn6GPErRi8pyJLWIavaWOiOrxY9yomxuPC6M=; b=oGpnpPsdH79uBzivLZGnRVFE2+Uwrj66yQRCquOttLNinB+BplLZC1FabxQeUgxGl4 1unHJwIHSlO0A9qmmsPB3USpAiATv/UblG2+0iceE42IZnrCsyXp1fzWwItwwSM8SlcR t+yZUtNzVFzSaPYiaL3KfbQtfhlXVkhZ/gYtYGjIFbr8nd/rLKf4jagXtpLLcocpiGvM sf/rbWdKxfXOXbZOhA+5NpfTMXwKyW7IMnu7MQYw5+DHxgbyPFDHIs+JcnVWsOzC4K/M GiG2RYYco0vMVmxwnnGXFAqppcAPsWqPfkmW92TZFmX5a11wFkUNai5ICHM9F/V7BhQc KmxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sJKGHSql; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f25-20020ab074d9000000b0068a5b27c925si4214731uaq.157.2023.03.01.07.17.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sJKGHSql; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBo-0008GX-G9; Wed, 01 Mar 2023 10:16:20 -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 1pXOBh-00087m-M3 for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBb-0007bG-NM for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:13 -0500 Received: by mail-wr1-x42c.google.com with SMTP id bx12so10431848wrb.11 for ; Wed, 01 Mar 2023 07:16:07 -0800 (PST) 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=EqFhRBXrn6GPErRi8pyJLWIavaWOiOrxY9yomxuPC6M=; b=sJKGHSql7XJ01ANn5mmS9Rs7+id4qzzx7rCezAFN9doOmOyuKDc8uxIUYFEp2TLuiB w+OUWfWqcS2y4qKEiL0ZY0d5c+0jsMzDzHod8WXKRpDLAoDi14uLKZXHtmBU1A9i7VUc aT3+/cGo8EWOCiAGcKCujj3WIKh804Bfyb1wroKF8Oky5UfECTiR6Q3TPgxEURixBKXc 5fhCxKxxYSXGc6ossf37w2SJaTwTYBmWW+723dWj2Ol0vI+6hJV3k+KekQC5LY+ZIBe6 OQ/8MYR70JNkr63gfh7Hg8elNVnKqJgiraMk2DF7YkxSbGeQdl95tySqIkOTkNhlqgW4 2fuA== 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=EqFhRBXrn6GPErRi8pyJLWIavaWOiOrxY9yomxuPC6M=; b=dxIHHoYCB+55GRApIZJ7hdldhVzKefynZh2Tjbrpx9Yfm8n6CeKKYB0BHJEGsULxx5 WGkuYr2qKamEFlzFmJXYq6PyO1C8yZgASYcn9PwXwSSE3IMivDrBu6VqBhhSK+ne8i2f oCjlJj64qiL3636pbBfPwwzY77Xz9/I5g4WIDOXVcLt+Q5+Ua1M4kIpZQSfrhRLUO8x9 7T8/0ZU+LhW4PLO+xkilPsaVKam2SJyBYMf6d6SNjKw8NWqVv3lKnEqb2KXiigFNW8m9 YGXmsnfFBQxD1BRKJ9Rs+2901bW5BLCFbIe97dwNr38Imhw6+MKBQv62eF0udkqdcXYk tE6w== X-Gm-Message-State: AO0yUKX2ouhTZ23hV7tmaVxGG6rS/vw2F7NX0BEhi897DHgcZiSv90G2 hKh2LaKuH18TCJykV/Z8W4XLuQ== X-Received: by 2002:adf:f789:0:b0:2c7:1319:7b1d with SMTP id q9-20020adff789000000b002c713197b1dmr5167726wrp.39.1677683765652; Wed, 01 Mar 2023 07:16:05 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z5-20020a5d6545000000b002c5501a5803sm13049632wrv.65.2023.03.01.07.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9C6FD1FFB8; Wed, 1 Mar 2023 15:16:04 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E_Be?= =?utf-8?q?rrang=C3=A9?= Subject: [PULL v2 01/24] tests: don't run socat tests on MacOS as well Date: Wed, 1 Mar 2023 15:15:41 +0000 Message-Id: <20230301151604.1948813-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20230228190653.1602033-2-alex.bennee@linaro.org> diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-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 @@ static char *socat = NULL; -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(CONFIG_DARWIN) static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); @@ -128,7 +128,7 @@ int main(int argc, char **argv) socat = g_find_program_in_path("socat"); -#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", From patchwork Wed Mar 1 15:15:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657807 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3543996wrb; Wed, 1 Mar 2023 07:17:43 -0800 (PST) X-Google-Smtp-Source: AK7set9KnEPTNtCRBclk3D+T/DJZ9uGtFGj8yiDYq7tKEh/x5/0CGRsEyk7hahVgi80OKs5VMZtu X-Received: by 2002:ad4:4eae:0:b0:56e:abf3:91c0 with SMTP id ed14-20020ad44eae000000b0056eabf391c0mr13442139qvb.28.1677683862917; Wed, 01 Mar 2023 07:17:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683862; cv=none; d=google.com; s=arc-20160816; b=XREF6rNABg1y8QXOs5+mkVjE6jgJAVxF6RCgKqnoR4dOwlYK5bF4BM3l7jLqKXVwsQ N/mFKQ502OqbIPeqJqck1GAS6vEusFjAJaffsEZXpve50bIJm37yPMttc54leSeQCKKS 0NJanxsCcvIS7rbUshIhf8oNkV/npon0ImumtKNETRuIMmA73iLCZxplCKRP8GfB3Gvn WVSnIFOL6CbB22A5+8FlpoxgmhdGoqSGGqv9pIFCNabBv4d2LIpcHYmLkUzixJ7FAhYA FFzB549iii+ZaBZ79a1b/lfRvEGlXZeTlbCAdFNHqUatrfASp0Kda2Aogtqlj0JFedxP r5Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=t4xDiMJVHqz0QHdQQ6qJENg6O56hGBA8aqrpHDTdGMQ=; b=zgKBjx1QuvdLAw3JZ257pbc6lW1Tmw/gdnIdB1R3XPyPqo+n7sK1g90aJJFJyBdf5E N3BwGSa0EG+PGr0WIVWVnyQjwZmpES3w7M8MGps+PUIqySnnmUFC5+bEtWqcG8ZtC3D5 SymmSe/u91s/Tg70+oIzyPpHV35deaxNF1hWll9Og29QXfLoELmXV5hjMp8PnSXqHfSf 35IbBPtVR2NrXrKZv7OFr1Z4vSAgFWU3BUQgisLPUtpy+ot5oae2oiDM/jagO0C7ZJAo OBERiFxWF+nesQkMLSRZx9ksr6tWoma7uxshqOuedlKOtUYqtbrW4ae669pEkourJfFo b/SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b8EKcGC2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w12-20020a05620a444c00b006ff045dc7e6si12306899qkp.29.2023.03.01.07.17.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b8EKcGC2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBo-0008GJ-Cs; Wed, 01 Mar 2023 10:16:20 -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 1pXOBi-00087s-0w for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBd-0007bj-DO for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:13 -0500 Received: by mail-wr1-x436.google.com with SMTP id r18so13612431wrx.1 for ; Wed, 01 Mar 2023 07:16:09 -0800 (PST) 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=t4xDiMJVHqz0QHdQQ6qJENg6O56hGBA8aqrpHDTdGMQ=; b=b8EKcGC2la29AAB/q/tdBdMKaGmJyHalQyLN+0Y5qIpj4U8ambOcQbFdH8yueQBaDW cjqruR5LIxO+iKOCZ0H8A5i8nhrmuTz+7CmohFC8GF94w9z+EmB+2ucCydX/DTPx5Rfk ykh3VfWzFzkknBfFccbQbVijK0pb9fxuKDap651lawWK6puDJcQtjj9hiz3YAR3Ocps3 oArVfD1uQrlsVaQ6ZM1kmrwt/oabqIaTExwZ6nxFjX5pYTs1BFHckW9RWP4Nogskh5+Q T4ksfhJJq5YzxiUDCT+1kIBDpNu5SYQLd20l8MtC4pBjSk+Oyu3ziQ1kZfxLMrgcDtyE pKkA== 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=t4xDiMJVHqz0QHdQQ6qJENg6O56hGBA8aqrpHDTdGMQ=; b=yP5idsEtIOkg1uuxnA9qyHRQgES81HBgLKPtnxj78Q6BvhsHVcjVR6937BzTEG9d4I iqthxc7UElK4LuOtdAOVfxjAdbuTXh1zPM6znUUdeQzimo90Rno5cSPeD83pU3kbdhnj k+/SRpk9m0Ub03OmPYfHrG9/yziUgEyV+2afv5GFly6QSv1/Ia007Fcfk56Oi90bnLI3 illFtREti62v8DR6s03c6GEOi6LVUK/x3/t9KKV21dpp4ZZg05D5qo+A1LcT50b5/f8d jTEhqycirIsva7ojzfW1jPq2t4TPNtiGOYRKKQ5sgmzqQ/RBqIPhOMdKkvedp6ITNpnM C4sg== X-Gm-Message-State: AO0yUKU4Ti02Wab1y240n6yE9Sdv3en2SXzYM7Uw3DrLfaPJ/cWNQ51V ZHKEG0VlIqPeBXC96KyZvWpPow== X-Received: by 2002:a05:6000:147:b0:2c7:b34:dece with SMTP id r7-20020a056000014700b002c70b34decemr5331704wrx.4.1677683767745; Wed, 01 Mar 2023 07:16:07 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u3-20020adfed43000000b002c55ec7f661sm13600516wro.5.2023.03.01.07.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DF9AF1FFBA; Wed, 1 Mar 2023 15:16:04 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Ed Maste , Li-Wen Hsu , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 02/24] tests: add socat dependency for tests Date: Wed, 1 Mar 2023 15:15:42 +0000 Message-Id: <20230301151604.1948813-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Cc: Marc-André Lureau Message-Id: <20230228190653.1602033-3-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-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='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-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 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-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 vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-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='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-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 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-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 vte3 zstd' PYPI_PKGS='' PYTHON='/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='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbredir vde vte3 zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 66c499c097..7589f6c6ed 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/dockerfiles/centos8.docker index 3c74be09a6..bab67ccd41 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -103,6 +103,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/docker/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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ systemtap-sdt-dev \ tar \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/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=noninteractive && \ 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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/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=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 41769fc94a..5b66b0e256 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/docker/dockerfiles/fedora-win64-cross.docker index 46d5d05763..b94fd63cca 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/dockerfiles/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/dockerfiles/opensuse-leap.docker index 5b8dbf2b83..9bf9b50dad 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -97,6 +97,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/dockerfiles/ubuntu2004.docker index 5b27b89f1c..936e4f9b2e 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -119,6 +119,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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 From patchwork Wed Mar 1 15:15:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657816 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544970wrb; Wed, 1 Mar 2023 07:19:26 -0800 (PST) X-Google-Smtp-Source: AK7set+X8XGXSyU/Sqj3ty+872Vhfo0DGMCs592KbbuicRpbp8sDgMmmFaqXO0uJTcp7ZFe7pS2u X-Received: by 2002:a05:6214:e6b:b0:570:bf45:d6f7 with SMTP id jz11-20020a0562140e6b00b00570bf45d6f7mr9962508qvb.45.1677683966549; Wed, 01 Mar 2023 07:19:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683966; cv=none; d=google.com; s=arc-20160816; b=yjgRECxS/jlAQbWD6xbDY7vZgd5v+/oGz9J9btuvya76mxPXK887cWh3V9cjvFhdlx UfcN7nvi2iDAZx3/lhRTvrd3oWvUvmx+IaP0lQ1h4eQopJR0cux9HbPJyh8dYo6PKz6h hEGK+1RJHL0UjxysMURqOxxBc9hS23kE8sJUCfwsjfom0hYPIc4EKSXFnL/NNC59SzRC uva0+otNtHwSnOUS/GDB2I5D+Lnw3UeSXd5UHoJH2f2hyDRkkM+2tep81IfF8+wPVj1M YDq3YwRwpNlRjEe/8KoJxfLiKhYypm42VRVXdG94DvHY0BjG2yjtzHEnOPr1gyW/HWeW /fvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gLoSAqw2g9SSYzDjVUbVFG04TNYZLvZZTMSrfeOd4FU=; b=i4w3a2n1CQGIFfqve4XZX3I1pODsmHhbHnAQfJjE1VaHyblX4WJHAL7XOfbvtsl2Cm fafXPrvkzF2aVpRegp1klK+Wm7cuIvO1WY6w+xc8u39ZttqqhZ7bIc8KOHyGIpGXhkLU GbBnXm+WHIcpc3G6UbKpTDKLiqxv5lum0WztxswypQADd4F3q4NsJ7731MWjaqjVZDxz /bhLNvZ8mskhYdeMz71kSbDORTz5eqWEAq2q+f6b9IyqGdBsvGuL3Sm412Q+N0Yv4C/+ MRGA5FbtzPXTcUKuxqhPYJugk7XMK8lPJFSzuEhnNsacIJh+NAwVlJUOZDm/C60wR2OP AKyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yrLjFlmT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y2-20020a0ce042000000b0056ee46b4f9bsi11538203qvk.480.2023.03.01.07.19.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:19:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yrLjFlmT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOCK-0000Iz-3F; Wed, 01 Mar 2023 10:16:52 -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 1pXOBh-00087p-OH for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -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 1pXOBb-0007bQ-V7 for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:13 -0500 Received: by mail-wr1-x435.google.com with SMTP id l25so13607689wrb.3 for ; Wed, 01 Mar 2023 07:16:07 -0800 (PST) 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=gLoSAqw2g9SSYzDjVUbVFG04TNYZLvZZTMSrfeOd4FU=; b=yrLjFlmT9gma5NA+2rSx0JYNqUrwRbL7Tly037x7+tF7sbg23KeJA6Yt3EdxFijx0g Txmhjh+1z60PMCnnVtHLN4+vJAwiT5isENsDjI9kJ4h8AI/Ly10LBzrsLu/Gikp+Rfdr TKGhKJlCH0pYD24JkdGSDW2vkihHwXJ5OVo0vhqcJabRiBRzhQ0FjNg31HpfqZHy4kT3 Vr6xTpJQEFkp5ueBQq8kTpVgnkvC0ixB3m8R0TdwMuHKNWfeZ0mhYl0rvNU5xNUjqo9/ ODIoqbWvBN3yBEVFTtXAW13dXk5XLCWyQNKD15YBuNPHh8XeOw5KDefA7O0qeQtnK8aJ 4wog== 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=gLoSAqw2g9SSYzDjVUbVFG04TNYZLvZZTMSrfeOd4FU=; b=I3O1puaT9opZI4BbMWiJlhUDI1rV/p7YHJ5xFOQVOrLBmOGtm/nbUOy3R4PuRPNNvm iCUjMXh4C8dgShx9vjxnqxiDxQ7CBEisRuvGvs729fAKYIXqi4tT9JuDTda9yYmP7sAe eBcigSVOs+7PSkSH75ziPjfWlhIJc0zMStxQC4nbOXiDuwFbMJIBsEX2RdX1IiOrni6v FHCOo7VspLKB40hlKZHv8cKIpWn2p2qLdQ/1g3z8+f8j7VIDJ9/KjutqUEoKyK8Tnm/A ZcP2td6tVqjO3Qb4WAJLU4aixIAum95AT2VUHGE93QjmEsVyQhxS+PidzsvRjDYlzTKq kElA== X-Gm-Message-State: AO0yUKXihE4NtYSPUIAqwbvD0Waf5mz4Ycg8JIrWX+VA9cyeBtWyribf BHjR5v7xq1ajEnXFhNBg7Bt/9Q== X-Received: by 2002:a5d:468e:0:b0:2c7:1b42:1cec with SMTP id u14-20020a5d468e000000b002c71b421cecmr5000464wrq.23.1677683766517; Wed, 01 Mar 2023 07:16:06 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k10-20020adfd84a000000b002c55551e6e9sm13082916wrl.108.2023.03.01.07.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 034AB1FFBB; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , =?utf-8?q?Daniel_P=2E_Ber?= =?utf-8?q?rang=C3=A9?= Subject: [PULL v2 03/24] tests: be a bit more strict cleaning up fifos Date: Wed, 1 Mar 2023 15:15:43 +0000 Message-Id: <20230301151604.1948813-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Suggested-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230228190653.1602033-4-alex.bennee@linaro.org> diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-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 = g_strsplit(dstargs, " ", -1); QIOChannel *src, *dst; QIOChannelTest *test; + int err; 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)); - g_rmdir(tmpdir); + err = g_unlink(fifo); + g_assert(err == 0); + err = g_rmdir(tmpdir); + g_assert(err == 0); } static void test_io_channel_command_fifo_async(void) From patchwork Wed Mar 1 15:15:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657802 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3543472wrb; Wed, 1 Mar 2023 07:16:56 -0800 (PST) X-Google-Smtp-Source: AK7set8ZTPO01XtjqlNeFdD7Zr62BN8q/YpCpasbxJsGiNVzwc8uoWE4wtad6PjJ1bZsbwd2sxJX X-Received: by 2002:a05:6214:301e:b0:56e:a658:84e4 with SMTP id ke30-20020a056214301e00b0056ea65884e4mr11906244qvb.36.1677683815989; Wed, 01 Mar 2023 07:16:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683815; cv=none; d=google.com; s=arc-20160816; b=Mo3m43E4qdZtWzhKioANu+B86FWPtRxGOcU5kuKhwW3vkUTB0FfUdO7fZZSZ5HrnEy kQ7/RKSzaHeHVyYT2ADuC9UwwKy+dDVNADVWfUePhiI1r8QNhu3vpFzYLVpQnmJlJUF7 SOXifT3IjkxmvY8a8Ve/ERcB7eYaFNb31nDRPJJKo32o/DwfFJ8FWnQ86Aw389jWz8To Te6zLVXftaxFxa2ry88GubZo/lbvPSxIPund9oABsGeoHjAahRE+pvtT7ZeEHEaKkNMl cYD+tnLTlkCc+uIVuA8CrqwfvQvNz4yxqdXohbjEvm0agLiOAMVZslOwWqkxL5opyQX9 yVkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jrpKaOFJWkJoO+xUUwZmjGHPgIS1O//HocxWyw4nUaQ=; b=p3pZcBGPua2h+tMS0fzxrizGcMndvhEdlz+lrVDGByrk+29yuqaLWhG4xk5+HQRoYa HNDQIBILFld0atGYercpTOrQGkla3QGiGav3FTp8/7TSpzrphazumeEIj97jLmRYBZcD 4Mzda9a7Mw5wxgNVmA6Zx7MFjYtaTevvt6BafyWPinYgsNpjkR/OYsCuV74PxMOVD9YZ 0Turj1tb2AObDLM6LmTdxpodk6vlc3BDR0u1cgVqDBim93badOmO+LWc+jbcHSBJ/lQc NdaTcy5elzBYd9Mk7VZMtFPwXnok3yWkJKG2+ahCwEQIkQCamVBEl/pn431Nzu2pgERW 5Cag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AckvEHT7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b12-20020a0cb3cc000000b005727252afb3si11594703qvf.282.2023.03.01.07.16.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:16:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AckvEHT7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBk-0008Aw-Mk; Wed, 01 Mar 2023 10:16:16 -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 1pXOBh-00087o-Ms for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBc-0007bU-6j for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:13 -0500 Received: by mail-wr1-x436.google.com with SMTP id l25so13607708wrb.3 for ; Wed, 01 Mar 2023 07:16:07 -0800 (PST) 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=jrpKaOFJWkJoO+xUUwZmjGHPgIS1O//HocxWyw4nUaQ=; b=AckvEHT7KPdDOo5jdS6dNBCHdYx96tTeaxufK8+uQUFZ0m/6iucvjmp1yjl6+76lfG K7+YApECe+52E1UuHPE2Cf/1rHl0iUt+aCw9hotAH2O1LgtCEKe4HKhnNXfhmr2Y9MjF zS+FuHj2H/tVNqzx38WAokcHkJL5BK0c8/Ryu8d8+kgXvKOXB7dzLyPRNRiIydfkHWT5 R+fa8sa3sLMskNo1UyQTIPvPCQWmwrcfygIjHz2/r0eSFM48jg2I+ui5Flj2c5X09LXk 4SWHdS44eZjkSzPHBKCXzBEF1j2//9gfH7OXODlrhpGTzQrw07g6cGGp927zo0dpA1c8 DW8w== 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=jrpKaOFJWkJoO+xUUwZmjGHPgIS1O//HocxWyw4nUaQ=; b=RdN/xO6M9v0pZFO3ydrpN2HlSIrQq9BoMKSN1jZ+q99VnEe36+wD3HdRV4+3TgqhPL thsPzjdgkN+JiP4tjo+FMPGlhb37fSsDlrNk69KV/4C5+32WuOAK5Y088PctHv1ckUHe UKDCeiTE4NFniXCJLeueCHdeG1epQB5Gk1mBgyHg4Cj0Ce/DXSxxDvT1A1vtzxJPmLub IDoC2jdx0XRyUIkEmSFjX1EpI5DCJqbWgLq6obJY2s/ktqOuxOjOiT19j6J0ll0aSRHl Ql5hVdBP6M+m2bf+azY7+R8tJZoGvPp68E+nYMTUbfGhh1r6z9f2bAC9akauPN1eAsQL APnw== X-Gm-Message-State: AO0yUKXZyUZycPuYyPDDkpvEtRUnzfDQEGDbG57lBlyX98Q8v/8mVqH8 nJNQF46+zPe4aPOiFwHVlArTHQ== X-Received: by 2002:a5d:648b:0:b0:2c5:532a:98c4 with SMTP id o11-20020a5d648b000000b002c5532a98c4mr12256772wri.33.1677683766810; Wed, 01 Mar 2023 07:16:06 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k18-20020a056000005200b002c54c7153f0sm13128116wrx.1.2023.03.01.07.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1DF411FFBC; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , Aurelien Jarno Subject: [PULL v2 04/24] tests: make fp-test less chatty when running from test suite Date: Wed, 1 Mar 2023 15:15:44 +0000 Message-Id: <20230301151604.1948813-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org As we like to run tests under CI with V=1 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=1 | wc -l 759 Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230228190653.1602033-5-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[] = " -l = thoroughness level (1 (default), 2)\n" " -r = rounding mode (even (default), zero, down, up, tieaway, odd)\n" " Set to 'all' to test all rounding modes, if applicable\n" - " -s = stop when a test fails"; + " -s = stop when a test fails\n" + " -q = minimise noise when testing, just show each function being tested"; 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; - fputs(">> Testing ", stderr); - verCases_writeFunctionName(stderr); - fputs("\n", stderr); + if (verCases_verbosity) { + fputs(">> Testing ", stderr); + verCases_writeFunctionName(stderr); + fputs("\n", stderr); + } if (!is_allowed(op, rmode)) { not_implemented(); @@ -837,7 +840,7 @@ static void parse_args(int argc, char *argv[]) int c; for (;;) { - c = getopt(argc, argv, "he:f:l:r:s"); + c = 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_common.c + */ case 's': verCases_errorStop = true; break; + case 'q': + verCases_verbosity = 0; + break; case '?': /* invalid option or missing argument; getopt prints error info */ 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 = { # 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 = ['-s', '-l', '1'] +fptest_args = ['-q', '-s', '-l', '1'] fptest_rounding_args = ['-r', 'all'] # Conversion Routines: From patchwork Wed Mar 1 15:15:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657803 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3543738wrb; Wed, 1 Mar 2023 07:17:18 -0800 (PST) X-Google-Smtp-Source: AK7set+d13F8iEL3SQSM8kNnE3QDvkH6P0D/pB+sTvPIFT3mEmMaT2FoiX+3w5Oe3MNOnaeW5hNK X-Received: by 2002:a05:6214:d03:b0:577:518b:68e5 with SMTP id 3-20020a0562140d0300b00577518b68e5mr656244qvh.23.1677683838551; Wed, 01 Mar 2023 07:17:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683838; cv=none; d=google.com; s=arc-20160816; b=vysoTxHBrLmTiG6A0xp6kvAoSUHDAvUHS2LfjznRbU//QQDd55OWmaamacKnqhoFfU RhyY13GtCEGDRQlnSgKvIvJ70GzfWImBTSF3j/3kex/INcg5hs/oYDqwLVFQhnadjHwo hNr8qGxCwucpiftLvWdhK4VLZocbMbf5UCw9EmHMwjkO1CkZTFsEvvQQNZX5kOlOcky+ kipynUVSgnoU23TfnIMgi9lVsAWLKZRSxKa4TRGBpBRAQUte/FhH7T4h331a/RRbpm0y NOAta/9u8HWxkLdHh/D7GkaY6z2qFLcchWq3fWFTsrDWYevl93ho1cnOKTPymH9CqHhM rXzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JbykLvpPl5/hixH9ogfK/P0Luf51vXufeBGBbBQlZ/g=; b=tZWGMj5PkQLsnwUIL2PUFSSQ6UlPX2Z211eGnHmGydzWG3ESkqAtytfIpuCp3AcAsd EhcYHmh34HSytusLhoXJRjJN8mtLqLhPMosorNCENCyUyJtl0+EOkzYqbRdUmtJjFusp 9lUVplFL+OelJ2jj+Ve28gT+O5iEoiH+Av6Ux2ZXkLUNrxGuKrJGRIQzUZAeS2xVPzTA 6Xwh5/e8vd7m30S3HICn1MwISEVDAO0hClxqUWA4tRL3MKLjSH9BvlwVz1VNeROl+C7o sfthx6H/JMntSUYyCpOexg4Dx8/BFPbTPMIARBoiX1GUPW7EvyDD1WfbFn8zRrBZntgz 4NUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YYMyazvf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x18-20020a0cb212000000b00574ae6321bdsi4843286qvd.568.2023.03.01.07.17.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YYMyazvf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBl-0008Cw-Qu; Wed, 01 Mar 2023 10:16:18 -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 1pXOBh-00087n-MZ for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -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 1pXOBd-0007bl-Dc for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:13 -0500 Received: by mail-wr1-x432.google.com with SMTP id g3so4716252wri.6 for ; Wed, 01 Mar 2023 07:16:09 -0800 (PST) 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=JbykLvpPl5/hixH9ogfK/P0Luf51vXufeBGBbBQlZ/g=; b=YYMyazvfdxunNJCuDGPxbbhondTnCvBTAUF+tAvM7n9WKIYw5qHGa/IeSY5xmOXBDn EOT4mK5OoVcdhknVhzPcZIPRGkv3slMvSVN1Lvs0FwjpTnlFGrGsFmtSWWFZ5J4bLnkG oFsxLaAw1/ccn0lTNmvzH9+J4eu5ohbvSaobDSyU2uoFX5D0zHAMsURWAR3nEtpNBcAx MDRg3hCL2/+QLldYo4G0//s1vggsgqynImuERERKF7b15C1iil8p0pki28Na2Xgv/m+S GAz9AzNl8QIxXewJ07SOetkftjjM9yxL34KUiot+VfgpC86p6m2JxaycaKQT8co6GbMt 4RVQ== 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=JbykLvpPl5/hixH9ogfK/P0Luf51vXufeBGBbBQlZ/g=; b=567AmSz/rO9oQWSCe3SJlEmvojADLbqQDLrbxq5aNvffyBBODpaByZviPWdzfvWlti n+qCf1oBejZ5PoAGTSpJ6WuFqJMF5uaj6mT+N04MdpmQfeWPTRZEZZwgRhuzwvaylWC5 vg0MsUiPmuY9DmACZnL0YvSK8aFxzHa9zTzuIwXqNrXswbbkI3ampiD3Jecy/B9xfSB0 AOU/MBV+0axHeG62/jwRcKURIrV/IBwQU5KwEmFxuq7LzSIBMGxtnR0KaRxvA3IIGYOk aYIJRbMlWtI7M2KTGo7armLcXzfZUNLaT/gynHMEgNypRv587kPNodZrpREJg6m+0eMn THnA== X-Gm-Message-State: AO0yUKVgClK1A63hpao6f2DyYw7y1Fd+h0ciWse0y6AaQQGu5ONRwmpO TH2sO/0qYhCcqs045+0D9gOg1A== X-Received: by 2002:a05:6000:81e:b0:2c4:489:fe93 with SMTP id bt30-20020a056000081e00b002c40489fe93mr11546664wrb.21.1677683768081; Wed, 01 Mar 2023 07:16:08 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c18-20020adfed92000000b002c54c9bd71fsm13238487wro.93.2023.03.01.07.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:06 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 335FF1FFBD; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Alex_Be?= =?utf-8?q?nn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 05/24] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs Date: Wed, 1 Mar 2023 15:15:45 +0000 Message-Id: <20230301151604.1948813-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Message-Id: <20230215142503.90660-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-6-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=1 - || { cat meson-logs/testlog.txt; exit 1; } ; + $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 ; done + always: + build_result_artifacts: + path: build/meson-logs/*log.txt + type: text/plain From patchwork Wed Mar 1 15:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657810 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544469wrb; Wed, 1 Mar 2023 07:18:35 -0800 (PST) X-Google-Smtp-Source: AK7set8V6Ped3px4UBVWU+15lb7r/IqbOGJqbLqCV5FRbtxZL5WO9X8IdtDUQi81LwyHoY1Wfqv3 X-Received: by 2002:ad4:5745:0:b0:56e:ab31:199d with SMTP id q5-20020ad45745000000b0056eab31199dmr14409658qvx.40.1677683915381; Wed, 01 Mar 2023 07:18:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683915; cv=none; d=google.com; s=arc-20160816; b=PNRdmxD3UburPNorwZk+oQjYlj2YWgA9H9Yj/hQ6e/JkHEvugWR3vCei68qG6Dl+gS cbFuj+OHhxzsnZodKFbz8OtPCFbJ67qr6XS8kwW/CVKRIGfYUie6WgJFodwAEMrKfMwv yKWILcpOC5TV+wCDRODd7qAVzagR8+VkflEND07IU/zuMs3R6qS9GgaxEXhL98fYZRH4 JvJ+VNzE9wtTZ3f44r2M2Gaie7gzHmrpN/k5AgZWK50td6XFVz7zxbLGYStQXWiqSP9s bFr4xq3B4b5r4MZiIJ1DI2f4QJWawB+Ibm1zbBu1ABz0wzRxnqbPW2JxBe2aInd+S3m7 Oa+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=070PzUrZfVxXqhDV3BT8grkHDt8Ezv1S71HCy6H1uh4=; b=qFyTJWm5gycyzt2mJEGhaEsT5jN6tgTPEFmwcoFXLzYoUIKVKYRYLITkiCBznuR08B mgmLg4DybWODtnnPfcxT1/X5yjXVubPNbEtBdwZLsUc7NW8Qqi7ZfLSxfpr0ur4NDqmL vTlHXG1t6JLTvKfsRGkHYZPFVIW3+0CqRuxFrcOAiRu0sMq5aDDd/HAHfjPJJLxmAYfm EvwROYcA5hI+ED7rEOO7zYzBLaECGr/8uCYViJlg/14Dt6k9OUYXQudutDwaVB+Fx7EL GT6/8kfciQieljxhZTnjY1NfuGJ+8Zwwy40Jhy/pRlR6QazMgcHOOcXZa2PRjQVvA9GG T6fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvXBuH+k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u14-20020a05620a454e00b0073b83b0eccbsi12140964qkp.296.2023.03.01.07.18.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:18:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvXBuH+k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBp-0008Gm-47; Wed, 01 Mar 2023 10:16:21 -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 1pXOBj-00089I-2N for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBf-0007c8-Be for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: by mail-wm1-x331.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so12107013wms.2 for ; Wed, 01 Mar 2023 07:16:10 -0800 (PST) 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=070PzUrZfVxXqhDV3BT8grkHDt8Ezv1S71HCy6H1uh4=; b=QvXBuH+kUPThItsAcy8oxZOLtrKZE8FMKnoRrRYsjjI4HZlACnBPOyHGEBvHheph9q Pq0VLGHgQ77KDsMHbe2qwV2Zfhmh8jpglJAg6DIjIDGXWpJoorYmRc4yKuvml6ZP+pET rePPlzU2dw7gfb+V/e5UpHJedWrOwC4y24ok5nooknXZ+2RkVStyq09fG2h7/CuBfsJu lUp1aKQno7Vb+f8LEbjdDyLiX4Fl7+7sx9ma6OcvH1v3n2r32l7NnaQrMc0dOyhoby7F OP17SRKbquNVvPcFKE79KgJBo/bFwmKsWY3vEXp9YpnutoZAc1P/XiADZOx7AxnuNVvN 3uOA== 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=070PzUrZfVxXqhDV3BT8grkHDt8Ezv1S71HCy6H1uh4=; b=OT1vGjTHm/YfPhyjNklhS/nnr0M88LesYr4C9wbKox8IYTPUSI+75SwKGBBDOq5wyI cENkVANVyr3/iNoypvG7XNdftm8TOgNyz0tHiS2z62SJLdaGy418zq5kC5AIGOPu8qXx gBIADzTxX2BV0nLs+YTFzIF6y2yOEUyJRYKTlGnVXzKOmkJiWdR4fvwldXiKN4GtT2T+ uHjOyzajhqtja+YIWtV6UlM/rEAHMZ3lFOw4s3ZplFu8sZ9crQYAd7+Xb2X5a6C26Kw/ WlYjop5ukZ+n085wFdlmG1cxyBFNRt4KIT/GRc6HgcwnzELS+5jQyE2Z21eXqY0FuJpU tHUQ== X-Gm-Message-State: AO0yUKX+W3ZirYxqyCg2+f4K6AfFfTiVFAYgZpHNkMi2SIpyBY+4aaCM 2B5RQGmjSlK+C8skBsgtyhZMqA== X-Received: by 2002:a05:600c:713:b0:3ea:f883:4ce with SMTP id i19-20020a05600c071300b003eaf88304cemr5180206wmn.20.1677683769795; Wed, 01 Mar 2023 07:16:09 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i13-20020a1c540d000000b003db06224953sm16421465wmb.41.2023.03.01.07.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51F2D1FFBE; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 06/24] gitlab: extend custom runners with base_job_template Date: Wed, 1 Mar 2023 15:15:46 +0000 Message-Id: <20230301151604.1948813-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Reviewed-by: Thomas Huth Message-Id: <20230228190653.1602033-7-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: # 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-ci.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" 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 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 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 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` 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" 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" 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=40` check 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=40` check 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=40` check 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=40` ubuntu-22.04-aarch64-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: From patchwork Wed Mar 1 15:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657804 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3543816wrb; Wed, 1 Mar 2023 07:17:25 -0800 (PST) X-Google-Smtp-Source: AK7set8/wOm8RnwiGtXS9tFAQfBjeYkhLiGA3MnamGgacEm72D/6bvU9fLatt1RT60XOWzCCMq1v X-Received: by 2002:a05:6214:f29:b0:56e:ac97:85da with SMTP id iw9-20020a0562140f2900b0056eac9785damr13539164qvb.30.1677683844832; Wed, 01 Mar 2023 07:17:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683844; cv=none; d=google.com; s=arc-20160816; b=mKmW8tbERJuFuQcSew1BgyKnaDMEeq6hrwt5AQyZB01p3O+MFmsgh8uI6YXilpVTmA YuzPrbgF7GcRvwZ4F999huPjFjqCBxAHv6m6urbSNNq9+jOheqJy5tEpyBjQednzX7eV Z314KDSXg7bzIMelHe4ApbSWyvG1lWEYtB1iFlanfZsjUu7s89mAcUgbuN1dfCSm10KE ID7DR6oUdUwLzhny6XjN9O0eAcnNmbvGUtH9yieLvAKeRw15WNjY9j4+nXq5gbRGM8s3 vrx9oA6S9yNr2JM7zUkblLhGPmbN3cG40BefT9kPjQOtRHfE+YJ0Kw3p3dwIbM9mvfMD Swhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Je6tHmMsXrx/D8pW2bDpgfBjKMVcTzo9CyJE47d842I=; b=WkAOPDNL12f9RuQbfR0n5HhfylAkdLMtUXP17IW86TYqhS1Wc2Wu+NOVGIIP6AXB7M uEHXcc4MHaW2JWwUphZvD1yotIKW589osnyFSPuPWaq1UlTT2won7xL6OCw5CxOOVOcR qsISSJfEpTSE8If5RAhTYuxy1VGrdaNP5K98vWFGMfE9K+p01sAk0DleE4ugtVe9p3Ck 7rfh558Gb3Fyqf+pQ18ne7lxA0WB4SLJhJKqTTK2sSz/Qzd5RYxEX5yCcAkQRHrMjp5q enSsRi/8lfJyeIlvGPuhneKwyLojtCYsxzej/OGeni32LBSRPN1E31PMDIIw0hCCF/GX LErA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a40aRi47; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t6-20020a0cde06000000b004ad5edaeeb5si10487120qvk.357.2023.03.01.07.17.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a40aRi47; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOCG-0000Ew-Lw; Wed, 01 Mar 2023 10:16:49 -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 1pXOBk-0008B6-5J for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBh-0007cj-BE for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: by mail-wm1-x32d.google.com with SMTP id k37so8847651wms.0 for ; Wed, 01 Mar 2023 07:16:12 -0800 (PST) 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=Je6tHmMsXrx/D8pW2bDpgfBjKMVcTzo9CyJE47d842I=; b=a40aRi47JeD+hkOWZHV4njEIrarvuldyqEyTgCl4bfRu7Nbm522jqAESZfC+mGzgJo 4bq6msVaHEs7ROuSLlSP/Vwxq9yS4WK2Y4aGj9D9DCJLmrcUbKBYbkOXBpYU98sAY7Vf ijXEYPzts/aNPndlyBfJTB0JUNjZKzFiT1BQsqZ7hl7tTp5mXLxQNg4X9Esp1UDIYOPI aYObWG+wBSdfOmE41Fp5idOELzXQ/wsMOAdMAmJSnrS4JpBiAvyYVCGUXvjIpvY6aCIX gi+qfO4oQKRzY77lcUvT+4CiCc0aJ3geQjVIP9/o3GadKoG+/LcYIKKJVJ4nz38weAYO Qg/A== 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=Je6tHmMsXrx/D8pW2bDpgfBjKMVcTzo9CyJE47d842I=; b=CBOM35BMv45AOkl9Jl3cmT0zG6yanJ9aw9Rcfz+sOI0tKQ34r3aY9yjfQ5Um/lFl5R uY6yvyYRIGuTK4/h3BavhI1SfBX2kNJYfbbi0xSdNfkjlepZXohujkm5Po5BQxh9pgUb q10VRnMwggCbsSXPGgZWR6fqyymxZepcszMgrLnTwCoaND+unSQFD/C+buMh0svFEnEM AuG1CgjA9cTvDCIL5eP7z7cwEFFByZbj3NZdwFchDoD7epvbJ7eqAC7f1YEEEzXJxmIH 9/GT62id7gl6T8felXBH/VRSnV9qI5pQ7Vx9/F1w+u+jel8khwa/HWfbGpKV9IlwcX3h XzYQ== X-Gm-Message-State: AO0yUKXIs2U4Iys3iZ0J6QwGthHY9QMCA3CmpHQ9SNwoUAFX23hrrryx TQLd/RFg6bzdQ0reXILb5fkfLw== X-Received: by 2002:a05:600c:444f:b0:3eb:1ba8:7cfc with SMTP id v15-20020a05600c444f00b003eb1ba87cfcmr5518288wmn.30.1677683771732; Wed, 01 Mar 2023 07:16:11 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o25-20020a05600c511900b003dfe549da4fsm21962851wms.18.2023.03.01.07.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6819A1FFBF; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 07/24] tests: don't run benchmarks for the tsan build Date: Wed, 1 Mar 2023 15:15:47 +0000 Message-Id: <20230301151604.1948813-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230228190653.1602033-8-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d903c42798..7b92767689 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -463,7 +463,6 @@ tsan-build: CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --enable-trace-backends=ust --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user - MAKE_CHECK_ARGS: bench V=1 # gcov is a GCC features gcov: From patchwork Wed Mar 1 15:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657812 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544572wrb; Wed, 1 Mar 2023 07:18:46 -0800 (PST) X-Google-Smtp-Source: AK7set+1MX6yVd97lsbo2xyOnFQboc0SayJqTfrDKoI5oF8N4hhVhMep2JbVHzxIWAHhtBArhBJK X-Received: by 2002:ac8:7f46:0:b0:3bf:dfe2:6312 with SMTP id g6-20020ac87f46000000b003bfdfe26312mr10257074qtk.5.1677683926123; Wed, 01 Mar 2023 07:18:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683926; cv=none; d=google.com; s=arc-20160816; b=sqTswfvsH0jn3CW5ZIAkKBt1FpKIzFi7Mp3H9/boTfJyW9tqvldfbX2gERp8pIg1y3 aUZp784cUxF5QcT97yLXJ+aVLL+bl5S8ouS1FBSU45tlBeZQMSvdyFb+pys4brXJ6E7H wyS3EG58QafNBayYrMWS6wEE2FWBoe3aP1RVv5ITAFTvBkADP69ktFrQgmdS0za+CN2e HnCu6xuLFNsERkh1n2zJjeQytjm66Etev0H3z80nPiU5oFCrlBQFPoDyk5eYBPenAZ7M /9SN/KXtxLdef8C/CYOBuMl7Vrt3ZTA7aXdDK+AV5kVcuYwRe3GdHyqSzWyerIwKyVTm Jk0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XbpSqhbRv7I2lcqBMt2IcN3y9fWWu0vzAbFmhDdtK/c=; b=tAxeRHtX2E4xltnoSxzIQYKPF/lheURatqWG7Lyfb9LRwQoeFoYCNoXJvCgfM8kHRv jKqN0nVl0l+PD7TgLDgHxPgPd9vfbsSUhmwHwf4Hq81XZGCUOTpKRnxa0QHMuamSzuE7 CCDG3jbyWBkwzC90AcUZTyLRfvp3jMAEuuUo+hIqbERevIdXmmzZqrsMYOIpwNgi9+0/ LHZ79r1SRYQgx7kagEB/8wEMuIaHv6OKIJu1nnO79c/dc26/TKg8NIM77kgGF8YMYv1A CbLCnRIoEOYyh58PyeoZJgAO1CGsHJOcIzLbzMK5bQTmUm0kh/naNtSS2mz2mngT+ZcF yrag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SLIO2zmi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t133-20020a37aa8b000000b007220d6ca34esi10351597qke.748.2023.03.01.07.18.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:18:46 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SLIO2zmi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBp-0008Gl-3C; Wed, 01 Mar 2023 10:16:21 -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 1pXOBj-00089X-IP for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBe-0007c5-TX for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: by mail-wm1-x330.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so12107003wms.2 for ; Wed, 01 Mar 2023 07:16:10 -0800 (PST) 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=XbpSqhbRv7I2lcqBMt2IcN3y9fWWu0vzAbFmhDdtK/c=; b=SLIO2zmi0zic0bmj6MgbdB6qYtW61Yql5M8mo5CEKD9XrC79QkrQKFo+jvYluSQsQw /j6ItAAQLD3vJmxVeD9v/vf3RNzm5UVYH7mLka6SeqEJOHQd0914APz0+JdNjuphzV/5 /VMPcv9twfUHy/5OD5AtEwYcFS/Uv7zBMahNfZRncGtL/S7JJO/BtClqafZ5QDTD4eHx wKpOskw4k1H7foZtNfkMtecsyEbe7BbgS2rKZjiW1G0d7Ri4FfRnPjGoH1sBbMo9SswY HG5h5VKA6O9sLFhWYA8Sf+qh3Jy0d4ttDKHP8VSnEKk++Ia1cAQwVix21ECgkfaMr+IZ fDGw== 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=XbpSqhbRv7I2lcqBMt2IcN3y9fWWu0vzAbFmhDdtK/c=; b=l0xcm8O3XEFHxGLdZz9vlaSGBtKvYPhk5kVcP2kA9fZVXIuSBB64wLPzDFNVFEUXvm CNZPfak5G8yq4jiz0Wy6BFcm0PrvSCto1pcbbMce6ek1+wiHkRqtCfrhVttwsds2+7V+ drgj8gxW9GZiC9k1p6ulh4FX3/fRCDhcPnRIO9CAfKjNOO3A2z5F7sd2Dy4qCW1U8ANU G7X5uUPCXJEhmfLPaqeqLfIoDO27LpvCINnbMtofbhfbW8ztu2v/cUhKgE+G7vE0r05l /4HcN0+j65wlqiHFY1MyV/i3IwypmsHJRb7eDuL0XRlY8pNCXhbYJGJW8vLL/8qM5BHf xzpA== X-Gm-Message-State: AO0yUKUBEtFpuTYWGJWrGEd4fRuzvQgkYNdXgRpg8ZMf3Z65PcL9HG73 cz3L7RhWZ8VoIOxqWAftL1QJyw== X-Received: by 2002:a05:600c:43ca:b0:3ea:f883:4f5 with SMTP id f10-20020a05600c43ca00b003eaf88304f5mr5261220wmn.17.1677683769510; Wed, 01 Mar 2023 07:16:09 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j24-20020a05600c1c1800b003e22508a343sm17530694wms.12.2023.03.01.07.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 90AC51FFB7; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , John Snow , Thomas Huth , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 08/24] testing: update ubuntu2004 to ubuntu2204 Date: Wed, 1 Mar 2023 15:15:48 +0000 Message-Id: <20230301151604.1948813-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Reviewed-by: John Snow Reviewed-by: Thomas Huth Message-Id: <20230228190653.1602033-9-alex.bennee@linaro.org> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 362a26698b..4071e72710 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -588,13 +588,13 @@ https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual Thread Sanitizer in Docker ~~~~~~~~~~~~~~~~~~~~~~~~~~ -TSan is currently supported in the ubuntu2004 docker. +TSan is currently supported in the ubuntu2204 docker. The test-tsan test will build using TSan and then run make check. .. code:: - make docker-test-tsan@ubuntu2004 + make docker-test-tsan@ubuntu2204 TSan warnings under docker are placed in files located at build/tsan/. diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 7b92767689..43f9e4a81d 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 TARGETS: 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 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 build-system-debian: @@ -457,10 +457,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=clang-10 --cxx=clang++-10 + IMAGE: ubuntu2204 + CONFIGURE_ARGS: --enable-tsan --cc=clang --cxx=clang++ --enable-trace-backends=ust --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user @@ -468,10 +468,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 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 -amd64-ubuntu2004-container: +amd64-ubuntu2204-container: extends: .container_job_template variables: - NAME: ubuntu2004 + NAME: ubuntu2204 amd64-opensuse-leap-container: extends: .container_job_template diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 936e4f9b2e..95d951953f 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/include/sanitizer/tsan_interface.h diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/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=noninteractive && \ + 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' --show > /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="/tmp/qemu-test/build/tsan" mkdir -p $tsan_log_dir > /dev/null || true EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-tsan \ - --cc=clang-10 --cxx=clang++-10 \ + --cc=clang --cxx=clang++ \ --disable-werror --extra-cflags=-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=None): generate(filename, cmd, trailer) -ubuntu2004_tsanhack = [ - "# 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="".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") - generate_dockerfile("ubuntu2004", "ubuntu-2004", - trailer="".join(ubuntu2004_tsanhack)) + generate_dockerfile("ubuntu2004", "ubuntu-2004") + generate_dockerfile("ubuntu2204", "ubuntu-2204") # # Cross compiling builds From patchwork Wed Mar 1 15:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657801 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3543394wrb; Wed, 1 Mar 2023 07:16:47 -0800 (PST) X-Google-Smtp-Source: AK7set/f84GGdbOybZUJn/+efXzcmfHdTyxoGy0tKA8bzPUMssq70jkhpKIqyj74O8QT73l90N+f X-Received: by 2002:ad4:5d66:0:b0:571:d69:da8c with SMTP id fn6-20020ad45d66000000b005710d69da8cmr13938020qvb.19.1677683807665; Wed, 01 Mar 2023 07:16:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683807; cv=none; d=google.com; s=arc-20160816; b=q1ECs1ZztKrsk8nDv1/GaXGDM3AKFNpzi00OkVwR1xfESQmkVqZoktdjwxX8SUfGDz JwHzjuGL69zHbHy/fY0fvfRcAmaa5GzCOZLl4jA5YzttInEy3wRAOyUDOfGwK8oYWEim N6D0VNxFCJVSbKmAayNLbfLBzfXe/7paXCIdNler2rN+DjGxBwOprm7bHsXTZ0hKrcUa 1+Q3fw1coQ2oviJp3oXvYGMMN3UZ1+qsC+ZZLEL+ZPRw+LjbphQrdlQ+Bw6OqLZUTyA1 BDryyVHGYr7HELxg6d+qB1qG0Puv80Q+Uu1jJoInp4aV4x9iLDbxCEogvQU5QEXyO82v Dlyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TCGekxGxjU/hmOPy5lL7DhzIR++DazJ3aKr66MQtme0=; b=XmOwrWo0ooPqUveGQiUu2TXMhj1G5F9RSygmOKMKdXjLbVtnvuFbKmMGTZMLqvnUSG aadogVDnld6zg8dYPtrQhZ3gVuPrT1rL9utuklKQMBTbhiTlFxXlzd/ReOLA5frrKw1F h0boFFvYMKgLTg2cAvIm6M08KZZVOY32kXs0gt1s3uBuXJdKnDClbpboCkU0oqAsnRhK 1WjJX4bWQc3s8XAtZkP0R5ntVvhGIuI3elfOtF0SMNW+eXF36WJ0/uOZ6XgHBxWw+GSM LOfLWxV+E+ZucJxrrjlY0YPxgwuA6pL6E9s/IUYftbmIuts/LWn4i2xGhDmM+3DDWtPs t/AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oR4py4Me; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f10-20020a0cf3ca000000b005721bd083edsi11347592qvm.409.2023.03.01.07.16.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:16:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oR4py4Me; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBm-0008E3-JT; Wed, 01 Mar 2023 10:16:18 -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 1pXOBj-00089U-81 for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -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 1pXOBg-0007cS-MM for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: by mail-wr1-x432.google.com with SMTP id v16so10782495wrn.0 for ; Wed, 01 Mar 2023 07:16:12 -0800 (PST) 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=TCGekxGxjU/hmOPy5lL7DhzIR++DazJ3aKr66MQtme0=; b=oR4py4MeLbUsy+vaDGuZ/zjw+hNv1flrrphkqm3bZG9fDjo224p2uxxPthM3A5Wivd zvelD6g9ZTFy+JwuEbEyQhqF172uDmSNoO8L7ZYd2QdjcUDDS5T8RNcO/FrD+vwJwFJT Z6hUEOkwQ/riRPw6QQNfIy+5p1fd/MmxFfzhAHQwDADIU8flq0Lh74trPBpdPCS8BEU+ dLLcP/2IRVvSFYoba1hES/0eTy4AyJtOC34JWMaXo6a8CHb7t1iVWml6oX0+bTB6vkTC 4bz0evXJA8La8hr+PLIUyD/ivMF8QjMpB8jCgDhXRDHhU9nz+kN0ezK/QEJ4XT5mKggt 655g== 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=TCGekxGxjU/hmOPy5lL7DhzIR++DazJ3aKr66MQtme0=; b=so4rB1Uc4tbyGAdW3kUtUJREakiVHV4MlzfGHU+eJ3Yi95ED7Gs9toUviQd/yPfAj5 Gr2IbA7X01JofF3yyJH6ht6iIX9AxfeblpYiLqy/WtXGol7Oh/Ju0t8+Tf335pbMURlO UJBCCzuIBdXh1ubu3QEHqmMzHm1e9HV5NmbTqPQQXTXk50s+UWef9vbgLrqm/z+NhArE eRVAxDViqlYLLdJ/UtaObr6Ta4E5rZ3nZS35h7KhF/NvPag+FxZWuipC/MdCgpAcS6ax n+fonpzGuvvAf8x+fJ58Vacwdx/QKIP9mdJzbWdM3FXd7l7iM2CAcS0BNj/V4VS9kg0/ k4vQ== X-Gm-Message-State: AO0yUKWP5Y+yWVvzLrmmzyfiKh90JsS5HAitlH1TxIytt+yFw3x6X6ja +j7dbaoX5eAmFLm6cL5THyOfuA== X-Received: by 2002:adf:f549:0:b0:2c7:ffd:f483 with SMTP id j9-20020adff549000000b002c70ffdf483mr4966027wrp.41.1677683770939; Wed, 01 Mar 2023 07:16:10 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z10-20020a5d44ca000000b002c6e8af1037sm13008036wrr.104.2023.03.01.07.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A6CFB1FFC0; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Pavel Dovgalyuk , Paolo Bonzini , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 09/24] tests: skip the nios2 replay_kernel test Date: Wed, 1 Mar 2023 15:15:49 +0000 Message-Id: <20230301151604.1948813-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It is buggy and keeps failing. Suggested-by: Peter Maydell Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230228190653.1602033-10-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 = self.fetch_asset(tar_url, asset_hash=tar_hash) self.do_test_advcal_2018(file_path, 'vmlinux') + @skip("nios2 emulation is buggy under record/replay") def test_nios2_10m50(self): """ :avocado: tags=arch:nios2 From patchwork Wed Mar 1 15:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657805 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3543822wrb; Wed, 1 Mar 2023 07:17:25 -0800 (PST) X-Google-Smtp-Source: AK7set+OOMoTYeA8g1dk5vpH0hTdq1pr5faQnqCIJ/A/KUTyL8c8WUBBmZbw9C5hptMxIs4EBfKl X-Received: by 2002:a05:6214:5003:b0:56e:a96a:2be1 with SMTP id jo3-20020a056214500300b0056ea96a2be1mr10796590qvb.48.1677683845126; Wed, 01 Mar 2023 07:17:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683845; cv=none; d=google.com; s=arc-20160816; b=laiCg21A775JIUHKxi1A6IGMvS62MDMQztFyw1VJh6gmW1+RwiMGzZZZ+ccp3lGLIX QQ+ffFj0IIvgQEmYNeE/q2DzSZ40k12w+25ZwmEW8XRvkc2BhU7UEHZv3fNKuJIP0/LS pTewECObYESuQPTNQFjZGyK7ncYILJkam5QFvybjLg/zcnPQ/Vxc2VrP0bLR6mQoVJco MFuIDX+GsLztxqJEkduSWlUKuYnhHtevU1/buo3QnzeSHuwe5HUta37eLoTujdgLdMUw Gt/Jma212S1oM4b8/qST48n1kgAzsK3RHrJ8aB9SrHdNtsWjrfYUe7pdgKI3c9lA+ygi hx0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jiA9yNAAf7X1DUmf+OkwTQ/po6752juuOe9UzFWVsBQ=; b=CNVHbV/Tfud/DIblzPHD7r8Wj1sOiC/qGotqPZXF1oFmjRMciSGmycTCiVtS9gKkji Kuz1akp7/6ScEn8GsfmN/JQ6BNjEy+53J2krlyfbV22WzPL1TXlGNq+IejS75hiPFxa1 wsQ7ShbpYhQ8ppRnyvqX9n6EfvW8RZYBH8g0PTO1y1Mp6CZufjVsjp9QSoan6Swi6K3N 896qXmug0br8NUqkeyoaAycV8P7i3Dvvzro9ex0XQe9FtMf7aZxJ75kE8HLn16LyJT9F ZOaNFhdRnnakKB9ijc2/RUxi/Yw/LZTqE3lutV7AuUVTro8U2xs//oCVGYQ+f0mXetlQ wS/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=faBoqSRS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e3-20020a0cf343000000b0056ea9a9a806si10914582qvm.13.2023.03.01.07.17.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=faBoqSRS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOCC-0008T0-34; Wed, 01 Mar 2023 10:16:44 -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 1pXOBk-0008Av-3M for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -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 1pXOBg-0007cK-6D for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: by mail-wr1-x42d.google.com with SMTP id t15so13594101wrz.7 for ; Wed, 01 Mar 2023 07:16:11 -0800 (PST) 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=jiA9yNAAf7X1DUmf+OkwTQ/po6752juuOe9UzFWVsBQ=; b=faBoqSRSbqIZ3gLRn2W2PyBWGw9KqhsROfrIlkDrEn97mRuwQq/xwTZxhxzoaj5y3b F/ZdebfZchKM+aP/1EPdcEEnItmX7hrKv7MRe9SgJn+zaUUGNtCVji6PKqecI/wLFtSe 13osSdrcZEusOY2TmBFF6tHJ70FMEl6BMRL+12FOuwHUpvYHjQPW0SzBz4Q3fMh2DTM+ yAuq6KnCKLzcCezlMpOo23nB80wKYIiS36ASVlOPRTxIU6HnKnEUaasdo1UFwANHiPJ5 meiYYzXWqGsxayb09K+2nP9nCy9fdbzfuAC2MLAxpr5qeD7dBcEnVx3FVKMajy1tPk1I TzdQ== 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=jiA9yNAAf7X1DUmf+OkwTQ/po6752juuOe9UzFWVsBQ=; b=ybNkOCiw5q79mNfWShDu8LMGMZO3cNsP8u3FVtYPQf1aX+j7Bu4jvj3PaPusOoA0XU qBMNayGpShMjNv01aylJp3HuOXC6q2CknO7UCmZWP6e/saASDViEOHsOhAxhm+qLScsq sqxR++p2R6UYfklyDrkCNkPMSa3/xCISt3nwpWWYTujsK16Va3Ij8sZtRqexL16jGY1K cXOkj/5NU/DCahAaAVwljGgNPudD4jM2UWMWoTTzNq32fFNTiIx+rD0wTnpfUoWrzURS ee7G7EzTx6vVMLappL0TiZjG877O+SLbkd/aXjbNN4BjWiuxdhtoljEG5Lkqhxtq/dRL W3MA== X-Gm-Message-State: AO0yUKWKC9DASP7cfSoWz0kQnsroZ5cATkrO1ttp9KV0FAHwhZwy+E9k ejGi7rmxyYrQ/X9ZXTixO+7Tdg== X-Received: by 2002:a5d:59c2:0:b0:2c5:4c5e:412b with SMTP id v2-20020a5d59c2000000b002c54c5e412bmr10583357wry.23.1677683770600; Wed, 01 Mar 2023 07:16:10 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h22-20020a05600c351600b003daf6e3bc2fsm2530976wmq.1.2023.03.01.07.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C211F1FFB8; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Anders Roxell , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa Subject: [PULL v2 10/24] tests: add tuxrun baseline test to avocado Date: Wed, 1 Mar 2023 15:15:50 +0000 Message-Id: <20230301151604.1948813-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Cc: Anders Roxell Acked-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230228190653.1602033-11-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index e96e9dbfe6..76662969d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3766,6 +3766,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_baselines.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ée +# +# 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=accel:tcg + """ + + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0' + # Tests are ~10-40s, allow for --debug/--enable-gcov overhead + timeout = 100 + + def get_tag(self, tagname, default=None): + """ + Get the metadata tag or return the default. + """ + utag = 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 = find_command('zstd', False) + if zstd is False: + self.cancel('Could not find "zstd", which is required to ' + 'decompress rootfs') + self.zstd = 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 = self.get_tag('tuxboot') + + # Most Linux's use ttyS0 for their serial port + self.console = self.get_tag('console', "ttyS0") + + # Does the machine shutdown QEMU nicely on "halt" + self.shutdown = self.get_tag('shutdown') + + # The name of the kernel Image file + self.image = self.get_tag('image', "Image") + + # The block device drive type + self.drive = self.get_tag('drive', "virtio-blk-device") + + self.root = self.get_tag('root', "vda") + + # Occasionally we need extra devices to hook things up + self.extradev = self.get_tag('extradev') + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + + def fetch_tuxrun_assets(self, dt=None): + """ + Fetch the TuxBoot assets. They are stored in a standard way so we + use the per-test tags to fetch details. + """ + base_url = f"https://storage.tuxboot.com/{self.tuxboot}/" + kernel_image = self.fetch_asset(base_url + self.image) + disk_image_zst = self.fetch_asset(base_url + "rootfs.ext4.zst") + + cmd = f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs.ext4" + process.run(cmd) + + if dt: + dtb = self.fetch_asset(base_url + dt) + else: + dtb = None + + return (kernel_image, self.workdir + "/rootfs.ext4", dtb) + + def prepare_run(self, kernel, disk, dtb=None, console_index=0): + """ + Setup to run and add the common parameters to the system + """ + self.vm.set_console(console_index=console_index) + + # all block devices are raw ext4's + blockdev = "driver=raw,file.driver=file," \ + + f"file.filename={disk},node-name=hd0" + + kcmd_line = self.KERNEL_COMMON_COMMAND_LINE + kcmd_line += f" root=/dev/{self.root}" + kcmd_line += f" console={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 != "none": + self.vm.add_args('-device', + f"{self.drive},drive=hd0") + + # 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 == "nowait": + self.vm.shutdown() + else: + self.vm.wait() + + def common_tuxrun(self, dt=None, haltmsg="reboot: System halted", + console_index=0): + """ + 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) = 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=arch:aarch64 + :avocado: tags=cpu:cortex-a57 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:arm64 + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_arm64be(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=cpu:cortex-a57 + :avocado: tags=endian:big + :avocado: tags=machine:virt + :avocado: tags=tuxboot:arm64be + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_armv5(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:arm926 + :avocado: tags=machine:versatilepb + :avocado: tags=tuxboot:armv5 + :avocado: tags=image:zImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun(dt="versatile-pb.dtb") + + def test_armv7(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:cortex-a15 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:armv7 + :avocado: tags=image:zImage + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_armv7be(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:cortex-a15 + :avocado: tags=endian:big + :avocado: tags=machine:virt + :avocado: tags=tuxboot:armv7be + :avocado: tags=image:zImage + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_i386(self): + """ + :avocado: tags=arch:i386 + :avocado: tags=cpu:coreduo + :avocado: tags=machine:q35 + :avocado: tags=tuxboot:i386 + :avocado: tags=image:bzImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips32(self): + """ + :avocado: tags=arch:mips + :avocado: tags=machine:malta + :avocado: tags=cpu:mips32r6-generic + :avocado: tags=endian:big + :avocado: tags=tuxboot:mips32 + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips32el(self): + """ + :avocado: tags=arch:mipsel + :avocado: tags=machine:malta + :avocado: tags=cpu:mips32r6-generic + :avocado: tags=tuxboot:mips32el + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + @skip("QEMU currently broken") # regression against stable QEMU + def test_mips64(self): + """ + :avocado: tags=arch:mips64 + :avocado: tags=machine:malta + :avocado: tags=tuxboot:mips64 + :avocado: tags=endian:big + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips64el(self): + """ + :avocado: tags=arch:mips64el + :avocado: tags=machine:malta + :avocado: tags=tuxboot:mips64el + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_ppc32(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:ppce500 + :avocado: tags=cpu:e500mc + :avocado: tags=tuxboot:ppc32 + :avocado: tags=image:uImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_ppc64(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:POWER8 + :avocado: tags=endian:big + :avocado: tags=console:hvc0 + :avocado: tags=tuxboot:ppc64 + :avocado: tags=image:vmlinux + :avocado: tags=extradev:driver=spapr-vscsi + :avocado: tags=drive:scsi-hd + :avocado: tags=root:sda + """ + self.common_tuxrun() + + def test_ppc64le(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:POWER8 + :avocado: tags=console:hvc0 + :avocado: tags=tuxboot:ppc64le + :avocado: tags=image:vmlinux + :avocado: tags=extradev:driver=spapr-vscsi + :avocado: tags=drive:scsi-hd + :avocado: tags=root:sda + """ + self.common_tuxrun() + + def test_riscv32(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:riscv32 + """ + self.common_tuxrun() + + def test_riscv64(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:riscv64 + """ + self.common_tuxrun() + + def test_s390(self): + """ + :avocado: tags=arch:s390x + :avocado: tags=endian:big + :avocado: tags=tuxboot:s390 + :avocado: tags=image:bzImage + :avocado: tags=drive:virtio-blk-ccw + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun(haltmsg="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=arch:sh4 + :avocado: tags=machine:r2d + :avocado: tags=cpu:sh7785 + :avocado: tags=tuxboot:sh4 + :avocado: tags=image:zImage + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=console: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) = self.fetch_tuxrun_assets() + + # the console comes on the second serial port + self.prepare_run(kernel, disk, console_index=1) + 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=arch:sparc64 + :avocado: tags=tuxboot:sparc64 + :avocado: tags=image:vmlinux + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_x86_64(self): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:q35 + :avocado: tags=cpu:Nehalem + :avocado: tags=tuxboot:x86_64 + :avocado: tags=image:bzImage + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() From patchwork Wed Mar 1 15:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657808 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544015wrb; Wed, 1 Mar 2023 07:17:44 -0800 (PST) X-Google-Smtp-Source: AK7set/JJgaDR5G8EFXGkUKWv//EjLY0PnWKySKTJsEBmCLsKGETIOHIZ1lb70KQvVf/D2YDBUvo X-Received: by 2002:a05:622a:115:b0:3bf:a08d:b265 with SMTP id u21-20020a05622a011500b003bfa08db265mr30740177qtw.24.1677683864773; Wed, 01 Mar 2023 07:17:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683864; cv=none; d=google.com; s=arc-20160816; b=iK5gvWUox5QD9xsLTn32m0JsigMb9BkSyQsUo3x+WCL2DE/k2ZjWoUb6q6sG0EONdS aua/UfCW9LANniAy1bahQDuC6DVpWQNrDLt2YT2tT8AJGqeTpFkRRXUfVF/szSVBcg7k OETmr1NT/i0XThSOIGixVjac0WzB+kIsTi5ac2OX9txujeS1DArvzPLycvojaEO3eS5J hAuI/M6vwHO4TXMbcOOvOI+ori4C3ABZe02wipi/loMvI2blpmPghRDO7duLEEzIoHNj +ZtPDvUJb5slhgC4RNA7IsjB6rUuQDk74oN/TGISZft7HyBrSn0+ZlS/nKAmYP+zrGYn xKPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=M4X95ZwnspHpgdYhEfY3qoUK+TpfRMK73yKGv3Ei+gY=; b=Z00eTZDmu5NvHVfU/3DjfDojj7FFjBPIy3LQiyVwxFouXmdzFgEOI0ghd+1B4Rhm5W N8vXWXmmPkddJkoEh94pXdKOlTot+69t+nt6Zbep1LPT629V40jBUdWC1hM6ZJDeZQ/x Q8tXSo9qnVfhAL/ObPSFkVz7XGrKiQK89Yw8dRwRDNI7EeL1Pk1CaBdzHVEKm8eJKXUH hMmXHmC5TJRpkfJrQ9i085g7uh9BZJMLq/fKAi/YZbGkmssO5f3qlOJcOff71AjMTnwB zVPU6CMxnUIcfz0tVrjAdKDR0nYEq15Bz5OXAE6l3h3XYvveJ8GhcO86+lg+NiH8UGwu 7FsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vRHUmOpz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y14-20020a05622a004e00b003bccff19a53si11941513qtw.686.2023.03.01.07.17.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vRHUmOpz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOCG-0000BB-It; Wed, 01 Mar 2023 10:16:48 -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 1pXOBj-00089J-3M for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBe-0007c3-ID for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: by mail-wm1-x32a.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so8058764wmi.3 for ; Wed, 01 Mar 2023 07:16:10 -0800 (PST) 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=M4X95ZwnspHpgdYhEfY3qoUK+TpfRMK73yKGv3Ei+gY=; b=vRHUmOpzVa6B682CWBPLJpV7XtE3kEaL7/ONWf1b0FWNxpVVPKvp9k2nCmvlSdbOcU gXJIdp5UFEv1XqOJKy5u22s6luXxOZ79ZPjaOiRdf6psFt9ZeAA5uQ9ZsEYNwKS3mNjI pgL/KwwbqGKdwWHVYGbbu0j2OD6ils4MvhCRX6kPadgC+9sqBOPlvf4FhtDS9e0ilNhO Nc8JqWrsJTjC9j6Wa1Q3kJW0qJ5RB+a2qLkGE+rlq94okvymyDMWljZ2M6E8IAOZmJOr 7AX+oNgQz1uX0xZJ49I/lfEgDVjU2puhayyD5NTk55KIz9ZrFbS+Qe357S+kmzEmNz8S z4jQ== 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=M4X95ZwnspHpgdYhEfY3qoUK+TpfRMK73yKGv3Ei+gY=; b=G+NYPv+ruYnk0EldXn010YoqM3su+3UQzOkDhODnTfncwFUM+ZV7YUm81TQWS047NA Diz+SZCQnOsvWMBnetaNC3yAL7A5YtAIuv2/XmrPWgyTxPPgjdgn/1Ude9P0bzjUHmOu MrIYlVXa5vD2z0bF7stNM4gFktck/6FUrUcHeRfO2neLV6WpxceTF1VVRNLLsvRrr3lg SOvW566woPW65dPVMZ0i4QeEcFVaDdZ5DrSUYzG2BCpBchDPnG1+zLBfc3SXoQkMyFbI iWKnlT7pK9+El17YbkhGfmZsHLyla4lvgTPAoyxnHB2JGQd8obEGVnutQ5J8Njuu0MU2 TK4Q== X-Gm-Message-State: AO0yUKVmzKIOdwZJ3XmYkvSBg4g09UsAYCLB0gA/4MzMFMW2gSm1tWeq JwJ7K2+VPiIEzL3wFafGcX2LIg== X-Received: by 2002:a05:600c:3b87:b0:3eb:2f06:c989 with SMTP id n7-20020a05600c3b8700b003eb2f06c989mr5493746wms.22.1677683769111; Wed, 01 Mar 2023 07:16:09 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c470700b003eb3933ef10sm14679016wmo.46.2023.03.01.07.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:09 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DDE9D1FFC1; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Bastian Koppelmann , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 11/24] tests/docker: Use binaries for debian-tricore-cross Date: Wed, 1 Mar 2023 15:15:51 +0000 Message-Id: <20230301151604.1948813-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Message-Id: <20230228190653.1602033-12-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; \ ) diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/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 -RUN git clone --single-branch \ - https://github.com/bkoppelmann/tricore-binutils.git \ - /usr/src/binutils && \ - cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \ - 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/ # 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 = $(SRC_PATH)/tests/tcg/tricore -LDFLAGS = -T$(TESTS_PATH)/link.ld -ASFLAGS = +LDFLAGS = -T$(TESTS_PATH)/link.ld --mcpu=tc162 +ASFLAGS = -mtc162 TESTS += test_abs.tst TESTS += test_bmerge.tst @@ -19,7 +19,7 @@ TESTS += test_madd.tst TESTS += test_msub.tst TESTS += test_muls.tst -QEMU_OPTS += -M tricore_testboard -nographic -kernel +QEMU_OPTS += -M tricore_testboard -cpu tc27x -nographic -kernel %.pS: $(TESTS_PATH)/%.S $(HOST_CC) -E -o $@ $< From patchwork Wed Mar 1 15:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657819 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3548389wrb; Wed, 1 Mar 2023 07:25:25 -0800 (PST) X-Google-Smtp-Source: AK7set/Rr1N89KPa2DEbSD6T51dgM5Bs1QjdMPSk2HqzZHnFQF+P/peQT4Fh2owDu8jwlV6Dkwke X-Received: by 2002:ad4:5c4a:0:b0:56e:bd64:62a9 with SMTP id a10-20020ad45c4a000000b0056ebd6462a9mr13764301qva.38.1677684325360; Wed, 01 Mar 2023 07:25:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684325; cv=none; d=google.com; s=arc-20160816; b=eNLDZ5IGF/+Ah8ryb3p3qxfLdCRrQZLznJJJ6255dlwARpdevLRLUXdOpxIcWNkIVf zoeND+3c1uYkC7Re4ZeGD/M5udqLNvAVYdUMqx4rOa1u4Ifk1iiDHWUhhOfJmlwf0BYS 21mEXV2UB/CG/VICjpQjNRXIAbCfcN8A5UJMxWX41vR12a4PDBDfd8tvDLNCf/Ce+v0/ 9zjvqyPMwBX/NCOZZUmN0nhg0YlNz5n//9gyMJ4xtgdPKybJl2BRyF2MIgAmuJ0WHVLV T16KDv69oKEe2mnBkvSkMHrwt8FoACWFvlEfwQgT+YY7UIJLojJvF2krbcCQyEMVXqBJ ntrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GHL540s7Ps9RUn0c/E5TovWPNiGeB6LN+M0UzHb3Xfo=; b=v5As+oZnjcKnXq1z8MY3CLN7gIHQX6lKFgU5sm5DtzyORgaDQEsmPXBhOS5fvbZVBb oF9WmMv2dawR8tWy7xQfd499kmgLFiYfkLSdv/Rk1MgIrqWHMCbU8J9OyxNxUL/cdkWM t6AftUaI51yl4T3sLZM70VMeiVEj3o/WmNLaUkUv0PLJ01GaYbanbBBiTFHDFSZ1F0gw 6SyXE3eQopOWp+rCHZuasMGNSpgWPFXJDlHXpClPHpcchMXCjtJLRjK6c1Gtjik4VJfU Lm/OAloQz4/XMg9hm5wNVqPYLEpjr88aMfcJeQXOWh/daE8ee79cVYYHQ1v49TZSLiCY Ieiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eC8Qne5g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t24-20020a37ea18000000b0072c0e35cdecsi11866811qkj.322.2023.03.01.07.25.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:25:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eC8Qne5g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOJy-0000u0-1y; Wed, 01 Mar 2023 10:24:46 -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 1pXOJi-0000b9-Dc for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -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 1pXOJd-00011d-BK for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:29 -0500 Received: by mail-wr1-x430.google.com with SMTP id g3so4744579wri.6 for ; Wed, 01 Mar 2023 07:24:22 -0800 (PST) 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=GHL540s7Ps9RUn0c/E5TovWPNiGeB6LN+M0UzHb3Xfo=; b=eC8Qne5g3yfxUuxqme1U/NsuXS53Kx1vXAIJz95igM1fipdUFgp75HqdmdRoaStHns ziL6r9rP2/hERTYnDH4I7K1ut9XpWfi5d3SAluM13ulM5NTgGd6FWMjTRInGhmFDHvzh VOwfAxjSuG0eQWaseLQ8d7Z9kBdhhU2BKaNuEG6IIgPXTRRdr8JT8Q8OEbuOhrzIZu6h HRkRlNFYpci3ZLWvEglzQyEXBqKUZ5gvPlEdaCoWNYb/RP8WNAqWmX0oa+AjIYUJiEpu 9Y9qoifyvyy9om5pobeUD2R831taswrRnGZ/K1Ag9K3xoNEGUoHhET3JME+fRDHhGAwB ayLw== 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=GHL540s7Ps9RUn0c/E5TovWPNiGeB6LN+M0UzHb3Xfo=; b=Q/dn8O8/NUZ5usBKRxPU8IeL4TllJHccO7fhz5KU9/1rx1KE7JrIh+fp08X1CMy/AB DDbOrsN7efVjUPfD6LzA8L+2PcQd4ZRBXGgiC5qRVmP1hPpIFd5i0YbZyICqxegGRmy2 LSTc1GFV8nYxA2eQ/r2DVYscvq6IBL5y5rTZomaRWTx2bTt1/nAlaHZhqpES2V+OWkoD msrey5RWCHtL4+ZIWq8mJl6pkTcwjNZrM/jQuyUZ4IAOcSmnBgupE4ILsG7VYskl0h2t DcbeCtBCekJ6SLeLKiKDk1OniCKsaXT1D5LWSbqEznShRkz0Qiz1126e1qL9yF84QV/N VLcg== X-Gm-Message-State: AO0yUKUR0GA8nxH+XwiLnIe/UO0+vFHY5bcXwf2BbpNbYfy6v27NqHXH wAjUgPjX+tekM1TiswawAof4lw== X-Received: by 2002:a05:6000:1548:b0:2c5:a38f:ca3a with SMTP id 8-20020a056000154800b002c5a38fca3amr12969701wry.10.1677684261011; Wed, 01 Mar 2023 07:24:21 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s9-20020a5d4249000000b002c5598c14acsm12880163wrr.6.2023.03.01.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 026D51FFC2; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 12/24] tests: ensure we export job results for some cross builds Date: Wed, 1 Mar 2023 15:15:52 +0000 Message-Id: <20230301151604.1948813-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Reported-by: Peter Maydell Reviewed-by: Thomas Huth Message-Id: <20230228190653.1602033-13-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index d07989e3b0..4f93b9e4e5 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -49,3 +49,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 add 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 101416080c..d3a31a2112 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -44,7 +44,9 @@ cross-arm64-user: IMAGE: debian-arm64-cross 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 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 cross-i386-tci: - extends: .cross_accel_build_job + extends: + - .cross_accel_build_job + - .cross_test_artifacts timeout: 60m needs: job: i386-fedora-cross-container From patchwork Wed Mar 1 15:15:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657817 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3548323wrb; Wed, 1 Mar 2023 07:25:13 -0800 (PST) X-Google-Smtp-Source: AK7set/jQIh1r1wVnLdcAlPa09DRybMmcqrnIyOWRDAqayWVlHqwhqe0/k+tTqB+jLHyREDKtQyg X-Received: by 2002:ac8:5c04:0:b0:3b9:b70c:9697 with SMTP id i4-20020ac85c04000000b003b9b70c9697mr11518219qti.5.1677684313563; Wed, 01 Mar 2023 07:25:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684313; cv=none; d=google.com; s=arc-20160816; b=udfET2z5wMcmx0SEEhG9m/H3nK9y8ZYXmWGA/t6iQukZBPDWuHGTmJn33zUH3aIqj5 ZRLbIdO/jDndiuAeVjURg3Md8XauWzYXaXAMtCL3GjmMZNFlIqas0BpiGbL8nAFSv/qE I24Q9Ccnqp5zprilEZgtywjA5/Nes+9+vxlP4mAj9uadX8k/uRty0WxjKZg0zcC7bWYD qgH/OkjyUmw2yrg9jPcIJzAeKMWDTm7WkrnRHPiSSAnQPr9ygy2I0WFiiYm0tBSwfCZD bfC7GV0XfQjhfdzUufZ4KTJNcMa2ObcloLSI7yvcX+/SP1x75rNM1AzxKTb9cq0NRqUH jEsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=D9u8cdGfNTD+ql08VoEjefNIwphTAu8BlNDQo2Kgmc8=; b=JQLB4f3zQFfrJUALNjW7bHrI4DCbuFFqqdPCOchsgmFtGY5PTPXgdz8mgah+Wvk7v0 pD4B0wsZpD1DA/r+5mrUSUiNbbUU7QLD3dD2bjV7VpMC5RPHxs3OVTmrA5MZPwj3bUJX ampBwe5qWw6QehXu4PHJRjT4VdjNswZj977pnRYGCIn/UVS7OKz7ujMqJnprYkqft9YB CSemHKbYsMzIJQoVR4IUv6e+Jywz3stoF096eKqUA+PS81NPAzMXy9A4YMLEVf5H2vbK n4od52I2YlzgnTn28++Rn4RomtW1vwSFvkfGSr9InHBQFvUPjEY2/h1SUjZ0F3MGmoyB d75g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iTjOYwk+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e21-20020ac84e55000000b003bfa1b1f9b8si11282917qtw.72.2023.03.01.07.25.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:25:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iTjOYwk+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOJp-0000jP-9K; Wed, 01 Mar 2023 10:24: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 1pXOJi-0000bB-65 for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24: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 1pXOJd-00011Z-Dz for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:28 -0500 Received: by mail-wm1-x333.google.com with SMTP id j3so8830919wms.2 for ; Wed, 01 Mar 2023 07:24:22 -0800 (PST) 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=D9u8cdGfNTD+ql08VoEjefNIwphTAu8BlNDQo2Kgmc8=; b=iTjOYwk+RrImjIPi8QX2RORAUu92BhFxjS5wqDww0pDdElxZsjKMdZZj2xle68T/RH qPgcRYqXaxkheC0CNMcwiUUz2qtkxNL6fyahBV0gx/Ob51/9TXE/2bEb2pBQA5Q1WPoM 4cRAbf9flPGj4lRGJvm4/0mXSKB8to4Vt/BjdI/9pV7YLrJlqFw9RaMQZavNYmbz1ZKo GeVpeh/MTPkdPseObSjbHSr204cw5mj1BQTviJ1PjnIjsfEokrDTuPL2hUtNLsQ7oxwD 0RZ35fLK3ppGbXxzcpjOXi/rC7o61pjAnITg3aSjiPgLC4anK4JBNSpF2eEwWOF2vExJ xPmQ== 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=D9u8cdGfNTD+ql08VoEjefNIwphTAu8BlNDQo2Kgmc8=; b=jORNJVbGtwdHFgohQ9mN8I1xDIW1petE5RsxGJBQmYhwTExlqn/r771R7o89ZA/O3L jwJSRUYrFNCEFjwVHi+8L3AWi58hllmHTfjoZk5e9Z4pj5mQFu6LrXHikthF9MX/S880 IeP63RsxM0L/GygEbuFhvCcFW20bgYAbr4JmRM2p6mKUjNxCZQsROE627MKFhvKAbkx4 JtjE67jdvL6Uiw4L00n4Z1hhMPdAgVnFYyJkE9OjGfhV+rrcr/Zp//FXJGjOoWNNRF9R CzJdWJB33TMMUOf+Gms0z/H0qvbQg6J9mq8Wmyp8MOgX+m/hnuBvvPVEmDYFbOXzR7AK FzUg== X-Gm-Message-State: AO0yUKXiM184k6BUhJJ/XP9kTf2FQMOKBEgHL1VlKzERfppikSvLi27M 49+a6n3KqQGKaVajsfiymQEm3w== X-Received: by 2002:a05:600c:81e:b0:3e2:201a:5bce with SMTP id k30-20020a05600c081e00b003e2201a5bcemr5260351wmp.40.1677684260716; Wed, 01 Mar 2023 07:24:20 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z23-20020a1c4c17000000b003e2066a6339sm15726842wmf.5.2023.03.01.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1949C1FFC3; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Yonggang Luo Subject: [PULL v2 13/24] cirrus.yml: Improve the windows_msys2_task Date: Wed, 1 Mar 2023 15:15:53 +0000 Message-Id: <20230301151604.1948813-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230228190653.1602033-14-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 --python=python3" - - 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=python3 + --target-list-exclude=i386-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=1 check" From patchwork Wed Mar 1 15:15:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657814 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544793wrb; Wed, 1 Mar 2023 07:19:07 -0800 (PST) X-Google-Smtp-Source: AK7set/YuXdXp7unAC58VwMR918nkmRU7YV4yeoVbwIbLYVzwsaTt0wTVprNScIYRJeF/uX66xJL X-Received: by 2002:ad4:5ba7:0:b0:537:6416:fc2b with SMTP id 7-20020ad45ba7000000b005376416fc2bmr11937261qvq.52.1677683947347; Wed, 01 Mar 2023 07:19:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683947; cv=none; d=google.com; s=arc-20160816; b=VJeSvKMhyDDMX4CF8bNYbeFAqkeaiCSksjEdtw5CN6EJ3eW6RVFjdZjSsMd9wEFY2C h7FgmTR4Mz82aLQEf1ANtQTY9S6AovMG74+IKenDWLrn8fV9XA8FCHm80eRz9r3fbNK/ 1Svsw0kTQllKMh3gKhDBQ3e8Z6OjHkWK5Ng7ZY7aHc6BvV+dJbl6PJs4/zTtVk24vPxu mVzTLRWjmm/ofYp78l4c0xLaRhFO9gZCjJZtG+Z6eVOkSCEf5UtVj1vwXRX8/dHSIJ62 2tXICdfG2TNTo3e4fhRuCgWJNr5hL7uXQ51oZ2dC+4BbUX3OOnbiXdEIok414+nOa93K 72Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LmUrhgk0YSn7eAK1UZD+INIAeQ9KUq+cgoKOu+wodlw=; b=ad90GgGuosG4xYphgLDaS+yBepHPHiBz9EcIVWmX1UVS/hcojZ51BAMOvtdGciUpzz 3c22ltEQrRzpEsahef4JR78yQHVgx4E8EIUDzNydROytyZJmJCX/dsSFFxSfiWhsn1MN qQrabcbAm/ITfsncwoqZhTJAQdelngHb8XnJpIy+/hcF8zSrtVnjBuqVjWhRdaojWi0z jM/s0BlUeeHeJPHuUgNX6EJBt8l2pkROUdQJ8TQEt9hq0FKwJTIUSO1Gzkj/SwB0UtHW Wc4MQXZEFBnNlNC6xmhfJTGnt2P4F4oRQfuxicrckFyI+/R0NKBxDelK6w8fDUirat26 oqAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IfUdVQx7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bl13-20020a05620a1a8d00b0071f90a97a25si11057764qkb.491.2023.03.01.07.19.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:19:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IfUdVQx7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOCJ-0000Ix-VO; Wed, 01 Mar 2023 10:16:51 -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 1pXOBl-0008Ce-GX for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:17 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBj-0007eJ-Ce for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:17 -0500 Received: by mail-wm1-x334.google.com with SMTP id t25-20020a1c7719000000b003eb052cc5ccso11667390wmi.4 for ; Wed, 01 Mar 2023 07:16:14 -0800 (PST) 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=LmUrhgk0YSn7eAK1UZD+INIAeQ9KUq+cgoKOu+wodlw=; b=IfUdVQx7fJAROXgZ8cfWRfd6VzfyaU0hDHUskP3hejnstt+SwIEPyWWcPa08vNge2E 7Vr2iAOFetiO9vbDMC1MVH8q6KjCtvWDQi6qJNfOjoaUqFJzUeY7R4IjlGFVNU6NiE+A u3MY/XtljoMHSroqaeNeMtdGxANMg15BHFTBd5NEGJsbPbBDi0tBSsg4OLZYYnix98T0 8adQm9KD3Eo49M+MtnP5ECeTz4QIb9WukJbRDPNoXmO7mC4PfOH/FFJxENRSS+MQJo+x CTJqNEVSXe/FN09d0hpypuvNFkwPxBqsn0meRKY6O2j5G3rydAJ0OkRq+Go5eDvIqO3V oZ+g== 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=LmUrhgk0YSn7eAK1UZD+INIAeQ9KUq+cgoKOu+wodlw=; b=z3k5atjFOB1kb/YxioXVNtCqeAR/+oX1hs0Trj09k4PqNrLM+mJTYQ6/afOz6mb4hJ amdKfofwWybaOPKDp1VB7UHYGQeZx7Mve4pZ0kZF2DU9q/D5Hc+sV2xZJ7mVmmywP6l3 L3+XeJMKupZFcfScw+u0+FtWSQ2GENTeFGrSk1B1Q2FYsCFYo6avRuVP+sr/gfwAlb3D XtxL4xcB7TZpmxJ2KW544oFyaiaSkZdQPUDZhzpijMd1yCx+FPONprTAbxA2VlIjCSuh ZY4kGICxdULbGvUTemdtXhOGMBMSuPAV6TAYakwQ49icq6Jr+8b0qE5ISJtFgrj9zYQP W3KA== X-Gm-Message-State: AO0yUKV7ncxtVC/b0XnomKgn1sbc3UtGpCc+CK+AdtLxEtoE785ZPc40 gsXF87zmJcraMXW31T9E7tc/CA== X-Received: by 2002:a05:600c:4450:b0:3dc:16d2:ae5e with SMTP id v16-20020a05600c445000b003dc16d2ae5emr5334026wmn.32.1677683773906; Wed, 01 Mar 2023 07:16:13 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v20-20020a1cf714000000b003db03725e86sm16025067wmh.8.2023.03.01.07.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2E7321FFC4; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 14/24] tests/dockerfiles: unify debian-toolchain references Date: Wed, 1 Mar 2023 15:15:54 +0000 Message-Id: <20230301151604.1948813-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We use the debian release number elsewhere so fix it for consistency along with the broken comment. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20230228190653.1602033-15-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index 6c73408b34..dc9545857f 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -30,7 +30,7 @@ ADD build-toolchain.sh /root/build-toolchain.sh RUN cd /root && ./build-toolchain.sh # Throw away the extra toolchain build deps, the downloaded source, -# and the build trees by restoring the original debian10 image, +# and the build trees by restoring the original image, # then copying the built toolchain from stage 0. -FROM docker.io/library/debian:bullseye-slim +FROM docker.io/library/debian:11-slim COPY --from=0 /usr/local /usr/local From patchwork Wed Mar 1 15:15:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657809 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544051wrb; Wed, 1 Mar 2023 07:17:47 -0800 (PST) X-Google-Smtp-Source: AK7set88m7zK1gsHM2BODNu2Gy/NS36mMPT2nFh2ukyPGjsuD/LOxK2fEw9ZbO/o+ssKNBSkV+zI X-Received: by 2002:a05:622a:1306:b0:3b8:525e:15ec with SMTP id v6-20020a05622a130600b003b8525e15ecmr12211848qtk.27.1677683867043; Wed, 01 Mar 2023 07:17:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683867; cv=none; d=google.com; s=arc-20160816; b=Tex2CMwrlL1xfhl3fGnIBxGGelto5l81YRuPuK3g2awsf8gcoesjcdeR5P1qvT26Xb RZm5hQQtY3bgFhNUSJDTsVNmWkdB2OZQqNfgpYhDyJYoRDSdZvTlQOZJwpziuZwO7DTH DD81eCqbtYJNsz6zTmrfs3kMAHRGsQUdIz0/ldEsohyN/4T9i3n8k5wlrKdEcnQ9Vrzu i1u998Pu92hKmYEh3cHcstQM3BL08tZc2QeT3a3IqJAFb7Jvuo2NhmRhTNcLyEC2nyIa hBt7fxFhhrG28Jf1/rzrvAerB99r0JXWGjnxc5c1OGqJo2J/lnIofdg0rwYrlIl9aEIH 4sJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AlywfJTD3Rvj2Q10jhHFgc9EYa6EV7ps8ZtC4o22SlU=; b=fDGN35VUJXwrCpPXiQf7eEtJLIfn9CHPuHELMtVisGSi/5FxTeX9jZzgSdKwVMjGab VYiwr1JEG6npnLRtmG+W91QciYmbeqDOzgpIjuKcJB7uhjLpTUy1hbBDU9/XiFSvJp+u X+G9ORO0uIyeWIRwIHsTvytQPKFocSjkp7wvL0M28keGk5fG2OF+32HrQ3eEtjb6VmnH hXU4FLaIXkuh7u8LpguS8C8hZC5S1zSsxhDpePLp4t5AXtlu0gnN6DFTCTdh10/unfkl mr9Ws+0icnlSJhqC1FHxg09givvpTt4BFJHUbNu7eE1AZ04tBu31r9LfMSHsnBIEbTqr ubGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BBTzH+v0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t188-20020a3746c5000000b00706674af640si10640629qka.403.2023.03.01.07.17.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BBTzH+v0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBo-0008Gb-VI; Wed, 01 Mar 2023 10:16:20 -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 1pXOBk-0008BG-Jx for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -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 1pXOBi-0007dV-9u for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -0500 Received: by mail-wr1-x431.google.com with SMTP id h11so1853461wrm.5 for ; Wed, 01 Mar 2023 07:16:13 -0800 (PST) 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=AlywfJTD3Rvj2Q10jhHFgc9EYa6EV7ps8ZtC4o22SlU=; b=BBTzH+v0EBuhyiKJvSWVJ/lZvSRyXBeg4W5GGfjoS4dClYAxG0AgLE8TGq9PBp1pv4 QoZtcVRih6nvaCRdflvMisqz5zDcbfHrE59avARQeUCxEzSCh17zs/t5q++2vy2H2Mpm +Xo/N7LW7aOl98GDeGSe7OMZbOOaHG40Trir2Lab7W9wq+cnj9g9PafhkPfKuJlm6WVB 6Y8L3ug/HoD9gOsXcHd3trGtv8JNjRdnCTrCfDfgCCwuG6SqXiAysnqxng73bptHE0W2 G7ZYF9W9xaSC/9ABrWXdTK8LvQfDMAK0dDkKrewqSEmYOLhk6aHdu9R1DFqShGdCC0tZ v2Sg== 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=AlywfJTD3Rvj2Q10jhHFgc9EYa6EV7ps8ZtC4o22SlU=; b=QO2BiRigv2Swn78TNqZVGrcHB0Dx0B6PE9abMI8tXlL22G4AbMMjb1xqh9uTvxipJ0 4XsiyMEkNEVaML2hcAnqdUL7/R93rd/cZBiqYfXeclLPXbhRnxWPj32hfVuBUK5noIQD X3s4JlEwPyjAik/68AZODJFAvTnrlxSmeN4Xzmy1x/SShN8wKlh3A6PiBjizmqipcGtF wU/g0MUxmfOnuVbg7IHVuLQZVNMlcvjc3nlEzzf1WvOkH3AjX3MtCZGH5DNg+IVQ9KQ9 BejDgyA3887ng+SwZdpy0UDkBiF4IZHgM3BLs1Iqy57gsmWl7onRNAsg7bVd/0zQ7nSM XVIg== X-Gm-Message-State: AO0yUKW51zzLupWyiWT3ddWzUPODfTPNSdZ6PqH3H6a0PIKX7339zPEG iI2oIP8zvRrWDUUX8FUWPRPyCA== X-Received: by 2002:a5d:5111:0:b0:2c7:1755:30bb with SMTP id s17-20020a5d5111000000b002c7175530bbmr5229103wrt.10.1677683772869; Wed, 01 Mar 2023 07:16:12 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v22-20020a1cf716000000b003e1fee8baacsm20099468wmh.25.2023.03.01.07.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 450491FFC5; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Fabiano Rosas , =?utf-8?q?Dan?= =?utf-8?q?iel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 15/24] gitlab: Use plain docker in container-template.yml Date: Wed, 1 Mar 2023 15:15:55 +0000 Message-Id: <20230301151604.1948813-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Fabiano Rosas Our dockerfiles no longer reference layers from other qemu images so we can now use 'docker build' on them. Also reinstate the caching that was disabled due to bad interactions with certain runners. See commit 6ddc3dc7a8 ("tests/docker: don't use BUILDKIT in GitLab either"). We now believe those issues to be fixed. The COMMON_TAG needed to be fixed for the caching to work. The docker.py script was not using the variable, but constructing the correct URL directly. Signed-off-by: Fabiano Rosas Tested-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Message-Id: <20230227151110.31455-2-farosas@suse.de> Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-16-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index c434b9c8f3..519b8a9482 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -6,17 +6,16 @@ - docker:dind before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - apk add python3 - docker info - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - - ./tests/docker/docker.py --engine docker build - -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY/qemu-project/qemu - - docker tag "qemu/$NAME" "$TAG" + - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG" + --build-arg BUILDKIT_INLINE_CACHE=1 + -f "tests/docker/dockerfiles/$NAME.docker" "." - docker push "$TAG" after_script: - docker logout From patchwork Wed Mar 1 15:15:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657818 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3548376wrb; Wed, 1 Mar 2023 07:25:23 -0800 (PST) X-Google-Smtp-Source: AK7set+vcNaS9Nkj7Mb2ZNB9utEwZ3ZqYUoKrlNBi15TKqkYVgFbLQpqR7oh85Iyp68IrDH2Y1Df X-Received: by 2002:a05:6214:27ef:b0:571:428:73dc with SMTP id jt15-20020a05621427ef00b00571042873dcmr11790421qvb.34.1677684323313; Wed, 01 Mar 2023 07:25:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684323; cv=none; d=google.com; s=arc-20160816; b=Cp0OH7LQZFk4OS5rUSsEOFC5j9rjk7NZs/kXdlppyeV5l/ac8M4Zfx2UTfQinN29Wh /1PoBq/+z3fZ7qXPh9uJRrnZFrW8kVjuJwwq31rM0Y9bwvuK5cXw+l3QsAFXIfLsNY+x ngUIK+k19XgHLCGu5IIHaVxl3gGEOcPEZhmdfMRFCOqSfD4Y+WOwyAj48Adsat6SlXig DPMmDNUaUB0szDr8sb0fMnuz88vzvi6bgOsnKZ3Ujj4l1nbcXXuFukirzrTlseXNXsLg 6w1hq5F4vJBc5NHPL0vWg2ZXRqFiN+jJX/UoU804eKgrRNIO+Q3xK2bDizSnQlk+r9jo gQfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VU+h4Jn5F0O340fdlBYKwzTtZ82+fr2bw9CLNQZMJ+k=; b=ialXiExV1gpQKezYLagkyZDUZKsbb8ggTflGzT5DKh6R8GyIFWC3S7Xh0LexFgZWnD qgov58U6f4vIVhcVJdyl2yeW4mOoK671yjTBYEv18qrNbze+/89ciQNOaSGTCbju4sDZ gyWl3vAw0YyJOMP1/ew5KrjRJpbUF5+ZX3R6N/43qdDxsBC1UpjRlrruFgqrlokRQLeV eyUyFB5qnV8EeEYZMpDJrw6tdGrfOgu9fRcBFxkT+JckgEpoX2D3IX6jvHwJZ9ZDLNG9 hENCEuMjk1YOKIi2kc65oC1lAASR87WwzaYlUYY/EY5nO4XLr11xc7RGjY2tn4pyYWjP zqog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VxB1Qel/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u14-20020a05620a454e00b0073b83b0eccbsi12152868qkp.296.2023.03.01.07.25.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:25:23 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VxB1Qel/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOJy-0000wx-Nr; Wed, 01 Mar 2023 10:24:46 -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 1pXOJi-0000bA-AG for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOJd-00011o-CJ for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:29 -0500 Received: by mail-wr1-x42a.google.com with SMTP id h11so1882095wrm.5 for ; Wed, 01 Mar 2023 07:24:22 -0800 (PST) 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=VU+h4Jn5F0O340fdlBYKwzTtZ82+fr2bw9CLNQZMJ+k=; b=VxB1Qel/qphHjwyOcsc/1uZZbzdjP4rues2beQaZys69aa02p1mgMYNwqov0HiKLoz ltbOVd8UKV1VRV95c4MDToMDVJsKll8XeZR9Z2w5CM+5MJSoDh4jVQJ8GnUoGa6vo8ZP bziRQvvFRHGzCJGfYsA6TehX+wG2guJuJg44ps87/lrXifQzhwWONH48YgI7zzTZqbB0 fkbR2e4jVLbSKfTg+39QWpXn7qkyx6JEr7jNX5bty7foenoTiSqRUYX5VEIuMCoiWONr 4wbhIaPOn73wnpX5km2gaCDkZDNVvodM9xLBiuNk4/SbLzlccWlPt+oEeaj5T0tRXrVi OGww== 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=VU+h4Jn5F0O340fdlBYKwzTtZ82+fr2bw9CLNQZMJ+k=; b=qDBd9vqLTL5O2PvQMTGtn4+mJ9l0WcpJb4Um7s07CLA2sjCnX7V3FBJ6MvgQFYo/oN ap4kxYl3TWSNW4ok6+Wr8TxlXJjPYTk02N8jiN5CEbZj9mVCmDJDNHh66yGeYNUOBt4G E85PLDk/469xdjLVrXij4KVxPAnezdp/U6z7uA3IILU1UETxn5eEVPRBo+pFmNADPEH6 Fa5rpoC/KNAbNlOkOAp4llOso6mnuhEl16jzUbQJV+fR3uQifOE+lKLxOV1oeHZkBC0G gabncdj6+/yx6pPz9nrwcD81Ao/thdYJvA0dDQQuSV9rkCYMTy/SOrF65+yZcC2pTxyt RiBg== X-Gm-Message-State: AO0yUKWtNYOPiz++MLOTNkKWk8mNV7OdZf5kbdxu5zJRJR9pp+3xcauA 5G3xNZ8O2wU9WtmB/XRu0Etm5lP/po+0wA2N X-Received: by 2002:a5d:4ccd:0:b0:2c7:19ad:8141 with SMTP id c13-20020a5d4ccd000000b002c719ad8141mr5142025wrt.52.1677684261841; Wed, 01 Mar 2023 07:24:21 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n5-20020a5d51c5000000b002c70d97af78sm13163567wrv.85.2023.03.01.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5F70D1FFC6; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Richard W.M. Jones" , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov , Darren Kenny , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Paolo Bonzini , Fam Zheng , Bandan Das , Stefan Hajnoczi , Qiuhao Li , Laurent Vivier Subject: [PULL v2 16/24] tests: Ensure TAP version is printed before other messages Date: Wed, 1 Mar 2023 15:15:56 +0000 Message-Id: <20230301151604.1948813-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: "Richard W.M. Jones" These two tests were failing with this error: stderr: TAP parsing error: version number must be on the first line [...] Unknown TAP version. The first line MUST be `TAP version `. Assuming version 12. This can be fixed by ensuring we always call g_test_init first in the body of main. Thanks: Daniel Berrange, for diagnosing the problem Signed-off-by: Richard W.M. Jones Reviewed-by: Daniel P. Berrangé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Alexander Bulekov Reviewed-by: Darren Kenny Message-Id: <20230227174019.1164205-1-rjones@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20230228190653.1602033-17-alex.bennee@linaro.org> diff --git a/tests/qtest/fuzz-lsi53c895a-test.c b/tests/qtest/fuzz-lsi53c895a-test.c index a9254b455d..2012bd54b7 100644 --- a/tests/qtest/fuzz-lsi53c895a-test.c +++ b/tests/qtest/fuzz-lsi53c895a-test.c @@ -112,12 +112,12 @@ static void test_lsi_do_dma_empty_queue(void) int main(int argc, char **argv) { + g_test_init(&argc, &argv, NULL); + if (!qtest_has_device("lsi53c895a")) { return 0; } - g_test_init(&argc, &argv, NULL); - qtest_add_func("fuzz/lsi53c895a/lsi_do_dma_empty_queue", test_lsi_do_dma_empty_queue); diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c index 1beb83805c..4bd240e9ee 100644 --- a/tests/qtest/rtl8139-test.c +++ b/tests/qtest/rtl8139-test.c @@ -207,9 +207,10 @@ int main(int argc, char **argv) verbosity_level = atoi(v_env); } + g_test_init(&argc, &argv, NULL); + qtest_start("-device rtl8139"); - g_test_init(&argc, &argv, NULL); qtest_add_func("/rtl8139/nop", nop); qtest_add_func("/rtl8139/timer", test_init); From patchwork Wed Mar 1 15:15:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657824 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3549095wrb; Wed, 1 Mar 2023 07:26:51 -0800 (PST) X-Google-Smtp-Source: AK7set8ZCqrd6tDwqiSaW1BnZl/8L6sT2UzRKy+50hOdG9htmoZN6mNA17i0N1CQkudoyOv4z9ct X-Received: by 2002:ac8:7d04:0:b0:3ba:101e:88c6 with SMTP id g4-20020ac87d04000000b003ba101e88c6mr11208239qtb.48.1677684411176; Wed, 01 Mar 2023 07:26:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684411; cv=none; d=google.com; s=arc-20160816; b=LAIC6qmpnxk7uNi6Zb1iRk3FcW60WA3PdMQb24fF9FbRufOB+G/bYDY0rT9a1V1QR8 4FAgA7lGhCzmT600UTLvH0PAdAbYxmw5LeYAMEjhUJ/+g2aRW4c3WXxiSTVtjsCt4hnx fDQCwpUFUBoKF1aoYhkHajT/kTQoDFaI+APY7YAdbpg56lGk43mwSo7pTfUo3rTmtleR NH8YACrlZYhPfOGkWoQDJ38sCCz+xcQpEpzHy+jr6xM7N81sCRnLERUflA5138g7yAAv DDd/FP9M6SSj+Uo6cCb8PtMfhQHJTqDIlGmcdNMs4CA7A/7Dm9Y/qQpqIt+iybF2JxC7 eibA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mkocC7TUPUcXj7ll+UawvcjBLr7Elh98/8Jity3e0Lo=; b=Tx2/jUKyP3Kc2tqJ5e7OZyY0W07jvmeVU6BUIk8+FsInhO3IUw2tK7ugIU0R6sYT9w pBNXjceB3mFIPw5a2Gs0PrCw/aZP1T2EjJqbMu2NGDggtyYVQAdZA9c3qxr8+ecju5vH LJVCmp/tFb71XkcfvSLfoHl5ETHAqreKpHpgrlAtX0FZW2tsvIV95Qmu4v8ULvaACOjk K+cHR5Y6cp+6fDFlRhWOSlVT0pQ6bAAFPfhpuRgW/yjSCs3duA0KkTbvxDojJmx7Ib5M kfFaUAKMzFSykPTVqJaVaH+oTFyQZ3OO7vfNOTnVbteZPOKOjVpDnV3qZCp/ADbN0+6V baVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xACdqqHx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bn40-20020a05620a2ae800b0073b9e5fb99esi10633699qkb.105.2023.03.01.07.26.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:26:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xACdqqHx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOJr-0000nc-0B; Wed, 01 Mar 2023 10:24: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 1pXOJi-0000bC-DQ for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -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 1pXOJd-000127-DG for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:29 -0500 Received: by mail-wm1-x335.google.com with SMTP id k37so8866160wms.0 for ; Wed, 01 Mar 2023 07:24:24 -0800 (PST) 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=mkocC7TUPUcXj7ll+UawvcjBLr7Elh98/8Jity3e0Lo=; b=xACdqqHxQnILHAndgk8GRvdVp+IjQac3Hz8YUSo+1afLGVlYifP8tRysxJhGY6F36f eZHzwgJzLMYFOTMiVQgQYp/MLYMN22qYwUKHFjZlqNWHBl15daU+C3v1CjbLAkg0qKcm KKhJxZRxW7gnuns+P9hIeSgaZ1dz3RdEkGXvi4YpjagxPRWBNa1f0YnULbNbPWotY3kH tOqycUXimn+IXGPdB2DgWWX3peD0d2lJ65l8uBGOle7TZySrP9nkzWiuNKot39lb9PnA am+EV/ovmxkI4cUHH61bZuKAbmYfwSUdSengedWmH3EMy53A9L598q2BmhmK8a88dz9X pvqA== 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=mkocC7TUPUcXj7ll+UawvcjBLr7Elh98/8Jity3e0Lo=; b=KQJpK6syKN2GMAcNuiq3Aj4lVDmKU5XUHWBoxEJnNKzZRfoiI1539zzWvKn7Iybw8S B12oWLXDJkFp6WkghFeiEGTskLHlzrYSuzNys+PfvdoSYdPDne0kq+WCn/DVtAu7HmAV qD25yzIs3bjIjTLSVxuP+vzgw+dIv4QIXMYdhRd3JkXaWQ11E8ttx5pswND/KzCIu4s0 SgHh+HU7BBm/usqbwPfIntE7KmlntTaRjc8Xg1OGNVg2zE9IzG+8Xz/1FdcsHwRliJGh AcTrdsP3m5K1crFh4hZdZMp5yEbappd764dTaDRx3XX/nShqZHGJ5n8Hw9LjrKWA2GKU oegA== X-Gm-Message-State: AO0yUKUwsIDko5NRKOwRq9tCRhhHZlFj7pyEmc9anI7M9jGlVkISip01 IaRXNuMr5ImV52cYMpOn7cj1tw== X-Received: by 2002:a05:600c:511c:b0:3e8:35a2:6abf with SMTP id o28-20020a05600c511c00b003e835a26abfmr4942024wms.23.1677684263949; Wed, 01 Mar 2023 07:24:23 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m34-20020a05600c3b2200b003df5be8987esm21926423wms.20.2023.03.01.07.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 74C601FFC7; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P_=2E_B?= =?utf-8?q?errang=C3=A9?= , Paolo Bonzini , Thomas Huth Subject: [PULL v2 17/24] configure: expose the direct container command Date: Wed, 1 Mar 2023 15:15:57 +0000 Message-Id: <20230301151604.1948813-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In the process of migrating away from using docker.py to build our containers we need to expose the command to the build environment. The script is still a useful way to probe which command works though. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-18-alex.bennee@linaro.org> diff --git a/configure b/configure index 2a8a9be8a1..f5cfcd566e 100755 --- a/configure +++ b/configure @@ -1790,6 +1790,7 @@ fi # functions to probe cross compilers container="no" +runc="" if test $use_containers = "yes" && (has "docker" || has "podman"); then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; @@ -1798,6 +1799,7 @@ if test $use_containers = "yes" && (has "docker" || has "podman"); then esac if test "$container" != "no"; then docker_py="$python $source_path/tests/docker/docker.py --engine $container" + runc=$($python "$source_path"/tests/docker/docker.py probe) fi fi @@ -2397,6 +2399,7 @@ fi if test "$container" != no; then echo "ENGINE=$container" >> $config_host_mak + echo "RUNC=$runc" >> $config_host_mak fi echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak From patchwork Wed Mar 1 15:15:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657815 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544937wrb; Wed, 1 Mar 2023 07:19:23 -0800 (PST) X-Google-Smtp-Source: AK7set+kyMvfJFSG/HXhoYPI6m2pu2eFKVu2iOjFO6K9/yk4g5V0GpxmDp3cKDPKk8IxDIkVmVDr X-Received: by 2002:a05:6214:1313:b0:537:7bd7:29d4 with SMTP id pn19-20020a056214131300b005377bd729d4mr14118109qvb.47.1677683963809; Wed, 01 Mar 2023 07:19:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683963; cv=none; d=google.com; s=arc-20160816; b=wrPKI/6u9AkUcohb1M1FI0kGnQN1RUVk2OFmbU1CmY8O2OPlqfEA00agtgn7afhDH2 VIWcLHqmf2ZdJl6vQcqi5/unQNlHASbUFgQoqQ/lnxEFW2DZ5bThYIZaZ+dXox6EqCiU 4tVVilvVf5cHijVqia1e/cfjU9rLiHd13zfbxn2yLR0rJtxz+ZT8KGKxx/OxPWFGK6s6 J5P40kk4UYAeyXXqBI8LyqGvLaz8iwzztp/1ou3Ma32rrfJj5W+4RZjKGgKEaw75IZXJ Whs4uv+ITkuFYu9vVU79VMK97uA9YJjVObuLAvLA0iLxydxTP1ZCuP9F3yp3/sr+mDrJ RmUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vKVidY093QJYXdvE0+bPQ5lAt0S/UjiFPs5Xw8iCLlc=; b=jfvtRZ6xDcMnzOPl1YElgh/YFSmsVoZyEfYPFG7GWbxOO+ZOxAM/BbWcFx8h/oowkY 4LAINSloMxzDxlGI+FNUa71YHxoJeCirsz7oAK3wq3lyspT2g0rOTWQXvxTT6vbUi1me GINjIU09YXM5UlCBhnGUY4qMAncWo7ZTyAPnGqn1VzD9kc91NcNvr0m4P6T+L0QjJRnw aqrfUXuIyT1A9+0/VkzNyygXBQlc7e/pBI2IkbQ0JQ51BWCWzrgWK/ommQjUnKtcpurL vCHg0nI/Qmfi9ROKr4Jj9PKL8lpLA/lqKS+OCH11k00n/jsDUZI5rwM4AnIjYL2NwkJO gzTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ske9CZw1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w11-20020a0ce10b000000b0056ef806920bsi11318952qvk.207.2023.03.01.07.19.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:19:23 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ske9CZw1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOCK-0000J5-K2; Wed, 01 Mar 2023 10:16:52 -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 1pXOBm-0008Di-2x for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:18 -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 1pXOBj-0007e9-4T for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:17 -0500 Received: by mail-wr1-x430.google.com with SMTP id e13so2076366wro.10 for ; Wed, 01 Mar 2023 07:16:14 -0800 (PST) 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=vKVidY093QJYXdvE0+bPQ5lAt0S/UjiFPs5Xw8iCLlc=; b=ske9CZw1MkqGRf717QURBa+OTPlCktnz31agUUc8F8NrRRO1HlPyghH4llRa6Lmetz IPMwk/k21ld3iXZ7Ir+Hy6+OEL3ybyD/mhz6Qoj3iuYFQvnV9TIMHzN8lEWmkokvKqzz 6GQbKPMc/NwZcCciE85ueIsn6MnnAGVuKRUHhOEuUXN8c5GqJ5PAHF7jAyuz3mv3jVlk FArCDraYt+TfB6pnlRHFyVztqRBuZVtms2D6b8zdaBZigIfzMXZ8uWsqay25IgUvvQL4 MJJsEHcQ975WHwjXH1LpHH1cAXyuDGYKzAVCpJ5dMddWyiTDQ8VPi2W5ZPLBJ/mkb2nF EB/A== 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=vKVidY093QJYXdvE0+bPQ5lAt0S/UjiFPs5Xw8iCLlc=; b=76ZsiqfsfWafVyrM7WTOOgqQDzOZbRCB0qQfkVx++IxBnq2XmF9T2GTNeMOfQpz9Zh Hry5JLIXNuSyqBtLGMJUZhEPoSWoQAVpKjwUxY7U/nO5FV4ivXM5a9kz2cqMfTJeT/ul bADRPDL++8W8txcguevCSNUi55NP4O+FGOfk0Rv6w/xEV3t0yEcR1xxus3mTrgfCzNK+ 6KecjtR1mso2i4JRAda9VBu0971WDmq1UbR2AmkInQihxXiBHdQ/LiQB0hhyHcnsCasg pjuudRRGQCxZ80kTGYnwduwOyDDHbiV2ryiUY1Rto1wIr3mXvmawNy1SFyI7oRG/pNy6 zabQ== X-Gm-Message-State: AO0yUKUJHlhIsay6ZHxubLdxOEoGV8Vg4rAvSQiimC913dy1yeohgPF/ 9xDlbM2SBSOWXeIi1xEAt57zIA== X-Received: by 2002:a5d:6803:0:b0:2c3:f8b8:87 with SMTP id w3-20020a5d6803000000b002c3f8b80087mr4800574wru.25.1677683773624; Wed, 01 Mar 2023 07:16:13 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u4-20020adff884000000b002c70851bfcasm12869185wrp.28.2023.03.01.07.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B37561FFBB; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 18/24] tests/lcitool: append user setting stanza to dockerfiles Date: Wed, 1 Mar 2023 15:15:58 +0000 Message-Id: <20230301151604.1948813-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org For the cross-compilation use-case it is important to add the host user to the dockerfile so we can map them to the docker environment when cross-building files. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20230228190653.1602033-19-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 7589f6c6ed..799932bcc9 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -124,3 +124,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index bab67ccd41..d87a94b97b 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -138,3 +138,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3.8" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 856db95100..5d03b5c22d 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -169,3 +169,8 @@ ENV ABI "x86_64-linux-gnu" ENV MESON_OPTS "--cross-file=x86_64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu- ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index e3dba71ad5..febc46e700 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -155,3 +155,8 @@ RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap RUN cd /usr/src/netmap && git checkout v11.3 RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b00e9e9bcf..b9501a21bc 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -168,3 +168,8 @@ ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu- ENV DEF_TARGET_LIST aarch64-softmmu,aarch64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index fb1129f256..f21742ede5 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -167,3 +167,8 @@ ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi- ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 7a2b864a38..decdeda6f2 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -168,3 +168,8 @@ ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf- ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 5a3340e964..1df05fcf20 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -165,3 +165,8 @@ ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips64el-linux-gnuabi64- ENV DEF_TARGET_LIST mips64el-softmmu,mips64el-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 422fdebe8f..019b8dcaff 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -165,3 +165,8 @@ ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu- ENV DEF_TARGET_LIST mipsel-softmmu,mipsel-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 78d7ae6211..3ceab4c502 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -167,3 +167,8 @@ ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu- ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index d06ea3605a..6c216dde48 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -166,3 +166,8 @@ ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- ENV DEF_TARGET_LIST s390x-softmmu,s390x-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 5b66b0e256..63a0000936 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -101,3 +101,8 @@ ENV ABI "i686-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32- ENV DEF_TARGET_LIST i386-softmmu +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index b94fd63cca..531e539e85 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -101,3 +101,8 @@ ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- ENV DEF_TARGET_LIST x86_64-softmmu +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 8e06d080b8..4dd1fce890 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -146,3 +146,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 9bf9b50dad..f39e8a4d44 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -135,3 +135,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3.9" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 95d951953f..a6f7071351 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -146,3 +146,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 30b9e56793..6fea090f02 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -145,3 +145,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index cc9e34ac87..c0d7ad5516 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -53,6 +53,15 @@ def generate(filename, cmd, trailer): content += trailer atomic_write(filename, content) +# Optional user setting, this will always be the last thing added +# so maximise the number of layers that are cached +add_user_mapping = [ + "# As a final step configure the user (if env is defined)", + "ARG USER", + "ARG UID", + "RUN if [ \"${USER}\" ]; then \\", + " id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n" +] def generate_dockerfile(host, target, cross=None, trailer=None): filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker") @@ -60,6 +69,12 @@ def generate_dockerfile(host, target, cross=None, trailer=None): if cross is not None: cmd.extend(["--cross", cross]) cmd.extend([target, "qemu"]) + + if trailer is not None: + trailer += "\n".join(add_user_mapping) + else: + trailer = "\n".join(add_user_mapping) + generate(filename, cmd, trailer) From patchwork Wed Mar 1 15:15:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657823 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3549077wrb; Wed, 1 Mar 2023 07:26:49 -0800 (PST) X-Google-Smtp-Source: AK7set+LycldJsCpXDONIs6ARJY6slcRDG6Sqxzh5EmjO2fCMrubAX5xvr9262XsPNWlvS60dpOo X-Received: by 2002:a05:6214:20c1:b0:56e:c066:3cd2 with SMTP id 1-20020a05621420c100b0056ec0663cd2mr12967897qve.2.1677684409669; Wed, 01 Mar 2023 07:26:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684409; cv=none; d=google.com; s=arc-20160816; b=hNQLRTjGUqVRMw2dXG+S4s94t42v1de4miVbA+qNUFrfp4GmNTIPigQxQe/0qOqcgE WP4qfzxo5HCpPSekqXQLhfRjUc3kHEjah89zD53l4/7Jc7y0GOt/+R0mY77C5xh4Dhsz 9emBwENikYpBye1Em+lX5CNSVYNjbECVq7t4/QJslBm6OYt2dMT79+TLR6kk8BPG0wFR R2qnGvl7YpGQ/at7uqpr97Sxf7XvMflyjHU3IopFHRNwbu+fjZbcsSaPJsnyL8sWd1gG XBV1EG6fUthucIWv1q0jKpu0lcZveMMLvFhzIz47zdfKWwqPBdMjMf3yWiwUoatKUmWk 6Onw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9qPsxckS43QqdU4LjR0u39e6/QeXRK45RZ0C9QrqQ8M=; b=rc/dzP+3aH4AIZ78iTlW5W9oMqRqD2xlQHhs3J8KabqOOjfot1+Yo1BmYf2VQKYI+w V43hlSid4OObX9aPgFXLEt2accYjubMBmgaNeAA4EcAUcRmlna+03l5LhlimxnN560eO 5L2YKmxAHqkwW8uz20sZ9hBQ9Bf3dsnB2dn1qDI/WCMrvLtSXggfjPxq0+l8Q5YY01iY 8chTneSYmHfZMrSFidpcfbPhawmPw0DO2I6z8kyxbXcGx6G4qViRCSJERrOm1kEZhid5 w9WHmKWUNA16RExbsyKzfo99wekhMtDI+IvUY5sW323YbJXlJv0AiMj44YI6gUAjk8zh 6lrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qizKCIld; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j12-20020a0ce00c000000b0056ec21e1722si10554579qvk.110.2023.03.01.07.26.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:26:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qizKCIld; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOJr-0000na-0Q; Wed, 01 Mar 2023 10:24: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 1pXOJi-0000b7-4r for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24: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 1pXOJd-00011x-BA for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:29 -0500 Received: by mail-wm1-x32b.google.com with SMTP id j3so8831000wms.2 for ; Wed, 01 Mar 2023 07:24:24 -0800 (PST) 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=9qPsxckS43QqdU4LjR0u39e6/QeXRK45RZ0C9QrqQ8M=; b=qizKCIldWGYTnEdOzDMRfWQ+nVUCIglaZAZyc6+mameWoP3F+VqxVMl889D1BLGO+I Wzvxix8qVuD70ceTc8Ay2R6+CH+mV8a7ult3OLP8y4//euoB4qeQSyU0ROUWIloCZK4z JHqPUqvTikaECBD0MtOG1c4PpEMXWrJizqJg2//4lEkfutIDQVYnm8oZbjzIgWTBGqu3 1qgJqnWN5Ag66CE6AV1ABD5M4o2A5OeTKFoJzfvOfOQlmabtAn7WvLEVUG3LlAeaxJfc sAt058HSkOD1pHtVNR556b9/4/n8QOTG+BcIUiFrsNG6w9tBrI99x1NySHTEZp9ivCKt 292A== 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=9qPsxckS43QqdU4LjR0u39e6/QeXRK45RZ0C9QrqQ8M=; b=SBKfda9vKg/HPl9RN0hb6rI2hHXcgpCLQ6xZZx6R7rcMGM6iEWoT+4IhbEqpwWF4SX KiFN7t+S/oG95WwTATfUSstfvzhmPSyvAp2rnW6Xv0cGey4G/pkjMXTTmllasAgoXykp Qhoc9P2iG0ZK+oBXZfYm3WBoZh2R1xmpSD5GhoAoW9IC7mi3I/Kdz8SI0MImRXWdviUv dgFAZcKM/3+Xd5FcjHGJ+HGq+RXl0krLiPiPO7Qg42L2xwfUMj62TumNm3zSdYt6abhX hxumNXTGHSXiaBtoMCvwYVFQCXgqbOb+q6BcEQrMbGp0BqMOKerRVGr34cQWp7VMxG5O GH8A== X-Gm-Message-State: AO0yUKUYAzylO8PkM2PvkBHh6+JZU8/rWRxE1v3iB5nxXan1pPNS/2tC Q4OLzGwdwlE+omNvfPps7U8tAQ== X-Received: by 2002:a05:600c:3555:b0:3ea:f6c4:3060 with SMTP id i21-20020a05600c355500b003eaf6c43060mr5235625wmq.18.1677684262960; Wed, 01 Mar 2023 07:24:22 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z14-20020a05600c220e00b003e11f280b8bsm19492249wml.44.2023.03.01.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 04ADB1FFBC; Wed, 1 Mar 2023 15:16:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 19/24] tests/docker: add USER stanzas to non-lci images Date: Wed, 1 Mar 2023 15:15:59 +0000 Message-Id: <20230301151604.1948813-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org These are flat but not generated by lcitool so we need to manually update them with the `useradd` stanza. Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-20-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 8dc5e1b5de..981e9bdc7b 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -61,3 +61,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker index 4eeb43c78a..7fa7bf1bde 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-alpha-linux-gnu \ libc6.1-dev-alpha-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index 8a0d748343..5308ccb8fe 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -33,3 +33,8 @@ ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-f RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL" ENV PATH $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker index af1c8403d8..dd47ffdfa4 100644 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ b/tests/docker/dockerfiles/debian-hppa-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-hppa-linux-gnu \ libc6-dev-hppa-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index a8e8e98909..9d957547b5 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -25,3 +25,8 @@ RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2022.05. ENV PATH $PATH:/opt/cross-tools/bin ENV LD_LIBRARY_PATH /opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker index dded71c5d2..25dd1c1e68 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-m68k-linux-gnu \ libc6-dev-m68k-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker index 7b55f0f3b2..2cbc568ed1 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-mips-linux-gnu \ libc6-dev-mips-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker index afcff9726f..ba965cf564 100644 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-mips64-linux-gnuabi64 \ libc6-dev-mips64-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-native.docker b/tests/docker/dockerfiles/debian-native.docker index 8dd033097c..abac7d7cd7 100644 --- a/tests/docker/dockerfiles/debian-native.docker +++ b/tests/docker/dockerfiles/debian-native.docker @@ -47,3 +47,8 @@ RUN apt update && \ ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS ENV DEF_TARGET_LIST "none" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker index d6b2909cc4..23779413d3 100644 --- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker @@ -16,4 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libc6-dev-ppc64-cross \ gcc-10-powerpc64le-linux-gnu \ libc6-dev-ppc64el-cross - +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 3daf93968a..803afb9573 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -50,3 +50,8 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu- ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker index e5f83a5aeb..6e631295bc 100644 --- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-riscv64-linux-gnu \ libc6-dev-riscv64-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker index d48ed9065f..6bd8171d33 100644 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ b/tests/docker/dockerfiles/debian-sh4-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-sh4-linux-gnu \ libc6-dev-sh4-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker index 8d3d306bc1..1ef735f223 100644 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ b/tests/docker/dockerfiles/debian-sparc64-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-sparc64-linux-gnu \ libc6-dev-sparc64-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index dc9545857f..687a97fec4 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -34,3 +34,8 @@ RUN cd /root && ./build-toolchain.sh # then copying the built toolchain from stage 0. FROM docker.io/library/debian:11-slim COPY --from=0 /usr/local /usr/local +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 82e4576485..cfd2faf9a8 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -41,3 +41,8 @@ RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/trico # This image can only build a very minimal QEMU as well as the tests ENV DEF_TARGET_LIST tricore-softmmu ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker index 2f11b3b7bc..082b50da19 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -27,3 +27,8 @@ RUN for cpu in $CPU_LIST; do \ done ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-de233_fpu-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dsp3400-elf/bin +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/dockerfiles/fedora-cris-cross.docker index 91c373fdd3..f2899af410 100644 --- a/tests/docker/dockerfiles/fedora-cris-cross.docker +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -6,3 +6,8 @@ FROM registry.fedoraproject.org/fedora:33 ENV PACKAGES gcc-cris-linux-gnu RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index f58b64dc3e..14c1fb2c93 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -32,3 +32,8 @@ ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig RUN dnf update -y && dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/python.docker b/tests/docker/dockerfiles/python.docker index 175c10a34e..383ccbdc3a 100644 --- a/tests/docker/dockerfiles/python.docker +++ b/tests/docker/dockerfiles/python.docker @@ -15,3 +15,8 @@ ENV PACKAGES \ RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Wed Mar 1 15:16:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657811 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544541wrb; Wed, 1 Mar 2023 07:18:42 -0800 (PST) X-Google-Smtp-Source: AK7set8i4XW3jGn8GDPXLaGst//y4G/t6/AgBQhvX/Xxh30VTkrM0azESSb2pRpKrtcggon2yzuV X-Received: by 2002:ac8:7e96:0:b0:3bf:d9d2:484f with SMTP id w22-20020ac87e96000000b003bfd9d2484fmr12769602qtj.11.1677683922244; Wed, 01 Mar 2023 07:18:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683922; cv=none; d=google.com; s=arc-20160816; b=TRCqhTl/b0RFA2G9noF8CD47c7uVi+lHPnYFx8waUd3bE5e8oXyfKE7Km5JmJLBSAV sTxu4jaAosoxoaz5vyeGYfby3BlJWYn5cZ9hS2t5iIKXKN1oNNd03P4KFxDpnDPk08An I6ql1+KUzOtifzgJ8/tezsSxOohqvjAGVtnn4TFuQ7CZDfNKrDIRYNPh6kVYZDXCwcHh WCbwyQ+b0NZx9adnw8p7NKOj7QOtXFHJrqzpNddkqD+vYEEmr+82uQEFyvwxm/H8wuOz JezHjs8YuC31pX8oFzraLtae8Zb7LvoYo+ZL6+YceURSa00II4KRYKYN/U9bJIT9ulMK YpkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EN8jHOsJL7HsIRzzEInBqqC6JRvvYJxy3yPDQt3Nxvo=; b=f4b5sjOL77H8z1XGakCqwvnC5Q4eQB5dR5CO6gsIsAjf4d/4NqfEAcrtJAl+AdeUL+ aRdIVWQ9Ephs//AABZTGkk1997KPsAuguW3ZjcG/O3kppu90vI1sZY083CbEwBcTEEby +mzwIc1HcVLRGHkFUeDI7LdF3WwaW3gk4Ed5r2a0UqJ4ckHS/19plabC/KWwyk6Hpd3d sufOQvYdAScny2H3XboylyL+ucBmFSkdfxHOaE0s3zfGoAP3GMYQG0eMCNQBreRxF40b 7u9jLr4x/YKJrjgQ45Ae53DVlX274xv2CS5sHlAzBZ2LHnEMijRIWZc3Uh/tdgdWqJrc 8rAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vu/qk0Ys"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t8-20020ac85888000000b003ba260db124si11577919qta.594.2023.03.01.07.18.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:18:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vu/qk0Ys"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOCH-0000GL-Ea; Wed, 01 Mar 2023 10:16:49 -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 1pXOBk-0008BA-Co for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBh-0007dO-Tt for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -0500 Received: by mail-wr1-x42a.google.com with SMTP id e13so2076285wro.10 for ; Wed, 01 Mar 2023 07:16:13 -0800 (PST) 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=EN8jHOsJL7HsIRzzEInBqqC6JRvvYJxy3yPDQt3Nxvo=; b=Vu/qk0YsaFyQkQy7Mwk/CHc0/R05ALk3FwnlGEybhN1B/yeUKMVVUIOW1bYsEFc6IL de3V3foZo2+iCaJK+jms3qQsCew1UziReml81XvMFhXHx7TIzXEkV3NFdotUTU0j/GO9 RY9YibqOzjNG2UpmKdux10zVmIlI+CkZ/3YmGCWVUIJDeVjIbLv1LW03j8iy2ZYJ31Y8 iFnVsUWQ2WFf1D/MGzo9s1ztHIyNhSmgCbwXnrVJIUjrcwNjFq4lfU4EN9h1TxApZsJN HxhZ+JTHPAeT8/NPudPANk9iIlwScbMCSL8z5M6Y94dfrTZsUI2j0UmRvcrD9n6/TuOQ WOGw== 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=EN8jHOsJL7HsIRzzEInBqqC6JRvvYJxy3yPDQt3Nxvo=; b=gYjobkawDaOep1oYzG9DXRvHnEhHYhr18mEtxkGIqiuio7FeT/+YlTnT7N9oCx8DVC jTbhPKmb7rx6RBlIFfBDLnjTPnf5z7YdPTl17JePswQWFv+OpISGyPwAhNg28xrEYL1F 310KYNskv2iz3/ucDYARpitdtP69pysKIKR/WPdnjGtzHeWIAlhBo3EQdEXEqT9jHf/r U6wfYqbN+dmkf2qe2V1mj+gSje/URdy641qGn3PP/Hxx4nxqV708N9o5rLSRYXHiAPPf uhXDm+wcIJUGVQyQvw8u0j5sPF/Zaw8pQgggCbsq1oWUYcOTlwkSo8usP4Mjt8rwdQlO UR2A== X-Gm-Message-State: AO0yUKW6z5kVerD8XRiIqkWdq/Xl3BZauK17/ScBUOwBevX8glOOAc1/ wA1YGReY/GUd0853dtHoeXzHbjfFCHix9jc2 X-Received: by 2002:a05:6000:11c7:b0:2c3:eeeb:b2f7 with SMTP id i7-20020a05600011c700b002c3eeebb2f7mr4919068wrx.62.1677683772535; Wed, 01 Mar 2023 07:16:12 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c2-20020a5d4cc2000000b002bfd524255esm12689441wrt.43.2023.03.01.07.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1AB9D1FFC8; Wed, 1 Mar 2023 15:16:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 20/24] tests/docker: use direct RUNC call to build containers Date: Wed, 1 Mar 2023 15:16:00 +0000 Message-Id: <20230301151604.1948813-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't really need stuff from docker.py to do the build as we have everything we need with a direct call. We do rely on the dockerfiles being able to tweak the UID/name mapping as the last step. Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-21-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index bfb0dcac21..680afff952 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -7,6 +7,8 @@ SPACE := $(NULL) # COMMA := , HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) +USER = $(if $(NOUSER),,$(shell id -un)) +UID = $(if $(NOUSER),,$(shell id -u)) DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles ifeq ($(HOST_ARCH),x86_64) @@ -14,6 +16,7 @@ DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) +RUNC ?= docker ENGINE ?= auto DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) @@ -35,15 +38,17 @@ docker-qemu-src: $(DOCKER_SRC_COPY) # General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker - $(call quiet-command,\ - $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ - $(if $V,,--quiet) \ - $(if $(NOCACHE),--no-cache, \ - $(if $(DOCKER_REGISTRY),--registry $(DOCKER_REGISTRY))) \ - $(if $(NOUSER),,--add-current-user) \ - $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ - $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ - "BUILD","$*") + $(call quiet-command, \ + $(RUNC) build \ + $(if $V,,--quiet) \ + $(if $(NOCACHE),--no-cache, \ + $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \ + --build-arg BUILDKIT_INLINE_CACHE=1 \ + $(if $(NOUSER),, \ + --build-arg USER=$(USER) \ + --build-arg UID=$(UID)) \ + -t qemu/$* - < $<, \ + "BUILD", $1) # Special rule for debootstraped binfmt linux-user images docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker From patchwork Wed Mar 1 15:16:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657820 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3548491wrb; Wed, 1 Mar 2023 07:25:34 -0800 (PST) X-Google-Smtp-Source: AK7set+t2Mis14MrxDBb6qmbZErVH28TA67EzUVZoFMnHVjw8AXYyrLhxzG1E5T0G4llogeGMv6e X-Received: by 2002:a05:622a:30b:b0:3bf:d9f3:debe with SMTP id q11-20020a05622a030b00b003bfd9f3debemr11170819qtw.59.1677684333895; Wed, 01 Mar 2023 07:25:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684333; cv=none; d=google.com; s=arc-20160816; b=ojvlKydLAXhvvYQR9K+4dTdD9jWeJbbewMeB3XTII1iF1MR9ja0pTbDRbPYftDEYQo DZRSVLmPpZEUFqGq0Qnp744DaKrHpYCc4Pl7hY1LdBOGNxGSoepMGPxKYfXWBN4gl5nC rCzN/zOgWtMvlfhZjgiejQMHluO2iUs/OuSINS0fntuZI0TPG0OJjYpXwHxMzO9UTT2o 2am6AEN2UMDL7jFy/cKq7CtliUCr60lNaPqCEgq/jqn1H7Sm8v1/ACZrmCNeiwTYD+0k YEOWSSzpnnXLtzeJhyD6N19r97D5bHqZvnWP7LiibX5JWarP/bdSfxzzPD4lrEacGW5K a3FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=b27PuU+rWXLWaY/k0uD9Sf2qA77t6AY1zW87Orqns2o=; b=qm9ugH6L6GEkZk9AcjBsNoefCGJJceQ+bjhcIz0NUKR7k9/gqX5JzHpQllsMPQdnT5 x12J4gQWPo42fZya5bvFaYKGKD0DuS1KVdfWb4VCCjp8XBM115VW2ZZi4vBBOyDQfSYs de5T/H2Ae1UReJP4oln6CjE+2W/Mjg4itWICjvKDqRn/GcYP4ejaiD7RO5RKxuyGX8rH yGdx8U8E9Gp6m5z4w3zfwNpixyjxR93HlxMzzO1+MyooNkeaKkK7wlHUODtWPMaOKEAM RRtSA6/CN2B+XJoOP1JiuHoM49ua2Q2XjTrR56UVSdvExI0AgkQ7VgnbjHJ7WIghRe2Y TPgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SvCyZrz1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v19-20020a05620a0f1300b00705de7c6879si13175178qkl.321.2023.03.01.07.25.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:25:33 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SvCyZrz1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOK0-00018w-Qe; Wed, 01 Mar 2023 10:24:48 -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 1pXOJi-0000b8-5e for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOJd-00011r-Du for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:29 -0500 Received: by mail-wr1-x42e.google.com with SMTP id e13so2104146wro.10 for ; Wed, 01 Mar 2023 07:24:23 -0800 (PST) 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=b27PuU+rWXLWaY/k0uD9Sf2qA77t6AY1zW87Orqns2o=; b=SvCyZrz1TIaWLSn7SMpXEyBZSXrPkefQGzyGISTKqrR7mvO2zRShttLndxtcejQ7v8 IcXWrDvAK+W0vOgZE3vc6YSArtjtu0woh7yxj9bfy9pw12RWNJwec2HBenUOb68uolUq fezwuhDvyBn9LcUGgDoW1YfX9R2brk6/RSl2XMGSqdL39z0ihLsu+IXMguDaPFVEGUi8 VQXEM9kpPwVaVWwfg1diuP4iPgKsPwaXnh/AKVEDnT0/3Wz2R9TXADPYFlTomk9QeHgM LY9uKKKlKOtiSL2xQFoGtSG8avZ+LXM/96ZVGW75SuWv7iClf7yDQFgYFnYJxn9hdUyu Y2Ig== 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=b27PuU+rWXLWaY/k0uD9Sf2qA77t6AY1zW87Orqns2o=; b=r8bOACErlBv1yM+N4dk+a8JBycdLA+Ju3mHLLm9jM9ytFMw1LA/Fr2/Ni3FwJ260cq 9z7rF2hA33AQMb6Eta4PTqS43oBkWez8yuvBbd8jYfzfihw8IYuZVlhIouq96awRAa4J JAlGsSMenEyUE+5krxT+yJXOKGFhD3PajTvJ1uXUCn3fZnBLWe3/FCamr4xvBdTBZjU/ T0jC8ScH/CS8HKeryU8wOEHpwOf+FmETwYDG7YvjmSSpUceVKschb4u+/nzKe5sAUAZV hw+16YJABlxgj+HUhLuAkxii2AnPMGop1nwz8IXq1fbZC0e3PTsnmil8uezrtAhcyYzl xrQw== X-Gm-Message-State: AO0yUKUatqfnzpNlbmePZofhHoGZHWs0m9KglnsusqBl5xKa4E2c5Sac SXdHNjDDICZnod0bI3QN3aYmgA== X-Received: by 2002:a05:6000:1f83:b0:2c9:b9bf:e20c with SMTP id bw3-20020a0560001f8300b002c9b9bfe20cmr4545122wrb.2.1677684262159; Wed, 01 Mar 2023 07:24:22 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t3-20020a5d49c3000000b002c5804b6afasm13240400wrs.67.2023.03.01.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 306EE1FFC9; Wed, 1 Mar 2023 15:16:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 21/24] tests/docker: use direct RUNC call to run test jobs Date: Wed, 1 Mar 2023 15:16:01 +0000 Message-Id: <20230301151604.1948813-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org If we build them without the script we can certainly run them without it. Reviewed-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-22-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 680afff952..54ed77f671 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -224,8 +224,9 @@ docker-run: docker-qemu-src $(IMAGE) --executable $(EXECUTABLE), \ " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ - $(DOCKER_SCRIPT) run \ - $(if $(NOUSER),,--run-as-current-user) \ + $(RUNC) run \ + --rm \ + $(if $(NOUSER),,-u $(UID)) \ --security-opt seccomp=unconfined \ $(if $(DEBUG),-ti,) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ From patchwork Wed Mar 1 15:16:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657825 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3549108wrb; Wed, 1 Mar 2023 07:26:52 -0800 (PST) X-Google-Smtp-Source: AK7set/UCyfVO8jHd+R9QLzregw6KJKB2jk4UTgrHqFITj126em62zUQRk5QvnylUYkGbTyOGIfn X-Received: by 2002:ad4:5ec9:0:b0:56e:af49:7a1d with SMTP id jm9-20020ad45ec9000000b0056eaf497a1dmr13844373qvb.24.1677684412517; Wed, 01 Mar 2023 07:26:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684412; cv=none; d=google.com; s=arc-20160816; b=Sucrdh874+FeWY3V2/pA5TCyPSw5VVbMgpdxFtrYB34EExgLIbUooTAFy/odfTuUsJ qVX4t0RQ61G0bZFiUw3Bqv/Fsmfjofm0QYwO7+LECgpjCThO3jpQHPNzURVBLs4sXjCH 4BsK+fmr3GmdqP2YBcs4xfIPbuehV7WtRH2RoudPN/BT+6K0PYj7/9LZIOats+JPQM/a u+W7GZfyDoKgXP9OfbzkCC32gVAIWlBVk820iIvYToDO/nkykLmzUtix4fn1QKS4yDZf HnWEvBqH/QekqW0F6/UzkW4u1admw6W/JijBWEd5HBYr5a6GBz+y08DdHGBTZDPCdA/e ps7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Sev1Wyvh2APuLTMQRXQQpXcLdUgOJPObJBk7YzpzIb4=; b=TXqnZOsuJWkqUBEToaUYeqAzQwaTDy3F34tbJiaFjiUDibO56MuMEW+0j2ul61GI8z lzI4t3zJ163RC0hYlGPCOVKIzrbqspZv6pF7qbyu8CaEQLSmSakg4J7IzWpVqhkApDuB OFDXK9XhtEL44I1gjryX09WN8Yw1hgiAE6Og3OHYr2J/301gANod2W/ExuEYxbu2CBey S5x72VJHHbT44UdmXsT2WzOtBysi7yjQgxYImh6sDX/mfyA//qJyqTcyTYuVkLk+WeXN FvAjPnwXsYu1iPrpFEAYTS4nxniG++z2w8Ppxbi6I14PVBjKgW9WrnTg29q7ml7um7OU q+WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nXckIAUl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t1-20020a0ce2c1000000b0056b64b4fd87si12271792qvl.44.2023.03.01.07.26.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:26:52 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nXckIAUl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOK1-0001BG-Cu; Wed, 01 Mar 2023 10:24:49 -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 1pXOJj-0000dU-PI for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -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 1pXOJh-00012D-DT for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -0500 Received: by mail-wr1-x431.google.com with SMTP id bx12so10461251wrb.11 for ; Wed, 01 Mar 2023 07:24:25 -0800 (PST) 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=Sev1Wyvh2APuLTMQRXQQpXcLdUgOJPObJBk7YzpzIb4=; b=nXckIAUlwxMVw9xQm9uy7mxbi302KC5BCPWSAA5rL3poBRuLbCRhDygIcMOMWHpyOc 3As6rbd1iVcGsIRIi7+qbeqGehpxdbZIQmKYxVdqEPTiN59OVpxMOr4taVXBOFF9/Sxr VSEutP0+/glyUv5WH0zgQHUxRmN2fnjljPBA7EJO+yetrflmGEFOHVuuraQuQccHKpsY 90M49Uz6R0116cQaraUhnYvowz0pjZahce2oG8hfnvjI91qO7EcX+ArvsWGK++oifbOY 4m8r2F3S5cwEZ8GIIbIpuN+tVHf5+Ymd0WPRqDoFJMyKzRguGt7Jk196HCCDeZPU53bc KwIw== 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=Sev1Wyvh2APuLTMQRXQQpXcLdUgOJPObJBk7YzpzIb4=; b=c/Uxb4iyQh9WOL2dk5YO01r99Yr1JyDyUFtB/6oxmR7hhBq2fZV0eG6HhIZZ/GStRo Sbyd9spekCuH/cdnDmihRnvzEWJR/3zUsi8WFcsBbERrRKOyQzqmtlU5kRndMpuNHbz8 PQMf9ieVuxhWvfYNtXGeky2VxcB5yeoPY4I3lPxACdITSJt3loXwpDVui1znCUEPXjex gEsJuGf68L/VRUtflhEZnvBRKZotbunA8uFjgXYg2XKu4vPANBAPcAfJ83cEqbXSgTB0 HLjnclcBjyK0JbEo1rc/uwSwebtIHRnfCTwVEsp6U09PrHiul5+RSR4lAWqHLJpsOy28 oVmg== X-Gm-Message-State: AO0yUKUILCw8bKvctzNLCO1b/1PXrDd87AckKE9ve8JUIjS09lNPCm4X EvNgLIUBPnK2+98fdaMvVuMGRw== X-Received: by 2002:adf:f9c9:0:b0:2c8:9ab8:85f9 with SMTP id w9-20020adff9c9000000b002c89ab885f9mr5811572wrr.40.1677684264663; Wed, 01 Mar 2023 07:24:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a2-20020adfdd02000000b002c3f03d8851sm13182560wrm.16.2023.03.01.07.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4ABAB1FFCA; Wed, 1 Mar 2023 15:16:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 22/24] gitlab: move the majority of artefact handling to a template Date: Wed, 1 Mar 2023 15:16:02 +0000 Message-Id: <20230301151604.1948813-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org To avoid lots of copy and paste lets deal with artefacts in a template. This way we can filter out most of the pre-binary object and library files we no longer need as we have the final binaries. build-system-alpine also saved .git-submodule-status so for simplicity we bring that into the template as well. As an example the build-system-ubuntu artefacts before this patch where around 1.3 GB, after dropping the object files it comes to 970 MB. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230228190653.1602033-23-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index cb96b55c3f..a6cfe9be97 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -25,6 +25,22 @@ make -j"$JOBS" $MAKE_CHECK_ARGS ; fi +# We jump some hoops in common_test_job_template to avoid +# rebuilding all the object files we skip in the artifacts +.native_build_artifact_template: + artifacts: + expire_in: 2 days + paths: + - build + - .git-submodule-status + exclude: + - build/**/*.p + - build/**/*.a.p + - build/**/*.fa.p + - build/**/*.c.o + - build/**/*.c.o.d + - build/**/*.fa + .common_test_job_template: extends: .base_job_template stage: test diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 43f9e4a81d..44b8275299 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -2,7 +2,9 @@ include: - local: '/.gitlab-ci.d/buildtest-template.yml' build-system-alpine: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-alpine-container variables: @@ -11,11 +13,6 @@ build-system-alpine: microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build CONFIGURE_ARGS: --enable-docs --enable-trace-backends=log,simple,syslog - artifacts: - expire_in: 2 days - paths: - - .git-submodule-status - - build check-system-alpine: extends: .native_test_job_template @@ -36,7 +33,9 @@ avocado-system-alpine: MAKE_CHECK_ARGS: check-avocado build-system-ubuntu: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-ubuntu2204-container variables: @@ -45,10 +44,6 @@ build-system-ubuntu: TARGETS: alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-ubuntu: extends: .native_test_job_template @@ -69,7 +64,9 @@ avocado-system-ubuntu: MAKE_CHECK_ARGS: check-avocado build-system-debian: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-debian-container variables: @@ -78,10 +75,6 @@ build-system-debian: TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-debian: extends: .native_test_job_template @@ -114,7 +107,9 @@ crash-test-debian: - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i386 build-system-fedora: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-fedora-container variables: @@ -123,10 +118,6 @@ build-system-fedora: TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-fedora: extends: .native_test_job_template @@ -160,7 +151,9 @@ crash-test-fedora: - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-riscv32 build-system-centos: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-centos8-container variables: @@ -170,10 +163,6 @@ build-system-centos: TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-centos: extends: .native_test_job_template @@ -194,17 +183,15 @@ avocado-system-centos: MAKE_CHECK_ARGS: check-avocado build-system-opensuse: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-opensuse-leap-container variables: IMAGE: opensuse-leap TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-opensuse: extends: .native_test_job_template @@ -339,7 +326,9 @@ clang-user: # Split in three sets of build/check/avocado to limit the execution time of each # job build-cfi-aarch64: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-fedora-container variables: @@ -355,10 +344,6 @@ build-cfi-aarch64: # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 timeout: 90m - artifacts: - expire_in: 2 days - paths: - - build check-cfi-aarch64: extends: .native_test_job_template @@ -379,7 +364,9 @@ avocado-cfi-aarch64: MAKE_CHECK_ARGS: check-avocado build-cfi-ppc64-s390x: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-fedora-container variables: @@ -395,10 +382,6 @@ build-cfi-ppc64-s390x: # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 timeout: 80m - artifacts: - expire_in: 2 days - paths: - - build check-cfi-ppc64-s390x: extends: .native_test_job_template @@ -419,7 +402,9 @@ avocado-cfi-ppc64-s390x: MAKE_CHECK_ARGS: check-avocado build-cfi-x86_64: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-fedora-container variables: @@ -431,10 +416,6 @@ build-cfi-x86_64: TARGETS: x86_64-softmmu MAKE_CHECK_ARGS: check-build timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build check-cfi-x86_64: extends: .native_test_job_template @@ -564,7 +545,9 @@ build-libvhost-user: # No targets are built here, just tools, docs, and unit tests. This # also feeds into the eventual documentation deployment steps later build-tools-and-docs-debian: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-debian-container # when running on 'master' we use pre-existing container @@ -574,10 +557,6 @@ build-tools-and-docs-debian: MAKE_CHECK_ARGS: check-unit ctags TAGS cscope CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools QEMU_JOB_PUBLISH: 1 - artifacts: - expire_in: 2 days - paths: - - build # Prepare for GitLab pages deployment. Anything copied into the # "public" directory will be deployed to $USER.gitlab.io/$PROJECT From patchwork Wed Mar 1 15:16:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657821 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3548496wrb; Wed, 1 Mar 2023 07:25:34 -0800 (PST) X-Google-Smtp-Source: AK7set8sK2TEVTzEmPBUTnQLkVsJ27vf8m2apiTUU79mzU206m/Jq1GKTUIf/LNGwXZ1RD1PS4hO X-Received: by 2002:ac8:7f0c:0:b0:3bf:b614:bcaf with SMTP id f12-20020ac87f0c000000b003bfb614bcafmr11959701qtk.67.1677684334110; Wed, 01 Mar 2023 07:25:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684334; cv=none; d=google.com; s=arc-20160816; b=XlF5M6gOtELylNpKPwtT4Do7VKQLTA5JylJYE5fTqBUqthlrpDe+abrskWic+Ar39W 42Fnh/zWof9X+4JWGcGzLHdgETzI7UKj4PCh2KLHxu3rLhNu8gfZpAj0XX62CYckoXxr zd5JU3jMiGReIOO9eD4bXsRJs9NgRiYB+qxGlLeECiDAi7AMX90FzjHC8wCkKxi+9YuL yqb/NTJjefkAwRkFPwA8p+2ozwOti9o1ejxjJEZ6xva/8ZQTjzbekh5ZPIKFQicjYe0K OnCnvV2vFcafNaGA34ZKNi8r+vlzMJZ/rUIQJbff3iDtXDedz2Eus65ryv7tWC3i15/6 N9oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=txYhMg114MuWu+mDxJO3nxECBkO8YFyp2bhffaxD6dw=; b=tzt2pbt6zxaccZtRFsjPwvIVfHHJRuoGZDAUIiMhw/1zicpFju18jkmoh6Eq8Q9dUR LPY2dPs1FebAaGg0CNR+unKhu+Nrwo9s4wwRyr5BsDZLRDmImoHw3f5MveNqPKbwflJM PP4fBF09dos1j+A/WIH6xqs9q6+KDgj22D67R0ySjJP+GTVtfPQow3YQENr9g/hREsfu y2XE/5ZcyEnSMdY5/Z7ldeVxvcdak71iNrWyvrwtIIiSkXDDr9L4yAQBOmztRa5GwJqQ ld00q+2MXTKjWIyGS++CLXrsbt+9qRWlQ8sCsfixA9T0XbuWtG7yQrzQDJbPyeyIPW7q tN2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kkmLzX9X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o7-20020ac87c47000000b003ba3a9cc7f3si9376968qtv.419.2023.03.01.07.25.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:25:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kkmLzX9X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOJy-0000uB-44; Wed, 01 Mar 2023 10:24:46 -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 1pXOJk-0000fT-G8 for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:33 -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 1pXOJh-00012K-Rm for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:32 -0500 Received: by mail-wm1-x333.google.com with SMTP id d41-20020a05600c4c2900b003e9e066550fso8066743wmp.4 for ; Wed, 01 Mar 2023 07:24:25 -0800 (PST) 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=txYhMg114MuWu+mDxJO3nxECBkO8YFyp2bhffaxD6dw=; b=kkmLzX9Xxf+5KJD4LwVlTtDnmybvcHSDrVie0FjTF8Zfasto78StLxIXIraWnwgVKa Q3T4Shv0C3d9tK0L6hL1jG8649VQpbkmyNpaI+4WEGbOY1hG70sV04tnuFHD82cM9uzz ReltnhuoVRfHG79dLcxUay8G9xUcSoPF6rTndLqul0C5pTZVtbPjOmIlJamAULMqtAjF 4qZePRgVwI7HW68uASCGRA5D7/jZczQnQLQRd9UBMcW2AmgfE7+QTAaCoGsMh5OGvD5K KNfheN4WeNfoL5bwNflukAr1BDtC3GSLfmoPKm+r5tV9YuauoO7lRePer8SJvBtQioS8 W5oQ== 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=txYhMg114MuWu+mDxJO3nxECBkO8YFyp2bhffaxD6dw=; b=bE24SyaOL7s0hpjxWPOZfD4p5ZaJxiSZ8PaGnnzksqYMJ4uJLS42nyvCdPDh8k3LT5 4c4RjyhG6k5YgZkBAGMFnbY17g0mSQQRWmIT8GUutQfZ+4Us3wLOKM/xUR21n9cu15BJ KifMWdBj4823cfyLmpmRtt0QF0drfzG+ON+3iPx7Xw2TWFYUOdK43QTxZ+BHBY69l6II gQ75rlrjEfieeLHgF5fTYP3GM7RM8tKGL9xSTQwgc54OMIU5wSITUaOuUb+RpHTHyHV0 U85paBF04RwNyAIm68X12AasgPhNWNPpEv49CyzJpfhoD/f/cuisyejQ8is1r8pV9+si b5uA== X-Gm-Message-State: AO0yUKXd7NrAzQzaw1+kZ7VPV6AHMFh67RwlA9belLDgVGxJ7Wp2Zxyq YdBC3DThN00JK4SJuENh1RZhJ8aQf+PYgXfG X-Received: by 2002:a05:600c:329a:b0:3db:5f1:53a5 with SMTP id t26-20020a05600c329a00b003db05f153a5mr5839011wmp.20.1677684264992; Wed, 01 Mar 2023 07:24:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ja18-20020a05600c557200b003eb0d6f48f3sm18931314wmb.27.2023.03.01.07.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8B9241FFCC; Wed, 1 Mar 2023 15:16:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 23/24] tests/docker: add zstdtools to the images Date: Wed, 1 Mar 2023 15:16:03 +0000 Message-Id: <20230301151604.1948813-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We need this to be able to run the tuxrun_baseline tests in CI which in turn helps us reduce overhead running other tests. We need to update libvirt-ci and refresh the generated files by running 'make lcitool-refresh' to get the new mapping. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230228190653.1602033-24-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 799932bcc9..81c70aeaf9 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -110,6 +110,7 @@ RUN apk update && \ xfsprogs-dev \ zlib-dev \ zlib-static \ + zstd \ zstd-dev && \ apk list | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index d87a94b97b..7e3a6217ae 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -116,7 +116,8 @@ RUN dnf distro-sync -y && \ which \ xfsprogs-devel \ zlib-devel \ - zlib-static && \ + zlib-static \ + zstd && \ dnf autoremove -y && \ dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 5d03b5c22d..afb1cbd046 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index febc46e700..28e2fa81b1 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tesseract-ocr \ tesseract-ocr-eng \ xfslibs-dev \ - zlib1g-dev && \ + zlib1g-dev \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b9501a21bc..b4f7a7f903 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index f21742ede5..4b4191f824 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index decdeda6f2..c9b6b2e563 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 1df05fcf20..cfe4f9a0d7 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 019b8dcaff..8e521fc9ee 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 3ceab4c502..b1b8277f3f 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 6c216dde48..af39568ce5 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 63a0000936..1fc4c987f7 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \ tesseract \ tesseract-langpack-eng \ util-linux \ - which && \ + which \ + zstd && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 531e539e85..39a0617a9d 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \ tesseract \ tesseract-langpack-eng \ util-linux \ - which && \ + which \ + zstd && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 4dd1fce890..e030c5fb1e 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -130,7 +130,8 @@ exec "$@"' > /usr/bin/nosync && \ xen-devel \ xfsprogs-devel \ zlib-devel \ - zlib-static && \ + zlib-static \ + zstd && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index f39e8a4d44..8e9500e443 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -113,7 +113,8 @@ RUN zypper update -y && \ xen-devel \ xfsprogs-devel \ zlib-devel \ - zlib-devel-static && \ + zlib-devel-static \ + zstd && \ zypper clean --all && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index a6f7071351..aa2f5ca7b4 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -126,7 +126,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tesseract-ocr \ tesseract-ocr-eng \ xfslibs-dev \ - zlib1g-dev && \ + zlib1g-dev \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 6fea090f02..3f7d30e5d0 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tesseract-ocr \ tesseract-ocr-eng \ xfslibs-dev \ - zlib1g-dev && \ + zlib1g-dev \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 1c3e16cae3..232f41f160 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 1c3e16cae38407d0782dc94080d1104106456fa4 +Subproject commit 232f41f160d4567b8c82dd52aa96c2bc3a5b75c1 diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 2854748f49..af3700379a 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -116,5 +116,6 @@ packages: - which - xen - xfsprogs + - zstdtools - zlib - zlib-static From patchwork Wed Mar 1 15:16:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 657822 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3548985wrb; Wed, 1 Mar 2023 07:26:39 -0800 (PST) X-Google-Smtp-Source: AK7set/zVrD0T7iUWaMCCfwFdr2lmbQBA8UGp2UP9vL2sC8zeGbk9R/0f1RQK1W/6TRDDoxRl44z X-Received: by 2002:a5b:590:0:b0:a2c:77db:d3e4 with SMTP id l16-20020a5b0590000000b00a2c77dbd3e4mr5804433ybp.39.1677684399495; Wed, 01 Mar 2023 07:26:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684399; cv=none; d=google.com; s=arc-20160816; b=tftTZ9JPee8AIwuc/h9BW2ynVOiQPTRgRaxV4u/M1GwpDklBKqOUr/nrF2BradgM/Y TE11f08oY/F0DHDwgE3rO8/8LOxpOfwTB1J9o8d8Vc3H7fKlxeGwpF8JyvTKWsj+Ou+W 7AhMk7GCigsBwJyCcmHZP9rlwhq1QPJh7h6q3Cdx3Matek1Qc86UJVPllWeY3Gtlz4U8 XleKPrMZbEa6BViMynHOwEgcKiqrN5lPO6MxniNBoseOqsHmaCzxXYuaGD330QX2VUii NrsS/CMiFkqxCQkYcFn2jXe317tDBR+rcIKY0mNSk1sWiIXer0Bt9un5CM7bJnVystiH QONw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+bjdMgi7gvKJmRoe4Wj6ZmFFnB2BlsJgdO9jIRLczPk=; b=o7YhAUjohTRhzOPeGAasDP92wkig/5LEmCudD2jTscZFGL4j+2NI6zpYOoNN0pzRpg 9gM8qIhec8EDxF/m6IJy7hcVvmYqCVeOSXoub8g0/a8Imb1wM61IRELtDzu0TdXNseC6 kALDlckcPbcn5oqJj0GQFZcm1HqsK7rjCouulDOXwaOFb7ZMDPNxKq2n0bofSZd4WJPu XQ22LdEkZLsve7Pv5w5xgYvwplpQgiXQbuIxNXyPMQmPBr/cV2M1y4P54KG5HfJzbS+6 duWcqsHQQlJX5mZdt1HjBZ9Zu2aXxZvWD0vLaZr872AcIgHHPPCKop3WaD08YHO869R3 GLRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PUtQ/14v"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m127-20020a375885000000b007416f83da7dsi10530180qkb.285.2023.03.01.07.26.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:26:39 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PUtQ/14v"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOJx-0000qy-9R; Wed, 01 Mar 2023 10:24:45 -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 1pXOJi-0000bD-LK for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOJd-000122-EF for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:30 -0500 Received: by mail-wr1-x42c.google.com with SMTP id t15so13622646wrz.7 for ; Wed, 01 Mar 2023 07:24:24 -0800 (PST) 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=+bjdMgi7gvKJmRoe4Wj6ZmFFnB2BlsJgdO9jIRLczPk=; b=PUtQ/14vuZDs4oPIIDZMINW3b8BqXVFAXcMs858I8jb5x8Pel7FgOmH3Z1oNf1Fd3p +gtokKb0iLXVWGINB9itNwSXnIHmJUDuUyEq3DYTfchYzU+S54vtS/hFwBpxLPL2a3L2 epzjKA32TYmOgwnvkiq7ywFpj9DILpbhQcB59TrUQ6PV1PzsO9YrCgsCjZ7NIHBUOU0l j+P/iRCx+QHBgLUKqykEG4YVJmNlxzhQ9OCeyg/XPGvLs4QbNQ4KFtCIFB+TfR47JIun ntL4bS/LVRT+t49qo8j5LOJJ/qJWmrP8vAQRgboDmG+mszWTAcOKRsvhLkxrazM0/ZnT 2tGw== 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=+bjdMgi7gvKJmRoe4Wj6ZmFFnB2BlsJgdO9jIRLczPk=; b=e7DMSvesTdCEqtHfEWHrEj0saj4qeo4s+Qa0ZRiYoU4R1v1mNf3BXvjl0jR80FL4Nh vKuvezM7Hy6c5betDi12PpZEXWLFx8iQrNwn35QHjM3P5tg0jYDVMhvr0XSLCKthwJtA AwAqFUJ/VM/X93Oef3RY8RtVAahrEsztm3OFhO917z2LZHJXrVZT5qpvEmAagfZZvu7D 5pSogXjL3M86o/bDtZHXTyggq1+l4tsyzKPD7YaCviXPRPX7mDeNOks+rF+/Hv+DJeu2 dwKhC6huseR0l323SMk1SaFPzfJ/Jhpzj7teN46Mck/1LKLxHDxZzd3wzpBGSosLbdHe NrWw== X-Gm-Message-State: AO0yUKUc7s3Y6kkjBzWfvBHR8jqdW87FtX0Ca97qTN+haKN0keFZPW2J I5zwMbZFVdn9DnGjEgc2XEqOHg== X-Received: by 2002:adf:d0d2:0:b0:2c7:7701:2578 with SMTP id z18-20020adfd0d2000000b002c777012578mr4205335wrh.54.1677684263448; Wed, 01 Mar 2023 07:24:23 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k28-20020a5d525c000000b002c556a4f1casm12782987wrc.42.2023.03.01.07.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A21861FFCE; Wed, 1 Mar 2023 15:16:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 24/24] tests/avocado: disable BootLinuxPPC64 test in CI Date: Wed, 1 Mar 2023 15:16:04 +0000 Message-Id: <20230301151604.1948813-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This test is exceptionally heavyweight (nearly 330s) compared to the two (both endians) TuxRun baseline tests which complete in under 160s. The coverage is slightly reduced but a more directed test could make up the difference. tests/avocado/tuxrun_baselines.py:TuxRunBaselineTest.test_ppc64: Overall coverage rate: lines......: 9.6% (44110 of 458817 lines) functions..: 16.5% (6767 of 41054 functions) branches...: 6.0% (13395 of 222634 branches) tests/avocado/boot_linux.py:BootLinuxPPC64.test_pseries_tcg: Overall coverage rate: lines......: 11.6% (53408 of 458817 lines) functions..: 18.7% (7691 of 41054 functions) branches...: 7.9% (17692 of 224218 branches) So lets skip for GITLAB_CI and save a few CI minutes. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230228190653.1602033-25-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index fe0bb180d9..be30dcbd58 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -84,6 +84,8 @@ def test_virt_kvm(self): self.launch_and_wait(set_up_ssh_connection=False) +# See the tux_baseline.py tests for almost the same coverage in a lot +# less time. class BootLinuxPPC64(LinuxTest): """ :avocado: tags=arch:ppc64 @@ -91,6 +93,7 @@ class BootLinuxPPC64(LinuxTest): timeout = 360 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_pseries_tcg(self): """ :avocado: tags=machine:pseries