From patchwork Thu Jan 19 18:04: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: 644098 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359180pvb; Thu, 19 Jan 2023 10:05:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXvATIVfHWdkEb5RU1tNKkV//O0tMH5A6IBMQS4s8Ty9bobHw62PZpDlgENYZpDgtGAXOsQ4 X-Received: by 2002:a05:6214:3202:b0:4d7:45fb:f5ac with SMTP id ms2-20020a056214320200b004d745fbf5acmr17465248qvb.23.1674151505747; Thu, 19 Jan 2023 10:05:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151505; cv=none; d=google.com; s=arc-20160816; b=NtHGMaFhkkd7lgb6wZ6I87JqCullSCfwq5GxzWJImBoWnLGCOyMhxPzGX1BNboXofB /TBHtbL23eOEb+MrAK+XPHCsC8Tjlx8ke3PzeotZr9puqo0mpWCd0c177DyaRG+du8OG +eoSVHsMuHzYgWdmhG8VqvfuH7x9TPT8da3oC91Y2fecdFCA6H48tOlwQKQKBUS96gwM KQy3dxl271BzaflwrNa1g7uAgp2V7LfUUnYjbEN9hnnrfpLLP9L+L7P3xPz1OYYzXwml y7OLn3sUdO9ZRVIcNKDPymFGrmLDZfdNb6h8G2a87YSlAOp4Cn/xD5YTpfiqZkYQLGsr 1qyw== 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=bkRhIgXl5AItP6ba03zv87lTI4x9mQkrreMEEEjOaX8=; b=C1P3DwuJltKqcoR1/3zCVjXhzwQfDvLHmm6Wb4ivyw31C+QCFjMgrYgwUmFY8guTjZ 5hKQw88TzOn5KIFLlGz9yzo4nZyyfKQcniG5Xv3ed8yn+t3rgGBySV2cPVkeNu6eJVRd vWEHLTlYRxVUevMN4iE+pd5nA1ST0ItuAnszKxRZGNoziWop1cDIa+gn7iE7nnlT57Sm Pr2zybAyxv45toHX1eYDMBID+9CVyG78Fzr+fNWkzzvFAG6jO+zCVDHSQL34Mi5E9LO2 5y0OYwxFjVzhSz6FNhBFMJ2cGE6Mqk3lEg413WCP898BxHJqlWVVY9qQV9DkgnEXQr9n mjZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UaVie0rL; 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 iy9-20020a0562140f6900b004bb607cf844si23948201qvb.134.2023.01.19.10.05.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:05:05 -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=UaVie0rL; 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 1pIZHB-0003Ji-Uh; Thu, 19 Jan 2023 13:04: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 1pIZH2-0003Hw-LV for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:29 -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 1pIZH0-00010v-5S for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:28 -0500 Received: by mail-wm1-x334.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so1882648wmc.1 for ; Thu, 19 Jan 2023 10:04:21 -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=bkRhIgXl5AItP6ba03zv87lTI4x9mQkrreMEEEjOaX8=; b=UaVie0rLUqSQn9ihEe0+qn9YqJxEUsAHeQ/3SjWKGQ7MXV224Mb4vN4vaEQjfZQUTx VqfK3dID9MZVUoUtdsCMBVcOpxYgRy+raCxEGtwt6AKEt9XUlUGdb6DFW18gnx5z0IGv /DM9NEMRCpyLXvVMvEH2oxZYdQh46x256Rnr5YZDSFvPSf+4WQdm0hJ7g9xtO7Dq//ft ywRmVG1m4xQb6izmsDcehiM564ODmkF0xr77OsnJ63FQ+OoyCJ5cfPHiq+Z2VOoM1Qrh yNIdPdhNrz+H7FNM5pgRGpNfHOJxtqXS4c4Vy3AZ9ImX54RhQk1cffTZpX/6gmWrbJwk R7fg== 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=bkRhIgXl5AItP6ba03zv87lTI4x9mQkrreMEEEjOaX8=; b=qAFwWpu8RIncoDC1TyPpV+S5IjdlrnJXbfYPuxOtNNGZMMdBasgduW42UQEUPPE74I 2uStijUPNhN0nfHGLOaONIsevhp7trUnRymRceNQourDsbY9eGKQuQagvHCuT+cQbjuz IZ4UVJ9G93aRSZuTz3cbKIr6/Cs8qFqaWSZnzfRl6+J06KiJaV18mzBE7C5ET/WoZA7w VZ0wuTDyF4juowx+0qWqvrKaoFF6nhvrUYVXt87qvMwa3hJJ24QEuk4lijwhsGO99Aq1 ZQFmg29n8U3vc4sEuweqFdt+rQ2XqTBoORcF/HbUiuzZytDziHYVmo1h7EhHnfhQd9fg D26w== X-Gm-Message-State: AFqh2kqLr911xnnUzD5CoKOyvtsHBBRGd7NhiDrJINOkRSYewvwXB+qi ep4wc6omLHJSV9vmgYJV9w6qBA== X-Received: by 2002:a05:600c:a4d:b0:3db:1d6:16f7 with SMTP id c13-20020a05600c0a4d00b003db01d616f7mr7365626wmq.23.1674151460670; Thu, 19 Jan 2023 10:04:20 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bg14-20020a05600c3c8e00b003b4cba4ef71sm6949648wmb.41.2023.01.19.10.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 919F31FFB8; Thu, 19 Jan 2023 18:04:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 01/18] scripts/ci: update gitlab-runner playbook to use latest runner Date: Thu, 19 Jan 2023 18:04:02 +0000 Message-Id: <20230119180419.30304-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 were using quite and old runner on our machines and running into issues with stalling jobs. Gitlab in the meantime now reliably provide the latest packaged versions of the runner under a stable URL. This update: - creates a per-arch subdir for builds - switches from binary tarballs to deb packages - re-uses the same binary for the secondary runner - updates distro check for second to 22.04 Note this script isn't fully idempotent as we end up accumulating runners especially during testing. However we also want to be able to run twice with different GitLab keys (e.g. project and personal) so I think we just have to be mindful of that during testing. Signed-off-by: Alex Bennée --- v2 - only register aarch32 runner, move service start post both registers - tested on s390x --- scripts/ci/setup/gitlab-runner.yml | 56 +++++++----------------------- scripts/ci/setup/vars.yml.template | 2 -- 2 files changed, 13 insertions(+), 45 deletions(-) diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 33128be85d..95d4199c03 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -50,60 +50,30 @@ - name: Download the matching gitlab-runner get_url: - dest: /usr/local/bin/gitlab-runner - url: "https://s3.amazonaws.com/gitlab-runner-downloads/v{{ gitlab_runner_version }}/binaries/gitlab-runner-{{ gitlab_runner_os }}-{{ gitlab_runner_arch }}" - owner: gitlab-runner - group: gitlab-runner - mode: u=rwx,g=rwx,o=rx - - - name: Register the gitlab-runner - command: "/usr/local/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" - - - name: Install the gitlab-runner service using its own functionality - command: /usr/local/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner - register: gitlab_runner_install_service_result - failed_when: "gitlab_runner_install_service_result.rc != 0 and \"already exists\" not in gitlab_runner_install_service_result.stderr" + dest: "/root/" + url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb" - - name: Enable the gitlab-runner service - service: - name: gitlab-runner - state: started - enabled: yes + - name: Install gitlab-runner via package manager + apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb" - - name: Download secondary gitlab-runner - get_url: - dest: /usr/local/bin/gitlab-runner-arm - url: "https://s3.amazonaws.com/gitlab-runner-downloads/v{{ gitlab_runner_version }}/binaries/gitlab-runner-{{ gitlab_runner_os }}-arm" - owner: gitlab-runner - group: gitlab-runner - mode: u=rwx,g=rwx,o=rx - when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' + - name: Register the gitlab-runner + command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" + # The secondary runner will still run under the single gitlab-runner service - name: Register secondary gitlab-runner - command: "/usr/local/bin/gitlab-runner-arm register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" + command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" when: - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' + - ansible_facts['distribution_version'] == '22.04' - - name: Install the secondary gitlab-runner service using its own functionality - command: /usr/local/bin/gitlab-runner-arm install --user gitlab-runner --working-directory /home/gitlab-runner/arm -n gitlab-runner-arm + - name: Install the gitlab-runner service using its own functionality + command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner" register: gitlab_runner_install_service_result failed_when: "gitlab_runner_install_service_result.rc != 0 and \"already exists\" not in gitlab_runner_install_service_result.stderr" - when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' - - name: Enable the secondary gitlab-runner service + - name: Enable the gitlab-runner service service: - name: gitlab-runner-arm + name: gitlab-runner state: started enabled: yes - when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' diff --git a/scripts/ci/setup/vars.yml.template b/scripts/ci/setup/vars.yml.template index e48089761f..4b355fb80f 100644 --- a/scripts/ci/setup/vars.yml.template +++ b/scripts/ci/setup/vars.yml.template @@ -1,5 +1,3 @@ -# The version of the gitlab-runner to use -gitlab_runner_version: 13.12.0 # The URL of the gitlab server to use, usually https://gitlab.com unless you're # using a private GitLab instance gitlab_runner_server_url: https://gitlab.com From patchwork Thu Jan 19 18:04: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: 644097 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359170pvb; Thu, 19 Jan 2023 10:05:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXvejm3sRNgxlVNSuuVHHz559jU8H439n3QzffEWLy1qenXUoyAPmjvdQndGzK7zGdohxfg9 X-Received: by 2002:a05:6871:299:b0:15f:bcc1:990d with SMTP id i25-20020a056871029900b0015fbcc1990dmr464890oae.15.1674151505197; Thu, 19 Jan 2023 10:05:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151505; cv=none; d=google.com; s=arc-20160816; b=izB8pdo2rOlbM5Q4E2T3OmR38ttPdT6sLyvzlDKrO+bY+680E6cMIjN1GJah08jhFB gzF/gxO42nOLXUS1iErGJYA+DW5IyGkVHcytOFP1KbQOsmxp0QUlfMPk014FLb2KOI11 STexeM+upZB/2p+8zAUjH02UotuS95jlm7Q2sYkLTHQl77X9n1LgRQt8WbDvw4O25YhT yIgLcuQZI5FWrdsfYuoBm7AW0iiEwCSfBA+kQROwQvUlIPxw9rSTtzu9C/5YzfvVeffC YeC6mk2YgVBSsNIu4pbloUT97NEYj0QtuGscR7H4tmy/chAcmlzoWXRhdJz5+sSkpIwr U7zQ== 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=U39jLFPoVGl6SC7W57LZvwPqPrIa2zguvlEGBzL8cVM=; b=Lf+ltOlURZQUdlhz6Fij6/x+BDuP4VzC0pa/1DZ8r4bhyrppB2TBrYxhLb1Uaos/5y KISHZ3yivCF+CA5HgRPnpmfcruj/2bfHCIf0/U/8OP3XVlUji47qfmI2GECt/varSxp5 eYNUtGBL9A2Pn+98wfUxRmE4w2tmtcwTuF9E5mlGo9m9eNFPbYzJo98BA9hG9tM2+Ryk HriYNt+7j/pSsMvIpvaQTgzKF2HMs0dBXwcdSINY2CqrzA6/IHiBAQ8p5XVeOlDsELMC mv1It4hdOy1MguVmqbV7domsuTmXcVTkU3RqphMW0O5aHyII8YKpGfdvAHWEBZN+O+q3 GdHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dxqi6WNf; 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 bs20-20020a05620a471400b00706b3a0fc25si4602063qkb.683.2023.01.19.10.05.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:05:05 -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=dxqi6WNf; 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 1pIZH3-0003IL-UO; Thu, 19 Jan 2023 13:04:29 -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 1pIZH1-0003He-Ht for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:27 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIZH0-000110-1r for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:27 -0500 Received: by mail-wm1-x329.google.com with SMTP id g10so2205902wmo.1 for ; Thu, 19 Jan 2023 10:04: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=U39jLFPoVGl6SC7W57LZvwPqPrIa2zguvlEGBzL8cVM=; b=dxqi6WNfUgd1AWjf6fXDDCtUU/mu50PsV5otZ2DEvt/3sWGxRmaGLNSmevLwTJ5GAr i78zpv33R+HmcRGTq3Pzgq0ye8zm9SSd5ZweWOV3zo/x6UOoyUT62bJEt02H+060QQxT EBO6SgSkazB9rxmAWtwulyCW/ZsfAQn7TDYnW7j2VOFblQmR6enM+0h9eJuJ+iR4KmO4 jB7w0hgMNHwee/qmVUjx87jCdc7DkbdjkBIQDkjuMGyiyKERoyWaKECbmdMItij1uO/w nKzYJiYmMrKMwApl8DthGkXYsefaACvbzOdx5IddmHD34ry40kfKUjStRwNistFCpXzc XJZA== 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=U39jLFPoVGl6SC7W57LZvwPqPrIa2zguvlEGBzL8cVM=; b=1Cka4TtC5US9y6KJWoXz5ET13VtzyqdQ6/GD6zwZ2UigdPKf0ufNKBeD+Cmaogi2R4 dYIFg0TEBL9HgGEBs5/ZkVu1lv9BNp9K+iTlc/SuXZqdDLxoL8DDnhbfaR1cf7UPzGgv I0+Uk6rut3jXFLSwoIjZN/JHiqpR88SYFcqvDK07PPC/OuoKDheo0UGyZiDoHZhDoXup nXPEc427N433fxKRXOw5qci/U8JQeE9Ktd6askw3tN7p9cMlyeoUWvSnVZg4jAMYZEDa bc0QZ27yV8tlNUOoSPkSpjNDx+lUoKGLC4VW8SZOvANzhfNcOAimiPooZDVGrb/f05FA tgJA== X-Gm-Message-State: AFqh2kpuG3mf+S52tWMNgTP5sOoz+PXPzkRv9F7kWNwnlNhOBSFCkkys f7hll1FfxTb9YInvFMK9VezHPQ== X-Received: by 2002:a1c:f310:0:b0:3db:15d9:1485 with SMTP id q16-20020a1cf310000000b003db15d91485mr6118348wmq.39.1674151461482; Thu, 19 Jan 2023 10:04:21 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o16-20020a05600c379000b003db15b1fb3csm4952823wmr.13.2023.01.19.10.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A84171FFBA; Thu, 19 Jan 2023 18:04:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Mark Cave-Ayland Subject: [PATCH 02/18] gitlab: add FF_SCRIPT_SECTIONS for timings Date: Thu, 19 Jan 2023 18:04:03 +0000 Message-Id: <20230119180419.30304-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Mark Cave-Ayland Suggested-by: Mark Cave-Ayland Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/base.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 69b36c148a..50fb59e147 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -6,6 +6,11 @@ # most restrictive to least restrictive # .base_job_template: + variables: + # Each script line from will be in a collapsible section in the job output + # and show the duration of each line. + FF_SCRIPT_SECTIONS: 1 + rules: ############################################################# # Stage 1: exclude scenarios where we definitely don't From patchwork Thu Jan 19 18:04: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: 644110 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp360401pvb; Thu, 19 Jan 2023 10:07:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXuUfrZALAQocNkVcG0lltHmbrPA9zUV1DZpLMtjPmwX8nADlyHEfJOJjeJ7AV0UpyCXxVgp X-Received: by 2002:a05:7500:3c09:b0:f1:ffda:b30e with SMTP id lt9-20020a0575003c0900b000f1ffdab30emr1181821gab.21.1674151629983; Thu, 19 Jan 2023 10:07:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151629; cv=none; d=google.com; s=arc-20160816; b=ASHr1lpTPyl9fNUh3sPlSbpwxd0rLMA/q4YvqIi/0eXEhYAIb/MrNkKwYyct1ZKf4b Ix9I2YmkMXXIEznwzkBlQ+VC7ZEuwvOOGb4iokYN4C3dxNMQ5IWqA6r0hZywl5jGb8AC 0IK4qyqBHmETUXTzbgawso/lODBdKfvHV/hUL9oAAwnDlfaSev2GRb7DUfJZrZYooybd /DKNIvdrC/qr1LiRyLXjaLNnMEBR4z1hJFBhpi+lnLAF3HiBv2NdlV3sXCZNIJQf7mIO Zcdk4MH2vkkh4tFPRiMido+eDpwtiRzvyYSpi5m+w6eqIAnoPiEAVA+uJ80oKDr01Ibj ceLg== 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=nxoWU4Tw6BX+PJ5ddbeFgfV335pZMDd265PyUGg07yo=; b=MOFUvCjU+pYs0Rq1/e7syDz2naiKX0PRLVT0qIAZJf3JUlqPp8qcExphQX8X6WuePy XV/1FWLEFvCOTXQr2CxLNWOkvQ4NmMhF7vAUh0UnTS5IQ5CCpXt+dlpF/nLRokGJqYOP n5CjFgmqYmgcP+qcgXLIgewaUwHHT0h2x2Mso0KxarjGcrWGZCdtfsbbVmXqpHeAfEsl 8HWSy8AXVi0p+ds4puvQgkw6GACQVyZx/b57+gvhQy6Uc9tfbDdMF+cfWvAgOGn7NaTo Dg8tPWonmDvPs2K1/FUCHQPlcN+8PrWp+BpICHBjUi7Cmu+0VZom+mwpGXEjYHqJYJKA 634Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D55lQFOw; 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 h1-20020a05620a244100b007069fde1480si5931457qkn.215.2023.01.19.10.07.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:07:09 -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=D55lQFOw; 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 1pIZHH-0003PA-8e; Thu, 19 Jan 2023 13:04:43 -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 1pIZH4-0003Ir-DU for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -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 1pIZH0-000114-Ot for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:30 -0500 Received: by mail-wm1-x32d.google.com with SMTP id l8so2188479wms.3 for ; Thu, 19 Jan 2023 10:04: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=nxoWU4Tw6BX+PJ5ddbeFgfV335pZMDd265PyUGg07yo=; b=D55lQFOw+OukFzRej76GyJzPGVXNmYTkUMnLn94Qr6P5q5sJ/BowhnCRsCqTFVZVeB ie2uAe4oREDAT2E2MTGh7TjiAlXqnNu0jeho/oSE45buDz/pSlyxZ83ZfdBcH1slSLdB M24oSkZbgVFYYvoBo8+Vh8uSwU08FwtcEK5y7T0OgbeMoDaoU+FN/ZO/0XWia7ZQhbY8 d+vEv3sjp86rlMJVhJQsdvFj5IrS/dvvYbqqwFfSRAUtEuVWv4eaiX3Z6RD2vfGMgidv MXygtfJIdHmfrHYRPXXCjWlbqWuYbdehloqsRrHAqj3QSewF6qoHAQE/xIbvi2XxxisO Y2ag== 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=nxoWU4Tw6BX+PJ5ddbeFgfV335pZMDd265PyUGg07yo=; b=QDZ9sVoy7xA4KKz+O1zvFff71i2vhnZ6bnV24TLeiEV7XP9qJiEZFyv4ohbcMfTnrM IOeWlMGFnn+cECuhR07BhYQj94Gv/ZqBItLOLqfZdxBRX7HGyt2bGjWhNsyLlTivozhx z45T9pWDgIfxOgUlaZDxc+ueAgDhpCOVaCK/d64jTS2+S2PSqdA4yBxS7j7N8mUmv3MO NFPqHqGmIaSWHIBzaUaI37AkHqLk/Eraa9hk8TRrZ7GfgWlG5xv6gSWlOD6DUB+wKRyT clfZIDNPhziTl7K+IT4s8HHNzy40rfMW6uUPgbyr3pUy7tUMF7fmklkpQ+q6Xbln79Sl I/3w== X-Gm-Message-State: AFqh2kpPTuOQuY2N81C2Y2X2AIJmOS7CxcDcwAN6WlLUHNwS9bxY8T85 6BdkpeczotaikQLxF2vHApmlWQ== X-Received: by 2002:a05:600c:3d16:b0:3d0:6a57:66a5 with SMTP id bh22-20020a05600c3d1600b003d06a5766a5mr11232488wmb.0.1674151461749; Thu, 19 Jan 2023 10:04:21 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s4-20020a05600c384400b003d9862ec435sm5474970wmr.20.2023.01.19.10.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BEE0A1FFBB; Thu, 19 Jan 2023 18:04:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson Subject: [PATCH 03/18] gitlab: just use plain --cc=clang for custom runner build Date: Thu, 19 Jan 2023 18:04:04 +0000 Message-Id: <20230119180419.30304-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 I think this was because older Ubuntu's didn't alias clang to whatever the latest version was. They do now so lets use that and not break. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 abeb33eaff..725ca8ffea 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -81,7 +81,7 @@ ubuntu-22.04-aarch64-clang: script: - mkdir build - cd build - - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers + - ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check From patchwork Thu Jan 19 18:04:05 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: 644105 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359824pvb; Thu, 19 Jan 2023 10:06:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXsdyhulFjA0o4INzood8DIv7MS65Z1Tbm1C7OK4VT8J/s7TTJkR1C32/jkZYAm0YQHbvMqd X-Received: by 2002:a25:6b0f:0:b0:7fc:c919:a7d3 with SMTP id g15-20020a256b0f000000b007fcc919a7d3mr1748948ybc.54.1674151575140; Thu, 19 Jan 2023 10:06:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151575; cv=none; d=google.com; s=arc-20160816; b=pWMAuvMD9s202D6B9xGFE0NWAQJ4Z3sJK5skXYBcgfL/Uw68Y9tKug5iEFxwNbNIQ9 4cEhlakgwW5ittvL+S6UhWXA3hlQv/7eUZumkf/bXqTs64zVYzAeofjs8k5+7maxMC0C EcM/RsRMA3XHQrdjagpWcgjxvGYhRqIawExPjVksPK7n7dp+cYgxtJmoUsZXbi1XQl2j F45Itl5auzYiv4Ttv+g8MSEC++BWezF3wYQHeHXdPxjuBSxNcig60LI/eRkOFFE44ZPA iK+kYZQNlvK47RwYe2XAqfPAel5aVwlSPPW54U2j957PDoXabFxZUIWCtcP/gmGynunC Y7fA== 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=3kS477a0I3Bux/zzw2KohjX48YjyxZLcbfkqW1wVgq8=; b=gDYqQqYuyivfCpYRL/LkZd77Iv2ALWpKdQ1Z3AYJba+YXmNs+C0qeVYEYqt+jOFFVm a1xd3iCaoFQrOzGSGAhejigibuGu+MTcpYFxTbo6dK+tEuo8LKuWSJHFKePjj81/t6d6 BGv4VPXKfem9ZncScP9LWlrJQA0Za/Fb4aPh82yrlGqIg4Pl1Mk97J43L/myg/DroxYd xxRNo9y5EXsUH4w4fukMlyK/Q7qvAzg0U+92oPFR2zlIylW5X1PPvLGxpjjqP0umdf28 NmglCsS7rR2qVGLnSCE+GgtjdMgqJVLmWeFgmGuvnO8AtabpYWWkyL/FbrmAloTS/paK aCDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fZizxt6C; 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 m6-20020a05620a24c600b006eebf6f2e6asi3674501qkn.409.2023.01.19.10.06.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:06:15 -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=fZizxt6C; 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 1pIZHC-0003LW-KG; Thu, 19 Jan 2023 13:04: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 1pIZH3-0003I9-63 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:29 -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 1pIZH0-00011B-5g for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:28 -0500 Received: by mail-wm1-x333.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso1875993wms.3 for ; Thu, 19 Jan 2023 10:04: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=3kS477a0I3Bux/zzw2KohjX48YjyxZLcbfkqW1wVgq8=; b=fZizxt6CyzpdQICKNpdkTlblcKoio9LQiXlcr7D6r4myQoQJzivacN+7PUypKIXVNy zQxjd5+/PfVI6gH5+qqzTMgY8oJ9CV/rUiMzO/OU3TvdGXy/AWCxRUsuxgDw32dGcjqc g2EHxRBZ4i1pSA9RCluw4/Jwg3L9fjwQkpxBPKP8NZ5e9fkDm44PDFMzSiQbxRCvjLFc E5Uxy9SnvZLKaL0So/m5DFpw0Oc8VOyVYthyKkEcwMLN0IwTtudgV4wBKYuD/IofWoPa fi4d4288SOcWb5kiDJ1xfLXTwnfeCrfaS9mTGd/5HeOJly77pnElkg5UcRmOalqlfTMZ iXkA== 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=3kS477a0I3Bux/zzw2KohjX48YjyxZLcbfkqW1wVgq8=; b=4FugteZq1lcrjvJ65yV/I6FY856SMsn+BnluyjLf7/ok1FCxb571Mi1cWQjvCn+9lI jjXb8ZJ4dDMsshk6VRukWDlm53FqdGd7hKq0CefbMk1ogwvI1MFZt/IrlnD/47c10Gt8 JCrUjEh9LquYPsmOGZiUHsgu4SWyNzyHUgXK9SeLfnJHqCgPoQnfrGm0+uqjtPTNa+Me Fs9ikOSflt6EGZyzCLBX8kouvwOaNMk2ksusvw8/pqEbO/yRyh8KdT0shehLrIjipkyd 0NqTmoQnPXlJbT67kdPKl4x2drdHvLOXweXKF6fMT/Gpp/1R9enYMzbMkEeeC5Ztpb/Z yybw== X-Gm-Message-State: AFqh2kotrW+tuoTJUFslx/2qi049JV5JZyt97qg/gHU4mcdGkjNmc9ng 47F7f1kvzbG8t0XCJ0fQbGp62g== X-Received: by 2002:a05:600c:3488:b0:3d2:370b:97f4 with SMTP id a8-20020a05600c348800b003d2370b97f4mr19769221wmq.16.1674151462430; Thu, 19 Jan 2023 10:04:22 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s4-20020a05600c384400b003d9862ec435sm5474973wmr.20.2023.01.19.10.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D5E681FFBC; Thu, 19 Jan 2023 18:04:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 04/18] tests/unit: drop hacky race avoidance in test-io-channel-command Date: Thu, 19 Jan 2023 18:04:05 +0000 Message-Id: <20230119180419.30304-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 don't need to play timing games to ensure one socat wins over the other, just create the fifo they both can use before spawning the processes. However in the process we need to disable two tests for Windows platforms as we don't have an abstraction for mkfifo(). Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1403 Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/unit/test-io-channel-command.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 19f72eab96..425e2f5594 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -20,6 +20,8 @@ #include "qemu/osdep.h" #include +#include +#include #include "io/channel-command.h" #include "io-channel-helpers.h" #include "qapi/error.h" @@ -29,6 +31,7 @@ static char *socat = NULL; +#ifndef _WIN32 static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); @@ -40,12 +43,13 @@ static void test_io_channel_command_fifo(bool async) QIOChannel *src, *dst; QIOChannelTest *test; + if (mkfifo(fifo, 0600)) { + g_error("mkfifo: %s", strerror(errno)); + } + src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv, O_WRONLY, &error_abort)); - /* try to avoid a race to create the socket */ - g_usleep(1000); - dst = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) dstargv, O_RDONLY, &error_abort)); @@ -60,7 +64,6 @@ static void test_io_channel_command_fifo(bool async) g_rmdir(tmpdir); } - static void test_io_channel_command_fifo_async(void) { if (!socat) { @@ -80,6 +83,7 @@ static void test_io_channel_command_fifo_sync(void) test_io_channel_command_fifo(false); } +#endif static void test_io_channel_command_echo(bool async) @@ -124,10 +128,12 @@ int main(int argc, char **argv) socat = g_find_program_in_path("socat"); +#ifndef _WIN32 g_test_add_func("/io/channel/command/fifo/sync", test_io_channel_command_fifo_sync); g_test_add_func("/io/channel/command/fifo/async", test_io_channel_command_fifo_async); +#endif g_test_add_func("/io/channel/command/echo/sync", test_io_channel_command_echo_sync); g_test_add_func("/io/channel/command/echo/async", From patchwork Thu Jan 19 18:04:06 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: 644103 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359740pvb; Thu, 19 Jan 2023 10:06:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXsRx6rT+IpPOL2C/adlAwxIs3U1B1UWov9MuoZ7bEMgZymrCl81otiN3+ehZFaxVvJsBQwE X-Received: by 2002:a05:7500:2c0c:b0:f1:d72a:cc35 with SMTP id ep12-20020a0575002c0c00b000f1d72acc35mr961342gab.47.1674151566552; Thu, 19 Jan 2023 10:06:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151566; cv=none; d=google.com; s=arc-20160816; b=hG+Jv3aJUscFsbAZWI6RbqqpDKiPVVjmpiFfBV4uMyPM4CyVA1ATjNXqZWLXfMwHnX QUsQD8deqICAWw+7sT+b+OnthkkcsRyecgz5esIzoeGClvfRFeuQMP8Rg+qOduSqSRLQ WLsl++rY1/PGA1+lZjKrG1g3avSp/xo22cjf/Sw4dg83JzMju4uwjLFMobBNLd8jVVsL IJZuODBkkYZHgathMq9XRM/i5w0sqyf48eF2HuZL8V1gTi7lAxKLyJH4WvZuLrkiJgFT iTGMZ/y2AvlorQvbSW77PSTa2wkgahCLi9EQC+zBP+3huCgczy1MwR0UlJ6SQEUSGhkX ArCg== 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=TseWXLLVLdaVHAb6N/tVCJv6wFOZdD280J8VfGZpAXE=; b=SyN+qDGG0TkhaJIIqIm8Oq6sMz+iYLBVlZb5uWl8F9RTAP5A3+X2XzQ6crOelnKBoA PK9NLoypccLDX+2l43+Y4lVUziUSClPxcMHUYMgeiv2PRPrdc+s3K3TPhmEGx87AJ9bq JQH5UQ847ciEdOpTlm6sdnrD+UeW3CfVZC2rR/dfYETSB2wHUik47n3m7A08JHQD3t+E uj5QKeRkso9linzge6qxaLCPNPA5hZtd+RtxLYdKPGiyvfuaYQHSG7wHKKc7ItuKCidc Q93JlpoZJ1z2QNnjQNttPMjVT5FrW0IVwQDKc+AkzJ1u/zZYQcMlKxSaPp5T/8/b8p+C mlUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eSJw+hJB; 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-20020ab01507000000b00418f19faaabsi10294338uae.3.2023.01.19.10.06.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:06:06 -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=eSJw+hJB; 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 1pIZHC-0003MV-PR; Thu, 19 Jan 2023 13:04: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 1pIZH3-0003I7-4s for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:29 -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 1pIZH0-00011E-5L for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:28 -0500 Received: by mail-wm1-x334.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso1876001wms.3 for ; Thu, 19 Jan 2023 10:04: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=TseWXLLVLdaVHAb6N/tVCJv6wFOZdD280J8VfGZpAXE=; b=eSJw+hJBHtPSGXVQ7/8jLjhoY0ZN2iPx/CAg8+10YbXk9Ftffk2mSbK9kuLJPThUlM ZzAb62vmdtn2ySG+CQo/gFPEN6K2CIWq6HjZW7EVUELjINUqzZLIsTbuCOcvEZbKjp2d 5WnitmLOrz3ocHWEdx814De3FK70DyB0H+v4r7FSpvVRpH2HoNUFIbK1TFDLAEjP0Emj 3Si3BPHqnyPJOIOLIRPGVXFZ0SNfse/Gba8rPN7qivE4/JZ2xTGhYYUtPXLgYEJPP6Gu WiqiPbfcszp9rjZVRBfW0aMNKD/qJIM/hJcLIW1CGZSm204k2Ink2bvFDuvAQEWDuL7/ b/8A== 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=TseWXLLVLdaVHAb6N/tVCJv6wFOZdD280J8VfGZpAXE=; b=dJQ2SMNhKwzaMcEQA1lM9Eg2aR5vW6kiR9X3bUjGU88j1Xq0J3DS60vK+oREHAeiHI wVhvs3n/0p+OxalQuFJZ5RbGB+EVanf/vPwJ8NIP+rcnI4hcFMum+8vVEwC8M+wagaYe dWZ67TBqaFiBXwxmFoWcZQs8NsqaoqZ4netqNASYZb8ppVmKwStpAZqltmfUDsFtwesr T6ukZedIQOHpGDlumLQY+RxYKcxy3MNI4h7SFqjk5ZLempG77M4EaZ8yx6THoadtNQsQ hrjKV1beyOLdkkcV/mO/0WFWLFD4eudu/Ids28a2ON71hU8D9lUcIVTDtGDQBCvcV5EW JQ2g== X-Gm-Message-State: AFqh2krlwtNyJ3dZsWt5xjXkLoltcf0sSzP8jK32H4d3kMyugvYOZI/5 49LITZprnE/mC6MmX9zHC/B5+g== X-Received: by 2002:a05:600c:3ca6:b0:3d1:caf1:3f56 with SMTP id bg38-20020a05600c3ca600b003d1caf13f56mr19809041wmb.9.1674151462788; Thu, 19 Jan 2023 10:04:22 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n37-20020a05600c502500b003db03725e86sm5840059wmr.8.2023.01.19.10.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F26BF1FFBD; Thu, 19 Jan 2023 18:04:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 05/18] build-sys: fix crlf-ending C code Date: Thu, 19 Jan 2023 18:04:06 +0000 Message-Id: <20230119180419.30304-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 From: Marc-André Lureau On msys2, the shader-to-C script produces bad C: ./ui/shader/texture-blit-vert.h:2:5: error: missing terminating " character [-Werror] Fix it by changing the line ending from crlf to lf, and convert the script to Python (qemu build seems perl-free after that). Signed-off-by: Marc-André Lureau Acked-by: Thomas Huth Message-Id: <20230110132700.833690-2-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- meson.build | 2 +- scripts/shaderinclude.pl | 16 ---------------- scripts/shaderinclude.py | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 scripts/shaderinclude.pl create mode 100644 scripts/shaderinclude.py diff --git a/meson.build b/meson.build index 58d8cd68a6..ac8c8f2cc9 100644 --- a/meson.build +++ b/meson.build @@ -2779,7 +2779,7 @@ config_host_data.set('CONFIG_SLIRP', slirp.found()) genh += configure_file(output: 'config-host.h', configuration: config_host_data) hxtool = find_program('scripts/hxtool') -shaderinclude = find_program('scripts/shaderinclude.pl') +shaderinclude = find_program('scripts/shaderinclude.py') qapi_gen = find_program('scripts/qapi-gen.py') qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py', meson.current_source_dir() / 'scripts/qapi/commands.py', diff --git a/scripts/shaderinclude.pl b/scripts/shaderinclude.pl deleted file mode 100644 index cd3bb40b12..0000000000 --- a/scripts/shaderinclude.pl +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env perl -use strict; -use warnings; - -my $file = shift; -open FILE, "<", $file or die "open $file: $!"; -my $name = $file; -$name =~ s|.*/||; -$name =~ s/[-.]/_/g; -print "static GLchar ${name}_src[] =\n"; -while () { - chomp; - printf " \"%s\\n\"\n", $_; -} -print " \"\\n\";\n"; -close FILE; diff --git a/scripts/shaderinclude.py b/scripts/shaderinclude.py new file mode 100644 index 0000000000..ab2aade2cd --- /dev/null +++ b/scripts/shaderinclude.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2023 Red Hat, Inc. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import sys +import os + + +def main(args): + file_path = args[1] + basename = os.path.basename(file_path) + varname = basename.replace('-', '_').replace('.', '_') + + with os.fdopen(sys.stdout.fileno(), "wt", closefd=False, newline='\n') as stdout: + with open(file_path, "r", encoding='utf-8') as file: + print(f'static GLchar {varname}_src[] =', file=stdout) + for line in file: + line = line.rstrip() + print(f' "{line}\\n"', file=stdout) + print(' "\\n";', file=stdout) + + +if __name__ == '__main__': + sys.exit(main(sys.argv)) From patchwork Thu Jan 19 18:04:07 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: 644106 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359954pvb; Thu, 19 Jan 2023 10:06:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXs8rZ+mInTbCjSW9k2n7ly8ZTdxmPrbgTWiU8k1HSRVy7ZJVnVlRVfrePUBzPM+4rQsJLRC X-Received: by 2002:a0c:f7ce:0:b0:532:17a4:67ac with SMTP id f14-20020a0cf7ce000000b0053217a467acmr45006189qvo.37.1674151587589; Thu, 19 Jan 2023 10:06:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151587; cv=none; d=google.com; s=arc-20160816; b=frqsNWrg78o/bG8GLiFAokBi8aLX0ghTa5NzjaN+5BtbyiBE3H7glj93l6ZqyFYHPz bERJLyzHIAU+ZKhmcjdYijmV5h14plMeOfe98jq7tU1BiWPBdklxoEX/uYuKTOfmycCi lGpD5k8O9sVukkFiCtSZ96KEEy2XqbO9j5tkG7Tr2qFLlZfcMQZGxvgKlhS8vIYv8qCx EiTgym0zSBxp7du1DXKaKdGWJu8gKOlmO+4yGjCOPRJpPs8RCZqbVa9xCW0bNd/6NRwi 8WH14cZwp2BhU5YInql71r+mh5F4nnrWRYNRAwqJECxevjsURYgurfmLZAJg4ciA/ikP XPiA== 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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=HHbqmo6Ljd9+NGl64EtN7dObgd4Uy9XfqZLHXWQCGcsLliRycFWdJSc5ffBLdZsSuc pareDnHMcAqcrCOxFdlhqrhJ652phtc7UDC95QVndJWPpTsm3WOQ/Vr92fqO4klSfRYY Fj33WbtiK6iN+lpepsIhOEMEc5FQu+yDpRM0HyqH4tWDTxMW4sQXCkQ033JPwyYLmwZg 0yCHAkMSiEJsMQd4jfET85fWRkFDSp1kguqt2EQlMG4drHMOhe6XkuehJgW7k1jSRoQp NjzgCjOFupzSLeYJ05PDN7Z9dWfj6ZJM+BV+quYNQhm7495MtwITLMkFOt9kS76QsgzK XCsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vMVb4FH2; 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 e5-20020a0562141d0500b004c69819ed78si24541911qvd.506.2023.01.19.10.06.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:06:27 -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=vMVb4FH2; 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 1pIZHD-0003NA-HA; Thu, 19 Jan 2023 13:04: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 1pIZH3-0003I6-4K for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:29 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIZH0-00011Q-59 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:28 -0500 Received: by mail-wr1-x42b.google.com with SMTP id e3so2637133wru.13 for ; Thu, 19 Jan 2023 10:04: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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=vMVb4FH2anD1kRUrcBW2w2QRaa8U8gsa0T2VBJKAH8I0lMIW8Y25QNQ4A+sHVtW3La /DLk3jD6oUK5AxzpM1oFJu2HM7BNHRQJYcDZs10xu6d34BlLHN1bK+Qx9+TPGbEI6Iu2 62kxdVfcQzpF07iiQ6TTDBolJsRaVWL0mEqxWrg71bzo8FH63mbF8o9yPLFDDlNpE8WV RQ2C9tCRmM+VunTi6WlGarJb2fpufXeW5wrKZ1Qo79mO3e0/dOkHuh/yLcX0ClNSuwug Q3hyTplgVaQDoZ5QfMNWvkwta2UaqxL824dqkm8uElVYFwEH7HS8dTCLPfMZuk2c0W9U IV8w== 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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=qTV8RbXN8xk2lJVkw+sMVQZbaBOLwRtuNs3iHS0eNiDSQe/gDIpbhOkKYkCRAGFPwN Wkc5sKQLr4LB1fHjzsoxomJF5zvpbg6DjltM6AgRceQrGNAzebR0xPUYxbeeFJVwUOUo 1kLiR58b62bAgfI8vVmfE3q1Bq5UKfEKB4UM01fsggCue6mx5ffR+0arTmGeTsVS9Gxz jlSB/Z22GVgQ4ZbyImqn691S0k+2933nkq80uzo+kwWRtFjXYYhibER/yMJGhgklvRHb xmUYMhuHz191CyqlXHAtbwBkPh2dRrNPfYu3T8LBP9BM9TOcZBu7WyRgr/dq24mInFda hgTQ== X-Gm-Message-State: AFqh2kob3nw4hV0IEGic8BQK8laIuISlYsh/aiPquPctFzSx5wcHzDF2 SztqakMmAza0rvwGLgC4Er+5QQ== X-Received: by 2002:a5d:66c9:0:b0:2b9:d6ba:21ef with SMTP id k9-20020a5d66c9000000b002b9d6ba21efmr10299183wrw.65.1674151463811; Thu, 19 Jan 2023 10:04:23 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m5-20020adfe0c5000000b002bdfe3aca17sm11909035wri.51.2023.01.19.10.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 152B41FFBE; Thu, 19 Jan 2023 18:04:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 06/18] .gitlab-ci.d/windows: do not disable opengl Date: Thu, 19 Jan 2023 18:04:07 +0000 Message-Id: <20230119180419.30304-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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: Marc-André Lureau The previous patch should fix shader compilation. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20230110132700.833690-3-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index a1d5790580..cf445b77f6 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -71,7 +71,7 @@ msys2-64bit: # for the msys2 64-bit job, due to the build could not complete within # the project timeout. - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu - --without-default-devices --disable-opengl' + --without-default-devices' - ..\msys64\usr\bin\bash -lc 'make' # qTests don't run successfully with "--without-default-devices", # so let's exclude the qtests from CI for now. @@ -113,8 +113,7 @@ msys2-32bit: - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu - --disable-opengl' + - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu' - ..\msys64\usr\bin\bash -lc 'make' - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=\"--no-suite qtest\" || { cat meson-logs/testlog.txt; exit 1; }' From patchwork Thu Jan 19 18:04:08 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: 644109 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp360344pvb; Thu, 19 Jan 2023 10:07:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXsn/OfsgnDrFtoD0w5RwP8r+MCr7IW0L6AgvOmqA7te/20KWrMWBokzoHzRiA8g1RVFu7x6 X-Received: by 2002:ac8:774d:0:b0:3b0:ca89:c467 with SMTP id g13-20020ac8774d000000b003b0ca89c467mr17705915qtu.51.1674151625073; Thu, 19 Jan 2023 10:07:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151625; cv=none; d=google.com; s=arc-20160816; b=ddGOUcqJit+T2b7rVHSdnyxTePSvsbj2z4sGEY3VB2168vZJGjNyf7VYtr9b42eyMV i0cGC23OAlYmkkHLDK5ffHlqLy2bZgWomG/R7B0cXHM4nBzhcUdxsZzHqgKtZhf45kHJ o8bs94FEDlz5wRrEwPAijZeGYFe4UdVlFjGkVBg17LxCP8qgAWHnPoZcLbV9LIa3rpNF LYadSCdE10npLxbeIO5wo4mdinR5pWw3fdXWZhlLn1iMkuthaouwXnA1XkhEEdxnn/1W sjrVfIDETKhnsqaBRN2rQzWy3Y0NAwMYbfe3T8ohMaxbx7x85CZk3XrU0N/OsAauhPGM OamA== 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=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=LEq2S0+OSTXqD8MYl+pHsjCyjCTS70RcMVbZ8q9JgfWJCjw79hAUBYYYq8OVEimWbA jp79sx37AH/+eGHKfVDc0h99+k+xQuw7tWzuIp0Pbin8kRzjGc2ikfaeqKtI4QufM0Eb yek8xjFUeMBF7QsSEIQQltxvSPD7GuAOaMTKRk5pIpW+BWlZvmHP9tk0JoRF3WZnCx3w FH1g2S2i3wknLoVrxPrx0IuQ0u2dGC57lxUuwpQRi7gShzGgum4lqpPWykns/EuclDeR usr9N0wthaJvM+Y7c3YslTJg1JoKxHr1oj2o+9/bRhY3Nm6fEJ/mMNhnBs400J4gIACL KeQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QjvusSrZ; 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 f7-20020ac80147000000b003b03b5658b6si17053966qtg.745.2023.01.19.10.07.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:07:05 -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=QjvusSrZ; 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 1pIZHI-0003Pb-K0; Thu, 19 Jan 2023 13:04: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 1pIZH4-0003Iq-8j for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04: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 1pIZH0-00011G-4P for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:29 -0500 Received: by mail-wr1-x42c.google.com with SMTP id b7so2675560wrt.3 for ; Thu, 19 Jan 2023 10:04: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=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=QjvusSrZPazJHHo5k2XB+XloUnrzKtQ2ERDBkodr16SeOL3RR/r2pp/F4BzaZ0budE +NuCQDGnF/S8/Gj6VX3A5PyDbTkbSHnOkfrCfWjKTOFPDMPjIhgBxK+Il37URL3KSOQY HHB/XWEoNIpRGpzCS7KHMTv9o4gdh13g+8OD3h0fVFIC9XPqC1PQXPTs5ZYcsPetvDWT VuJb0PigTY6rsmOiPOyLnmPvqtxZWrbmFkHITErAScQKSPVYULwygWlt2zPKOQRm8FLV CoPuirD2IYw86srunIQp1YIHNsIfT5ov/mJBWo4+H8eiyMbqcmvAs8ohLrWIof6ywj9O fJsQ== 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=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=I+s6pH4ezKNpUvsRxQdGgRj1gmuFSq1QijT8rStdtuxLfmCeweQmi/Y8qLrpF8ntCR Aaivh9f14pq2dsQpQASmbeOzFjIMmgHDT8H46t+7Nd1vh5nrrUap9OTWnz6q7jJA6v9w y76nA5ABrXyntzot88ejBVrJz+aV8NrJTWIQk+DHS1u6bRVmEomu11PgDeUl7vts/2Ff GfFv8NGTO5FkUdot+NXziJndMIww1hpY9twlNmhqCR0IJvxXqZbj/YHaBFocljeUnx1m MhaFMSEpdrXdkuOdPFs/ZToppG/l3QKNK25cS1eVVd25qlDRTAo5gMJArEQPbcqpILJ7 eb7w== X-Gm-Message-State: AFqh2konkTRq5lJ7naFrO57FPXbhf7tABAP9rXpW0K4kkJRqQxhaan3p JVXwdS/LM3fdSE+AwDSJjutJqQ== X-Received: by 2002:a5d:59c8:0:b0:2aa:1d10:1ecf with SMTP id v8-20020a5d59c8000000b002aa1d101ecfmr12040123wry.37.1674151463023; Thu, 19 Jan 2023 10:04:23 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w10-20020a5d404a000000b00275970a85f4sm34162026wrp.74.2023.01.19.10.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C9EE1FFBF; Thu, 19 Jan 2023 18:04:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 07/18] meson: replace Perl usage with Python Date: Thu, 19 Jan 2023 18:04:08 +0000 Message-Id: <20230119180419.30304-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 From: Marc-André Lureau Let's try to remove Perl usage during build time. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-5-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- tests/qapi-schema/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 9dfe98bc9a..d85b14f28c 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -259,22 +259,23 @@ if build_docs # Fix possible inconsistency in line endings in generated output and # in the golden reference (which could otherwise cause test failures # on Windows hosts). Unfortunately diff --strip-trailing-cr - # is GNU-diff only. The odd-looking perl is because we must avoid + # is GNU-diff only. The odd-looking python is because we must avoid # using an explicit '\' character in the command arguments to # a custom_target(), as Meson will unhelpfully replace it with a '/' # (https://github.com/mesonbuild/meson/issues/1564) + remove_cr = [python, '-c', 'import sys;[sys.stdout.write(line.replace(chr(13), "")) for line in sys.stdin]'] qapi_doc_out_nocr = custom_target('QAPI rST doc newline-sanitized', output: ['doc-good.txt.nocr'], input: qapi_doc_out[0], build_by_default: true, - command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) qapi_doc_ref_nocr = custom_target('QAPI rST doc reference newline-sanitized', output: ['doc-good.ref.nocr'], input: files('doc-good.txt'), build_by_default: true, - command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_out_nocr[0]], From patchwork Thu Jan 19 18:04:09 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: 644100 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359167pvb; Thu, 19 Jan 2023 10:05:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXunNG9Py+GB2LOBCZefJQq4i+UpzSiVk7nlUB2pleySrJfthtSttbiF31hrvlI0myTL90f2 X-Received: by 2002:a05:7500:3ec1:b0:f1:a03d:e3d4 with SMTP id lj1-20020a0575003ec100b000f1a03de3d4mr973508gab.15.1674151504906; Thu, 19 Jan 2023 10:05:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151504; cv=none; d=google.com; s=arc-20160816; b=AfDg90xlOVQM3GayQSeZTlEYz//Aynb77CbOZBAh1w6stdMq9vOBODsKzacEgo5izt NVQamfN0liUhr8r2H3PwHlZ0pia/Craj33B+Nn74zcJcHZ4afjlzbIpga8HlKB4fWrSe mWHuyzuOcjlEe1Wnl2l+JGLgsPqGvU9t32HRhw1oFvaUCS0/1LFzjM+aZbhhf58z/7Q8 UVC/BxSE77cbjEChtkpfRdJT2SPX/PS607v9rPx87pLPyJcMRIz4U5xcfO8ITn2b4S7U kyb80TSp3RHPkAKiApa26dfMnF4Vp55E/RPEHNA8aZ/opXKLymh7P+kxuSNBqvP4847u UWxw== 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=KS77SMPj4oKmkGa5jb8BcpyB1iTizAYKK45SCLEMfy8=; b=c9AEbHH/rCmYEvp3wztCYax6q4vreNNQwsyJaOTtLreuaCztWOHI9AT6TkiDAiWMSt E6Dke4Wi1M71joGNYAgBUkwlUNV3rynjGM/i0by4oGSydZr/bkV+MihQlvN70Uec5iTA UQYjLQ9PLMXtbCnkjEipt1b6Zrg6wtLtARiV0z/2LRx593BuQ39eD9U/f3g0hP18Oq/v JOICcRnyWOdQFElc80Lgv/MoV1RnJt87dxZP4JasKCA2tan5qDYxBi7KfhuT+0iCJOa+ +DU8H4Y4LcHWV5zwomabdS0+2UDDXZrIxK0OgWjRc2+xqvm2zhwf2W7Gx1H7Ur6QhW/b 9jyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uvcmXOWT; 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 s7-20020a05620a0bc700b006fb112f50b8si24697037qki.287.2023.01.19.10.05.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:05:04 -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=uvcmXOWT; 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 1pIZHF-0003Ne-IW; Thu, 19 Jan 2023 13:04:41 -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 1pIZH4-0003Is-En for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -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 1pIZH0-00011U-Of for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:30 -0500 Received: by mail-wr1-x42d.google.com with SMTP id e3so2637186wru.13 for ; Thu, 19 Jan 2023 10:04: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=KS77SMPj4oKmkGa5jb8BcpyB1iTizAYKK45SCLEMfy8=; b=uvcmXOWT7cRwqTJdvlzGiiZLZHJ5fMCUbT9Y1uK+MSPObCg45R5VwXxR21666pUV7W tc2tmzecoCKu2afCW7vmAKE680/JL7/SZi6wxzaDaf6FI+eBHkyLmtPpnT4peLHVIF14 Mr80PGon15IH0cslMo4MPRGjBQDDvfvD+0iu3s6OwLoWw2fX+fRMMd1qDgy5PvFsXEDN 834kaFzBCFM10IR5RxbCqZVyPPfYgMxauLz5AyEki0gGkVNcWI1m9RiUGRMIlP4vf92h EkD4/k3nrnU1VmYOwgcKT8Wg5MUil5kvtYL3M/hlCb1xUpe8Grj0pxeO6E3XsDsi8EyX ohBQ== 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=KS77SMPj4oKmkGa5jb8BcpyB1iTizAYKK45SCLEMfy8=; b=XLMI3LpXpVXxZdtz25Jlvk9KWt9qqu4J0M6uLwEuR+0duFYA5IloylN4DnMbP8TccK CPv170c9gFAu5rXeJ9ZLt9XNv4mnbD3A6fjdWR0Rrm2gYhkZLpbcZ6BoLCfeilpMBmP7 tjvqSCgxz9CE40PltRqXMRgfFfNRJvWALf/jh6n7hsmV4MXtlbq8ZxEtREAwnbBaA9On FDBBn3+YC/ZDCG22rrJhvJUQKwJZzSaFQiFYYhsYtRbofd/WVdRkZwZyQxDAvhCkp4rh JRTqBeWb9Zpf1rPsnsAqsVqN/0zuC12VtRI5gEWO9lQhYD2mfF2BZ66wUDhwR1SJFIZ8 AfLw== X-Gm-Message-State: AFqh2kpHG3eQEWfIaEivPQfpirsSifzK0TkJanVApRAPtA0RFyvYIG9L g1kbeA/LUo6Um58tysbvfYOxMg== X-Received: by 2002:a05:6000:689:b0:2bd:ffad:1bce with SMTP id bo9-20020a056000068900b002bdffad1bcemr11580952wrb.59.1674151464844; Thu, 19 Jan 2023 10:04:24 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q11-20020adf9dcb000000b00268aae5fb5bsm34846300wre.3.2023.01.19.10.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 437551FFC0; Thu, 19 Jan 2023 18:04:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 08/18] docs: drop texinfo options Date: Thu, 19 Jan 2023 18:04:09 +0000 Message-Id: <20230119180419.30304-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 From: Marc-André Lureau It looks like this is no longer wanted, we only build the html output. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-6-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- docs/conf.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e33cf3d381..73a287a4f2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -297,19 +297,6 @@ ] man_make_section_directory = False -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - (master_doc, 'QEMU', u'QEMU Documentation', - author, 'QEMU', 'One line description of project.', - 'Miscellaneous'), -] - - - # We use paths starting from qemu_docdir here so that you can run # sphinx-build from anywhere and the kerneldoc extension can still # find everything. From patchwork Thu Jan 19 18:04:10 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: 644102 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359495pvb; Thu, 19 Jan 2023 10:05:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXuwQcZDxGoUVbEs60kddVbnmyFA8ib+whfy5wQePM0m15EGm2GfcWzTgUnKZwNDnQCirgKn X-Received: by 2002:a05:6214:370d:b0:531:a8f3:e8db with SMTP id np13-20020a056214370d00b00531a8f3e8dbmr17861665qvb.47.1674151538393; Thu, 19 Jan 2023 10:05:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151538; cv=none; d=google.com; s=arc-20160816; b=uXghCXb9mkVQyOICMjwK+GuCo6QS660Y8rC+KlCyTpOQr4aH+7Q7hWuXY7uSYKD94f pFUDIxDqPOu5YhiVYJY2ALGU0/Gq5V8jKSHzsGHwpchfqqKlLLURDY+XBdrzmBEn4iah KY79ZrnHyd9hcaG6c+ZfJ2gNGtR0jTYt3AxPmyqWv+e6rHex2f9zjTf9wrC0hoQioUbO kWNrlvDOr4piG00pCw9hJxyW6E9aimMh9KQz3eR3gmXCkutZs8zYSFqSvWGV5U/eHJt1 RVHpg8g9P8faZA/2YXaTzr/C3BEgyNiTwhPV0hX1YIMMBvgo36cxrIP539OWMIxhMWq/ ziBg== 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=Ckg71MG7SVvhUWMlWrtuql+u6S+Ri9y1vJzFG4YdetM=; b=nA76aF7qmg8a4GMiDvmgHfh+yKolFdRh4T7rQI9ZcMupvq+cy5rfcThcXSEKdDh3wK YNs8WEz1rQO29I1TJ1Iq3TzREMBNWw8pQzCjBN1YNLndcR3wqguAQ/BpKIbrlHnMgysv zn5JIBUtftDzwcyKCWX9LjTGIj7CCt4uK2YtQ5AUM3orrhx5rdFhGv6h33w7b8oDtZqO UlZApoHy4HkGsBFZilaGpjtaJSWkQL7kvrsBeXDREkimZnI17N2WnOmphKfAlAtNs5Ix ZHpXlwIRCs3sa60SO8RJGHR3tmbcGMFhnUn2kwMswPWnoyBuiOIPyWZFynIP+qJtr9k/ vO5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UO3XgEVa; 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 h11-20020a0562140dab00b0053520711100si7093391qvh.163.2023.01.19.10.05.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:05:38 -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=UO3XgEVa; 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 1pIZHE-0003NE-60; Thu, 19 Jan 2023 13:04:40 -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 1pIZH5-0003J0-Pc for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -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 1pIZH1-00011g-Uy for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -0500 Received: by mail-wm1-x32a.google.com with SMTP id l8so2188657wms.3 for ; Thu, 19 Jan 2023 10:04:27 -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=Ckg71MG7SVvhUWMlWrtuql+u6S+Ri9y1vJzFG4YdetM=; b=UO3XgEVa7kkdVw88Uiy0nia85aO8FQ0wv7dmYkJV2d8xNBhMMlzDXmx0fmVeXYC6d+ ASl/+GUqmgHhYF22FAsCgZMjX/Fjv6CQIwIPk786y1srdQ3hk3Sw2fZr4waq3OJE0tYC +7tQZWTynQedKJO3ZmFV2yFK/UY2fNeAmYzUEwROQSS449V4XGyqQwR/loJ/dPR9TxwR s0WvpCUju+RnGpSwnHmNB47NBSR/SoVVrIDGdluyRUrYB/dj4WkTiWaJGW0Fkv6/E0d/ cfucqVB52Fm9woJUchIs0LqTQRM7OGnRdUXkOqVXcfq+wkvLntOnTxhb1nCHtaV8TULj 7bXg== 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=Ckg71MG7SVvhUWMlWrtuql+u6S+Ri9y1vJzFG4YdetM=; b=426uYvGFICgaIt7aS7cEMBHFc19M4xXNXgoZ6zIHY/VUAcd5Eag8IFwV9noovCEMxJ O7JFXUstg80iZxCSzT+iFQhqxsioJGqEWWls2KyV0RphkGMfHr8A3Cw922FVPPA7TJTz YAq0IDvkqT1/fhJIqvZZYThMTS+EViPlerSt12tXMMldu9jDQ362+CIY3EsLvrzPl0aO 5LZNF8hvoQXnvd+cIXmGf+l/dH4vitF2OAxFxf9xiBJt0a+QuW7dA1f3ILWh3JEyvUIA EG184TtxYsa/v5bVZrDwSJkinVy407wWQLI8tnlpIbXvJYQQDqcvNHBvAUouMeaDfExb IOVg== X-Gm-Message-State: AFqh2kpfKu62wQUeWuCbQ5DdypcDMX4k6eW4rLC5VRFd1BNnhLRmCjaA 7xMnt8vw1OKeINM/jCUODzl5dg== X-Received: by 2002:a05:600c:4e93:b0:3db:d3f:a91f with SMTP id f19-20020a05600c4e9300b003db0d3fa91fmr8890674wmq.23.1674151466305; Thu, 19 Jan 2023 10:04:26 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o2-20020a05600c510200b003c6f8d30e40sm6298551wms.31.2023.01.19.10.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5DBA61FFC1; Thu, 19 Jan 2023 18:04:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 09/18] gitlab: add lsan suppression file to workaround tcmalloc issues Date: Thu, 19 Jan 2023 18:04:10 +0000 Message-Id: <20230119180419.30304-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 The up-coming upgrade to Fedora 37 will bring in libtcmalloc as a dependency of libglusterfs which confuses our fuzz run. Rather than disable the build lets use LSAN's suppression mechanism to prevent the job from failing. Signed-off-by: Alex Bennée Cc: Daniel P. Berrangé --- .gitlab-ci.d/buildtest.yml | 1 + scripts/oss-fuzz/lsan_suppressions.txt | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 scripts/oss-fuzz/lsan_suppressions.txt diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f09a898c3e..9a6ba1fe3b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -511,6 +511,7 @@ build-oss-fuzz: IMAGE: fedora script: - mkdir build-oss-fuzz + - export LSAN_OPTIONS=suppressions=scripts/oss-fuzz/lsan_suppressions.txt - CC="clang" CXX="clang++" CFLAGS="-fsanitize=address" ./scripts/oss-fuzz/build.sh - export ASAN_OPTIONS="fast_unwind_on_malloc=0" diff --git a/scripts/oss-fuzz/lsan_suppressions.txt b/scripts/oss-fuzz/lsan_suppressions.txt new file mode 100644 index 0000000000..02ec0a6ed5 --- /dev/null +++ b/scripts/oss-fuzz/lsan_suppressions.txt @@ -0,0 +1,2 @@ +# The tcmalloc on Fedora37 confuses things +leak:/lib64/libtcmalloc_minimal.so.4 From patchwork Thu Jan 19 18:04:11 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: 644108 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp360332pvb; Thu, 19 Jan 2023 10:07:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAKu+XWHdL1uTJOX7cksXMuoo7FH510aG2RC34k1gY6AbWvVLp1MyeZ8jpTRMAq0CT5wqh X-Received: by 2002:a25:fc17:0:b0:7c6:4471:19c4 with SMTP id v23-20020a25fc17000000b007c6447119c4mr9428285ybd.46.1674151623710; Thu, 19 Jan 2023 10:07:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151623; cv=none; d=google.com; s=arc-20160816; b=mNpoaCAvkwPzIUM9fWHeUkmkKLpnMwqCv5RQet3Zemic0LeVmCsnkr4HimFZMxmYWF SQN75N3gIxH3HV+bu0duGvawQ+Anj41c/6oNTtBkejwlY/DHyZHF9F2emSPt1VkJ0ehE 25ki18z8ukYPe+BDfTtRxfpKp66FRnHcou1K/hJgSKxlaL7NdoT5BXCNgO9gV7PWnLTc Kjdwi+5cggW4BKXdauWAwS28hke67BtyE/84njCjRNJu4S6BNd6zkX7OfJciT2r6tobA De6rheEHYPKi0udV4DqRDyEWoznW5dOmS2b0jcY1iyq+sA7faLfmz+cY3OxKNuQPHtni IZ6A== 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=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=UsZ8O19ObiTG1MNSqgPzXOCaTYNUpl18ssMqOV6dEDWzCUDM1lHwVrxRpjfsnoEmam w0CfAZUHNMNHGvprCHRAstPh2Ap3yRUt5q0knUgS/px13AXYI/IjLePDME1oOqkdapQk THrO2VQNxHnx1OlmeNhVvfH0p7IoQolSVgTqXJfveQNs2qLUW43VKw/uDf2eteypp+iM ktRT2T5vs+y1kbI5i+3FI6WALshi3eClhWgpsVIz/bD2UaHo6cye64CtyfqN9rqOvGRT nibG0oCAGi0g+xRGr/l1a+CCBVQEI6FESLvJ+UW5ZGOCwVjX0ktqL3i2DqarmYqBd8Lx b/GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rhrRqYSJ; 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 bn43-20020a05620a2aeb00b00706b84dcdeasi3561147qkb.675.2023.01.19.10.07.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:07:03 -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=rhrRqYSJ; 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 1pIZHH-0003PB-CD; Thu, 19 Jan 2023 13:04:43 -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 1pIZH4-0003It-TH for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -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 1pIZH1-00011b-12 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:30 -0500 Received: by mail-wr1-x432.google.com with SMTP id r9so2669076wrw.4 for ; Thu, 19 Jan 2023 10:04:26 -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=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=rhrRqYSJI9OsKpMdvB3F/6evexZsTq1FU18XCHwm/DSiAOgbB/d8lXASOMIM/9/UVF zN602s9+JM8HS/P5yvNPsT7AXDXGyGm5+EGNt/tvNA5dDWQuC9k0c3fCu+ZnHLBV5v+k en3x4TdMNReWCZEiu4ng3nufreIIYBCisjOUlrL4SVugMZhtgQwm3eniaMux/hv8XBCm ygAryxj0spDn0t6iCVWRK6GObAsqallLlpiyGhhx4kHTFVApCHUGfEEcqDE4LFb/P9r0 72ZFhLn2CxhazGIoMBoOVh9PMpsgRzC2b9F7hlG+lmuA4iuI377xFuYuKVAQUVJwq2jt Y1Fw== 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=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=6MAmJ22KA0M3hFUL7eONi/LxtW1gDlMi9nS/JEjdbKh9iXdTTPpp+dtW4TL7dWLkI3 Z3BiXw0BSaqoKOqv6Lm9k/p2EUylWLBkP6EcOSctfF4TZ5Dy6Eqv8Xavs/teFmLMTT8x Q+3hDFT8tAuvmDEAZ8ABH1LAvkhzHDrddJDYE7E5pIZRY9uQYIcn0OzP45V9yrrYgNnI rTHRYRYbywygaWWk3sJbWQzNjtW+yTFd0P8m7veEI5uf1RRWhyqtQWYvpQxvsBZ50hEJ FIejr6L2ln2bm5Mvftc6M1twtPJ3ma9HPBQsgrqLfM+gEpmZOTtlGqJi2ASqcEAJ42AF qf1Q== X-Gm-Message-State: AFqh2koM+uFPHRNhz50MIjqeuSrOqBYsLoKdKMpih7UQSQFr4OSKvJ2R Dz5qzygLKC6I7aYUnN9Ge8yUhw== X-Received: by 2002:adf:fc4c:0:b0:2bd:dbbb:e7e2 with SMTP id e12-20020adffc4c000000b002bddbbbe7e2mr10000737wrs.60.1674151465608; Thu, 19 Jan 2023 10:04:25 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r10-20020adfda4a000000b0029a06f11022sm34378020wrl.112.2023.01.19.10.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8119C1FFB7; Thu, 19 Jan 2023 18:04:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 10/18] Update lcitool and fedora to 37 Date: Thu, 19 Jan 2023 18:04:11 +0000 Message-Id: <20230119180419.30304-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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: Marc-André Lureau Fedora 35 is EOL. Update to upstream lcitool, that dropped f35 and added f37. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/fedora-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 75383ba185..cc5d1ac4be 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 98c03dc13b..cabbf4edfc 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index d200c7fc10..f44b005000 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index e3eb28cf2e..319a534c22 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 +Subproject commit 319a534c220f53fc8670254cac25d6f662c82112 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fa966e4009..a5ea0efc3b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -111,7 +111,7 @@ try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) - generate_dockerfile("fedora", "fedora-35") + generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer="".join(ubuntu2004_tsanhack)) @@ -161,12 +161,12 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-35", + generate_dockerfile("fedora-win32-cross", "fedora-37", cross="mingw32", trailer=cross_build("i686-w64-mingw32-", "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-35", + generate_dockerfile("fedora-win64-cross", "fedora-37", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu")) From patchwork Thu Jan 19 18:04:12 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: 644115 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp363474pvb; Thu, 19 Jan 2023 10:13:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXssxkqDQkg5i4Q0Sq7YOjDYejmcGN6vIEpX71Sjd44RI1lXnQhdfsttIoHIcnWvilhifcQD X-Received: by 2002:a25:ae26:0:b0:6d6:c1db:f6f0 with SMTP id a38-20020a25ae26000000b006d6c1dbf6f0mr10579567ybj.28.1674151991125; Thu, 19 Jan 2023 10:13:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151991; cv=none; d=google.com; s=arc-20160816; b=weySXVqU3ID9DCUQsRTlL5kFJQ06TjnDEVCujehbbNXtOR4r+ns8uzHsOrFcPXAXvp s12HIzA7GoWnwXohaFuOvI+imivjRQW4vgyYh4wRHd+eMlmnXUXyBkl4b0d0/dG9vkBU 27qlIT0Gnb7iakOnXyn/K/5OCH2CBxPj5oQdgpcc5RmO2fZ9D88gfWR0q2EQMe2nzTcX aEEAq+QjSURW74/VmYrsLfKr9Mq/Ff0jnblIeQQy7foe0kddro0wfJMBo73Hz9u5De3A CkFtjWmpyAERu+9EWrCgvCIxzk62RBH+wqAUh0XtnASRewj+a7rGYCABHXXErTWApPg0 yEOA== 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=z0YfL8vRVyh3lous/0s95D/+xZNaaK4U/ROvzEEMvDk=; b=VEfkFIs6dMT5YeOJF4MPuKb8E7kqTVLh3qRir08Em0pUc3S8ovfNPu54kvx3ekL9kC naGlEBXaHmP0FMDMNb8VCTcYICiYfXjZRQyF+PBWbJJyj3ny1pwI3FCBHJ9C2MyxI3Al jDKoWNF6b+mYMjieEvShOQazXKKVRMZ/tZ5Y6KSF9XZnzzH/Rqj+Tx1hcxMjuu45MdWa Xyg/ecVKJuHc3mC6C/sVklxQ7pIFE/anWezzRaS+8pkYQOpIwbTI+1KQHszuluId+A87 Lt8Fp1V5+D6nS8rKoXuhoyE+pfx4UUbf0muNS3bcwC10QQBfgGE9yIntxooLMJvJdaVO zUEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CoF0eDAJ; 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 c26-20020a05620a0cfa00b007024a966418si21913175qkj.604.2023.01.19.10.13.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:13:11 -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=CoF0eDAJ; 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 1pIZOT-0005wL-99; Thu, 19 Jan 2023 13:12:09 -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 1pIZOO-0005va-LN for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:04 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIZOK-0004Hp-3g for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:03 -0500 Received: by mail-wm1-x32c.google.com with SMTP id e19-20020a05600c439300b003db1cac0c1fso2663083wmn.5 for ; Thu, 19 Jan 2023 10:11:58 -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=z0YfL8vRVyh3lous/0s95D/+xZNaaK4U/ROvzEEMvDk=; b=CoF0eDAJJVbZ/BEsw1lJKzskIyKbFI5V5by1qXTRaP5VI0Ai5ozBOuiEIRmujHij99 AXDdChS4fzn0LEnAFtOzBjJOEzee/zPYQOjVtx0b9fP8QY168LjblQsK9ynZlpKUBIJd ZUvipzM6kzBqK04I+EIIWMI6v1Qq01DhUAZBgZ/EciPFzwGzIAb7mW1JIkP4E2fxdwJn NJI9xl8uGwwDdfCJ2lhIGQpPAnIaTnbMfIH1z9CK5G/WJD6zFeUiyIpLDbdE/LZsWuMt y4VbN20UHWf8DhJ4VHmArDvCKfLHEegZXu3OOMHi4YGIHBQlXCoO33LWR+JcbEaf+l+n FAqg== 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=z0YfL8vRVyh3lous/0s95D/+xZNaaK4U/ROvzEEMvDk=; b=elbvtJtXPdI2a5ypxrD9wdDmR7SP0QOQ1EV7nr4NLjzMBw4GlGrdhqnxBY03J7IGTW n1jSNH3PzWqga0L16GlwT38ZfGOhOvRgBSOMsnHrM45BzrF+/dXdMx1TW7njW4WYVXNs +lFv69wbHDbGno8hPEYNYu6i2BTHGrujneaTQNOWOwF/BNK4imC8Wf4k+0JF41d2XhpL 3PMXXiVWWP57qCMU0QB2O97AqPxTXwYQx6eFZSjp5wjSUq0Q97RLraewHHEsw65gcXNg nhidKC/P95VWc/01mZEApal1+t1Kq3ceMxaGMpY668MqMDdqKeN79cQyjjp/anE0EwdO 98yw== X-Gm-Message-State: AFqh2ko9EI+1RQm2lo0AcVhMZ9BHZ17mbiWgq96FTEmSK1NvsBJSXqwt 8m/M2dGrCQPAXbi2cnPWHj6rhw== X-Received: by 2002:a05:600c:3c91:b0:3da:f5d1:c677 with SMTP id bg17-20020a05600c3c9100b003daf5d1c677mr7343131wmb.35.1674151916765; Thu, 19 Jan 2023 10:11:56 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s7-20020a1cf207000000b003db11dfc687sm5443818wmc.36.2023.01.19.10.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:11:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CC64F1FFB8; Thu, 19 Jan 2023 18:04:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 11/18] lcitool: drop perl from QEMU project/dependencies Date: Thu, 19 Jan 2023 18:04:12 +0000 Message-Id: <20230119180419.30304-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-8-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-12.vars | 2 +- scripts/ci/setup/build-environment.yml | 1 - tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 1 - tests/docker/dockerfiles/debian-amd64.docker | 1 - tests/docker/dockerfiles/debian-arm64-cross.docker | 1 - tests/docker/dockerfiles/debian-armel-cross.docker | 1 - tests/docker/dockerfiles/debian-armhf-cross.docker | 1 - tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 - tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 - tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 - tests/docker/dockerfiles/debian-s390x-cross.docker | 1 - tests/docker/dockerfiles/debian-tricore-cross.docker | 1 - tests/docker/dockerfiles/fedora-win32-cross.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - tests/vm/centos.aarch64 | 2 +- 23 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index e3fc3235b9..f32f01a954 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 perl5 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 texinfo 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 spice-protocol tesseract texinfo 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 9f56babd9c..813c051616 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 perl5 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 texinfo 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 spice-protocol tesseract texinfo 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 ef9e14b373..33bb4e1040 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 perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo 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 sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON='/opt/homebrew/bin/python3' diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index b04c2b7cee..58438008ee 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -155,7 +155,6 @@ - nettle-devel - ninja-build - nmap-ncat - - perl-Test-Harness - pixman-devel - python36 - rdma-core-devel diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 094f66f4eb..3293c790c9 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -77,7 +77,6 @@ RUN apk update && \ numactl-dev \ openssh-client \ pcre-dev \ - perl \ pixman-dev \ pkgconf \ pulseaudio-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 1f70d41aeb..f13745e6cc 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -91,7 +91,6 @@ RUN dnf distro-sync -y && \ openssh-clients \ pam-devel \ pcre-static \ - perl \ pixman-devel \ pkgconfig \ pulseaudio-libs-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 5e57309361..d0ace6d0f7 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index bfeab01ee3..0517c4c315 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -108,7 +108,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nettle-dev \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 98885bd0ee..9ac1c1ba3f 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index d5c08714e4..8be492f4ad 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 471444fcf4..da789e04af 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 15b0224b76..8b7c59c4f9 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index a5d3ca6e2f..f9f1ed5fd2 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index d2954e61f6..e423d88c2d 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index d43ce16317..c1134f4cec 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index b573b9ded2..34b2cea4e3 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -28,7 +28,6 @@ RUN apt update && \ locales \ make \ ninja-build \ - perl-base \ pkgconf \ python3-pip \ python3-setuptools \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index cc5d1ac4be..de811b332b 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -42,7 +42,6 @@ exec "$@"' > /usr/bin/nosync && \ nmap-ncat \ openssh-clients \ pcre-static \ - perl-base \ python3 \ python3-PyYAML \ python3-numpy \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index cabbf4edfc..71681d6f92 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -42,7 +42,6 @@ exec "$@"' > /usr/bin/nosync && \ nmap-ncat \ openssh-clients \ pcre-static \ - perl-base \ python3 \ python3-PyYAML \ python3-numpy \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index f44b005000..ca3793b04b 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -98,7 +98,6 @@ exec "$@"' > /usr/bin/nosync && \ openssh-clients \ pam-devel \ pcre-static \ - perl-base \ pixman-devel \ pkgconfig \ pulseaudio-libs-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 4361b01464..680f49e7dc 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -88,7 +88,6 @@ RUN zypper update -y && \ openssh \ pam-devel \ pcre-devel-static \ - perl-base \ pkgconfig \ python3-Pillow \ python3-PyYAML \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 9417bca2fa..6594bba338 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nettle-dev \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index c62dbc00f9..c2af92348a 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -83,7 +83,6 @@ packages: - ncursesw - pam - pcre-static - - perl - pixman - pkg-config - pulseaudio diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64 index 2de7ef6992..3f58de1e64 100755 --- a/tests/vm/centos.aarch64 +++ b/tests/vm/centos.aarch64 @@ -28,7 +28,7 @@ DEFAULT_CONFIG = { "dnf config-manager --set-enabled powertools, " "dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo, " "dnf install -y make ninja-build git python38 gcc gcc-c++ flex bison "\ - "glib2-devel perl pixman-devel zlib-devel docker-ce.aarch64, " + "glib2-devel pixman-devel zlib-devel docker-ce.aarch64, " "systemctl enable docker, " ), # We increase beyond the default time since during boot From patchwork Thu Jan 19 18:04:13 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: 644099 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359182pvb; Thu, 19 Jan 2023 10:05:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXv+nsFEvAxGzKUCa3bDPYRT3iQVulRk0xXCh3R5IiKgZvtsbEgMdBOX9F0OOaa66WNmKfcN X-Received: by 2002:a05:622a:1e1b:b0:3b4:a6af:a2f2 with SMTP id br27-20020a05622a1e1b00b003b4a6afa2f2mr15743021qtb.34.1674151505883; Thu, 19 Jan 2023 10:05:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151505; cv=none; d=google.com; s=arc-20160816; b=S6C4MH694N78RIfHhf3aC6Rnq/6D+KL98gN8KcpX+2wueRGmUyJOfznzsMzSdKeRls udKzLW4NI0bRWotrj/H/dL9VluJw4EoGwl+Pq6kXbk/hHE85A7DgZcZBtgS+WPAYKZqk SPuFPXKdEOXvjeY1NnLnD1TGLobtKoBo+RnwaMtQbnKCPkQEqUzuXFd43ZQL8tvswB4u w1lH1hv2dpG0+dZhcX9nvKLenABHpgQxXujBJWj4OlOp6pN2AGMJDFAmCDFgwG7ggrjo C8TJgWdMCOV+ZVeB61BDnrMUgwMlMttSFeKEmArIBaxOzNZnVWwxNlkzduZhUd9r/hsM irKQ== 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=abhryp1MJV0DshEz140LPVlJItKpk8kE7C1e6LVlgyk=; b=ez0YWbJ7JkHgOFLVMbTadz/K3tU2GMA8/q6PkiKZsaj8gVPpaWAEuYHGV9cDkOWYG4 YnARsq/C4ReuK27h7zhyHXqSR3PShSCqTYM2XiPDmqCp/wMdxvPFUBtQBN4K752WbGlR cRRPpB8S6MeUYUo2mNb93pC4jhJMowRwo8iP01+LJRq/QLv4Xee0RU6zZZm1DDp6+ilu 8XdImnIsavIeDoTIzv7xSbVI9HGT0d1SrP5lqmFwP34E2Sf0x6uMB9U+zO+kT5RgeQy9 n69rXpkE6kLndR+6bVypfJ6BG3ooRsIT4MIzbfPTiBP6vPGIIAcYv1cRAriFcBe//Dwq vDDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yl0RvZjR; 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 v14-20020a05622a188e00b003981462e81asi23047879qtc.702.2023.01.19.10.05.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:05:05 -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=yl0RvZjR; 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 1pIZHH-0003PP-UX; Thu, 19 Jan 2023 13:04:43 -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 1pIZH5-0003Iu-DI for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIZH0-00011X-PJ for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -0500 Received: by mail-wm1-x329.google.com with SMTP id j17so2225332wms.0 for ; Thu, 19 Jan 2023 10:04:26 -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=abhryp1MJV0DshEz140LPVlJItKpk8kE7C1e6LVlgyk=; b=yl0RvZjRw4N8fvOVyn/XawSZqV9aX+KAHlGj/wDytFmHwKBV+0u91bcNq1jS3D9Vt/ cr1BsP2lPMzAVXvb30FZCralljknZHxuvoEcxWd8d6q4zIWLzplurZTML+aiATHzd8cL Y/+DjvfYAC+GAseEoWlQwMPhKnHc/Z3WVDPq3LW/AQJZ2V2DDSfp5sC0MSM2CdFFtyqi U/xpEMl11vNdYewTuP0r+2MvVNHFhietSBzweq2hGdVXFd/60sQ4/1FnQo0P8tA5Rcxj l3JwJCtvxCGeN52A2ynXeUrhlE5SkwMWThEgz0Vh59GG1ALkrWlXQZONdi8ddHhQq2bE IKIg== 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=abhryp1MJV0DshEz140LPVlJItKpk8kE7C1e6LVlgyk=; b=pbPeuBqwTrPMHtecjd/CvlArrcdfSb8TS2LQFk8ES7/mO0iolZHr37zyrjqEOpqQDM 3hcFcPU1dtY7lCoBKwvUm/ItFTHCmAKmBgBnzQfrvoWa27e6l4ATDvUDN4a8S3hn4y6f SRk3EJ2e044wD6ceC+5HcgfYCcN83KYgW29NyeCIlEWv9n65NoNXsCGxujkDjrxsN6gN s7e/grSeUkiB/lxvJSjxeWRdwE8tlUOM3N4tZwrbYLRV6WATFIfhE1BYyxIiOzC5e2F3 bFR30hd4+g7ufripHN4gO8mExVAdTgTx3AeEMC22JZe4WfxvffdaYBgYISRwijvxtrNQ CWFQ== X-Gm-Message-State: AFqh2krbU+vuDpDHNQvlaO7H6zLd9/Q9Tu5tiLiNDwMAdfa0XChrutj+ b5Jul6iOJZW71R4RthhkJYd62NEBxnFTq4rX X-Received: by 2002:a05:600c:a4d:b0:3db:1d6:16f7 with SMTP id c13-20020a05600c0a4d00b003db01d616f7mr7365994wmq.23.1674151465152; Thu, 19 Jan 2023 10:04:25 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r6-20020a1c2b06000000b003a6125562e1sm5377114wmr.46.2023.01.19.10.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D8A31FFC2; Thu, 19 Jan 2023 18:04:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 12/18] lcitool: drop texinfo from QEMU project/dependencies Date: Thu, 19 Jan 2023 18:04:13 +0000 Message-Id: <20230119180419.30304-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-9-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-12.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 3 +-- tests/docker/dockerfiles/debian-amd64.docker | 1 - tests/docker/dockerfiles/debian-arm64-cross.docker | 3 +-- tests/docker/dockerfiles/debian-armel-cross.docker | 3 +-- tests/docker/dockerfiles/debian-armhf-cross.docker | 3 +-- tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 +-- tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 +-- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 +-- tests/docker/dockerfiles/debian-s390x-cross.docker | 3 +-- tests/docker/dockerfiles/debian-toolchain.docker | 1 - tests/docker/dockerfiles/fedora-win32-cross.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - 21 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index f32f01a954..8934e5d57f 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 texinfo 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 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 813c051616..65ce456c48 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 texinfo 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 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 33bb4e1040..65b78fa08f 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 texinfo 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 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 3293c790c9..4a569d82f6 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -99,7 +99,6 @@ RUN apk update && \ spice-protocol \ tar \ tesseract-ocr \ - texinfo \ usbredir-dev \ util-linux \ vde2-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index f13745e6cc..fbc953c6dc 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -110,7 +110,6 @@ RUN dnf distro-sync -y && \ systemd-devel \ systemtap-sdt-devel \ tar \ - texinfo \ usbredir-devel \ util-linux \ virglrenderer-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index d0ace6d0f7..5175095a85 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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 0517c4c315..b61f664ea2 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -125,7 +125,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ - texinfo \ xfslibs-dev \ zlib1g-dev && \ eatmydata apt-get autoremove -y && \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 9ac1c1ba3f..b69958c69f 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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 8be492f4ad..96b524fab6 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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 da789e04af..08a75cebdb 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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 8b7c59c4f9..5930e6fa5d 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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 f9f1ed5fd2..c65d9830e7 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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 e423d88c2d..2ae56c978e 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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 c1134f4cec..0db86a0fcd 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ 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-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index d3d4d3344e..6c73408b34 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -21,7 +21,6 @@ RUN apt update && \ libmpc-dev \ libmpfr-dev \ rsync \ - texinfo \ wget && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt build-dep -yy --arch-only gcc glibc diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index de811b332b..b659c0b8a8 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \ tar \ tesseract \ tesseract-langpack-eng \ - texinfo \ util-linux \ which && \ nosync dnf autoremove -y && \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 71681d6f92..0a404c15bf 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \ tar \ tesseract \ tesseract-langpack-eng \ - texinfo \ util-linux \ which && \ nosync dnf autoremove -y && \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index ca3793b04b..5d60a96141 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -121,7 +121,6 @@ exec "$@"' > /usr/bin/nosync && \ tar \ tesseract \ tesseract-langpack-eng \ - texinfo \ usbredir-devel \ util-linux \ virglrenderer-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 680f49e7dc..4b2c02d6ab 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -111,7 +111,6 @@ RUN zypper update -y && \ tar \ tesseract-ocr \ tesseract-ocr-traineddata-english \ - texinfo \ usbredir-devel \ util-linux \ virglrenderer-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 6594bba338..13ab0b6887 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -124,7 +124,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ - texinfo \ xfslibs-dev \ zlib1g-dev && \ eatmydata apt-get autoremove -y && \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index c2af92348a..6467bcf08a 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -109,7 +109,6 @@ packages: - tar - tesseract - tesseract-eng - - texinfo - usbredir - virglrenderer - vte From patchwork Thu Jan 19 18:04:14 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: 644101 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp359183pvb; Thu, 19 Jan 2023 10:05:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXtOdy6e2bwiN0aps21lP4aAbclWbnFzzqS9G/n23iocsIzlEE2Q/MMX+pKwAhX9jnlH49Fh X-Received: by 2002:a05:7500:7d82:b0:f2:1951:540 with SMTP id jc2-20020a0575007d8200b000f219510540mr940044gab.12.1674151505854; Thu, 19 Jan 2023 10:05:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151505; cv=none; d=google.com; s=arc-20160816; b=ip3+1k7DmutyHwOkVFc6/VkomAbGZQy3PT7108X4e6KzwKA2ubJVV9MOzTo7g710Aa +Z0myVd2e2bgbCD8NYsmeQw5flK3huHDF1srmdZRHkNoAeTJ+G6kDkuzGYDSwiMwSVje srx0yTUZg9JBK0G15UNz3X/oEC4/PIXhOgV7fzaUVeppvwe/IKSlh/g3kdJYVDsz9wvM SEzv05w9SeqAW4Lt25k7IWGchRoYTQOeu46yD3KfZCmy0Y+4SyHVBi/kVWxmEJuFEMzk 8xmqqsciQ+S1I8Dfut1eDv6pTOcoWLZPEZg1tqSLsftbDfMTCDPCbcJm65gEP1AzG39C JQ8g== 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=AnZDkxLzgFFSav85Au8pAya0nVRLiogiOeok78nk0b8=; b=wvJptsFdNiopw+yFJvkJmmH6lF2/4qbM0Rz22MQ1UlJfnCRRiDPxzJrPMF3ImmXBiB CZOUlxI/Ys9asSAMAIY9+Jmq0ltF6iWBZkGABIFDr4miz9vVyIGxrJ2aVGi0cO7RkqSs 9iAS+vYjJBs+qZ0Q3eNuyZvXM0GWkC6N2i1BK5qjehPKlHS9/+i776hqg75ii4ZiBPeR Btp6aMTHcDob7X1Td6diqv1d4Qjnxp4TxwNP3GVFU7ddm1Gxe4n2OWzVcALfVzxhHAaM J9bTfmDMGK+CQBoSL6lPtBBqT0PtFnzU6x7QGLluwbXbd+10aAnwybVtIUBXCoMCPw+z taIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ozc5pjU1; 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 d145-20020a376897000000b007064fd08a38si8645662qkc.334.2023.01.19.10.05.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:05:05 -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=ozc5pjU1; 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 1pIZHJ-0003QS-8m; Thu, 19 Jan 2023 13:04: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 1pIZH5-0003Jd-VD for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:32 -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 1pIZH1-00011k-VG for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -0500 Received: by mail-wm1-x330.google.com with SMTP id f19-20020a1c6a13000000b003db0ef4dedcso4128800wmc.4 for ; Thu, 19 Jan 2023 10:04:27 -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=AnZDkxLzgFFSav85Au8pAya0nVRLiogiOeok78nk0b8=; b=ozc5pjU1h8VaOS+tlIneVN2ZVYvKpR9+LTZk+I7iGjMCtiOdq5LJbeiLHMzdEbSp4U RE805l886AFxuZ/NeE8awXvGJd6Ba1TfeyyIHH9HEdz5t1fsrGeywdZoxamN8PafKUUQ hShVQ+VjWSURPCBC0j0c/qcxZLZno3N75sttHImUQnh+K3DQL+nyHq2vjl1BvnqDqCGD HcJIeJDpbvaWvZ55At7/Gtx9Vm/JN+en0wHvIZI8rOr1vb7VnQCDLBQfHdtECrap3YaF Gn7kb703d/BZgopAzch/bVF8XCkBxa5rej/oVQJvSxOvD+3XU9P4GunCV5zj5zrQKHAv yEEg== 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=AnZDkxLzgFFSav85Au8pAya0nVRLiogiOeok78nk0b8=; b=uswVGIQkzpocS1uEplf++/XP7jDgk41JHRzFesWVijsaFP+hI7do2Ysm+aA41KgLQF ePw6si3hqk/HMaJmR9tBREwn5tfBDDwR2N+Ts0QU/4l9TouRokkXzTOMfRUjqe9y748C zJuLqBuOHgWX9FFhTjFJB8PMQHadMN+uurvvHaArmpV8wdlqhX9tVrpFj+ZZmBIl92UJ R0xw+FPmlh9wFGaPzfjk+XogNTHtfvGwupwLCr9BiP9J+MEQkrmWv1ZUR1NCvPXMEAb0 +90sJogE8Ycaw++XuEe27e1hxKe/4r463qxwQP2PHmQdjPNTFRycD8pVt78+ricsMIeT tnnw== X-Gm-Message-State: AFqh2koaSriGbOktoBrjzRVYMen9zf3J5RTdOHk0y4kS/wr8bTLla7RI fzmixh8NThyMRqyBkle24Eq8og== X-Received: by 2002:a05:600c:4d81:b0:3d0:6c60:b4d1 with SMTP id v1-20020a05600c4d8100b003d06c60b4d1mr11780598wmp.6.1674151466614; Thu, 19 Jan 2023 10:04:26 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j15-20020a05600c190f00b003d9aa76dc6asm8156568wmq.0.2023.01.19.10.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 346C41FFC3; Thu, 19 Jan 2023 18:04:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Bastian-Koppelmann Subject: [PATCH 13/18] tests/docker: Install flex in debian-tricore-cross Date: Thu, 19 Jan 2023 18:04:14 +0000 Message-Id: <20230119180419.30304-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 From: Philippe Mathieu-Daudé When flex is not available, binutils sources default to the 'missing' script, but the current script available is not in the format expected by the 'configure' script: $ ./configure ... /usr/src/binutils/missing: Unknown `--run' option Try `/usr/src/binutils/missing --help' for more information configure: WARNING: `missing' script is too old or missing ... checking for bison... bison -y checking for flex... no checking for lex... no checking for flex... /usr/src/binutils/missing flex $ make ... updating ldgram.h gcc -DHAVE_CONFIG_H -I. -I. -I. -D_GNU_SOURCE -I. -I. -I../bfd -I./../bfd -I./../include -I./../intl -I../intl -w -DLOCALEDIR="\"/usr/local/share/locale\"" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -w -c `test -f 'ldgram.c' || echo './'`ldgram.c `test -f ldlex.l || echo './'`ldlex.l /bin/sh: 1: ldlex.l: not found make[3]: *** [Makefile:662: ldlex.c] Error 127 make[3]: Leaving directory '/usr/src/binutils/ld' make[2]: *** [Makefile:799: all-recursive] Error 1 By pass the 'missing' script use by directly installing 'flex' in the container. Reported-by: Peter Maydell Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230112155643.7408-1-philmd@linaro.org> Reviewed-by: Bastian-Koppelmann Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-tricore-cross.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 34b2cea4e3..5ae58efa09 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 \ + flex \ g++ \ gcc \ git \ From patchwork Thu Jan 19 18:04:15 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: 644107 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp360318pvb; Thu, 19 Jan 2023 10:07:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXv9tEv8XuHggGe/Pb2yf4qhNYBVszU+6gIgXhOpztCYDSeXqNp6UGdkwKF5WWYVdGp/tuy7 X-Received: by 2002:a05:7500:6d0b:b0:f1:a3cc:ab50 with SMTP id kd11-20020a0575006d0b00b000f1a3ccab50mr1135532gab.69.1674151622895; Thu, 19 Jan 2023 10:07:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151622; cv=none; d=google.com; s=arc-20160816; b=mrbdfqO91WDKhY4rXvzlcoNMkSC0N2V9Nv/wZo8lKc3e9+izPnRcFewwE0eJwrZFVo bYBodLGLmtV9xTg9m50CzwHNoE9xaNbo/1V4msYAre1h2bYYAkCmjqN7dzobCgKV0d8n dCdO40kmW7OK8WX1Pz+hkaAAOH7Qmj+UOarcConXOFagwb6Id41UnvDZhHjkIU7AGF21 gkV0fXarl6Ll/WGvlHQnqQIXhXjuFnwVkPwpqBrDUhKujIDJFUP+v0AP5T5LQdzwr9PV PAlLqiPQeEmcU4hNuBUniDASKQsVguDglLb7sgYQBkM5V6wRbL+w6cea619ZTXSGtvWq S2UQ== 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=vZLHCuh0wigKWde+YAzRi65bgogzVgt43O8RyRryEl8=; b=URzdI3fGD9WTQ7Yc4vM8LxJpoOPKZ3PwQgWVavJDut5PK5ErqCm/CjwG35jWLT1svq fc80Gw9Dwoa7bNPrSHxmlnrpazuXH14otHZ5Mrt5SDv67pzfiSkCbeeo08lUkzo79mcC a7789oL1vik7Z08Qyx+DKYS0cqj1RWU7dZonjNiw7NCH6ySAsj1YJ+claJ+OWVO/5rMT DxEoE/YPaFKBD2GsNWFOv4hfIVN11BN4zQ+C5Xu1G429Tz/lWhZ9CggKtURFBMvU7JnS ySkiYV+1MPu1GGvwlJfX5ha0bqob6nAABf4YHg51gNyKQdrdic3h34Wh3hGOtOL9X/st bnLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WlmXnpff; 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 r2-20020a0562140c8200b00535090bd910si7771750qvr.244.2023.01.19.10.07.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:07:02 -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=WlmXnpff; 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 1pIZHG-0003O5-9G; Thu, 19 Jan 2023 13:04:42 -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 1pIZH6-0003Jy-5Y for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:32 -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 1pIZH2-00011y-Sn for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -0500 Received: by mail-wr1-x431.google.com with SMTP id b7so2675752wrt.3 for ; Thu, 19 Jan 2023 10:04:28 -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=vZLHCuh0wigKWde+YAzRi65bgogzVgt43O8RyRryEl8=; b=WlmXnpffOo4sCwLXgcztoYdJ2n4VSzM/TLpHnjNDqqIqyb4iYdpY9+hfZIDyU00rJm 85uqxOZa6tPuJkQ+l4sXJsSNN6Iu8vfP0GfbbiCGVm+MlXI28c4ivtxwqqRYKY+GA7XC 8gGKdZyd7Fp4YPiL254Cx2r8fqcbbSniQDgA7xR2AmgKJloStbnKkTPF8OdEPSlF5Nx0 s+vdcZLyFZw/6sKbIAQxzEQMzq0qnZBWi7gYD68GVremGn6Rra1YZGAFcF568IKWJVNC TdK6uziqzT4LxRxuyiiiihBhDLGBuyGkXfk4qDFbn5k3nXd59R1PHXFpxhaLc2pwkFMv OSdA== 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=vZLHCuh0wigKWde+YAzRi65bgogzVgt43O8RyRryEl8=; b=WppnsTdzBDIdRPoHVtTZYbsnNYn4PQ2Z0GPAVa/bWq2X3AEj+BI7v2od7c4kLI7hFx A3O30sKAbpKj98FHTANlMKeXPk9lzjgm/4Yv+M0b0x94pY1tn0ZwZ5FEzFj5trC4qQW3 3JMdJxulBl4HranhtiGO/CZ9+y5zDHaPNwh08GsuxC26Mize6mCVE/zBFhHU8LovFHrB xe2SZo5iLDaTICBCLxuqmgZ68jxdEwOByEL15ZmQfj2bM8lml7PUoNjk7vRgOY+rK7xe IdeP/uoiq+aG2WKFI8nLgLag2edag+xyv8c/e9hF2IKCBClTLVC5mfBwFSmpTy245Pop oMOQ== X-Gm-Message-State: AFqh2kqqWOgwvFNJKJ97me0DS12Xem/8neaYOIJ88Pu48Q1W5yzWSCQl +0l8vzIgcvWoD5WzptV9YkEIdw== X-Received: by 2002:adf:e310:0:b0:2bd:d8f1:2edf with SMTP id b16-20020adfe310000000b002bdd8f12edfmr10351550wrj.49.1674151467290; Thu, 19 Jan 2023 10:04:27 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k6-20020a5d5186000000b002bbddb89c71sm30592743wrv.67.2023.01.19.10.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4A6081FFC4; Thu, 19 Jan 2023 18:04:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 14/18] tests/docker: drop debian-tricore-cross's partial status Date: Thu, 19 Jan 2023 18:04:15 +0000 Message-Id: <20230119180419.30304-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 This image is perfectly capable of building QEMU, and indeed we do that on gitlab. Drop the DOCKER_PARTIAL_IMAGES setting so we can also test the gitlab build locally. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 665ddde518..bfb0dcac21 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -128,7 +128,6 @@ DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross -DOCKER_PARTIAL_IMAGES += debian-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross From patchwork Thu Jan 19 18:04:16 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: 644111 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp363278pvb; Thu, 19 Jan 2023 10:12:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWMBONkNvUZIMgvbmeF1/MMRElaoNj7i/1tUuzLcnN0acKFmFhTf5jxY/3hi7VvFwPl9mE X-Received: by 2002:a05:6214:2f06:b0:531:557a:63c4 with SMTP id od6-20020a0562142f0600b00531557a63c4mr21015055qvb.39.1674151964304; Thu, 19 Jan 2023 10:12:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151964; cv=none; d=google.com; s=arc-20160816; b=hVsw7WLrw2tlBrqX5Z/qJxL5+ctxc8ncHPJH6Lg7rI63J8sgiFm/F0rytDCrtM/Efe 9s+L4yHQ/d/5xgLk4DGzHIiQa+j1QTSqUdDEYHcpQsEFseHcA8Q+gdIeLQ7l4ozek/HO kOoQ71GUDS+q4OyDtmdo6XCc4YSk1btQ/1JOKr7PjODiXITr8EKmQZ0QQSwSJ5NQvetH WDX9swkdmmMEvspEVs3kiBBMZiEb6vUGkha33WiZfPU07ZfN4E0LSKNa71n6O+3EwPw0 kTb3+xI0WpW45mt64U8Z1wOOI0ks1D4irwucy94hLRFCQZA/8ktOPVcDqhPOLoVREumy 1qLg== 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=I0FrZ6m+/DDXlf1KBSDr4ILm73xZLFUqafMmPw3ilEY=; b=QunKHkLP6B/LUycrB6o/4OvxE46/BNxVnyVi8vymp7mapsbNUV67g8frvg9hFf5H+8 UnAk+D49/PLzHkA5POzBnmKw472OmcT3L7gWKyu4e3GLBFeqd2MsXFB34/rMsbuZUlTf Ksbpsnf2E7I2KnwXpO1h7Soz1Bms7opdRvsV2GQCuPsxrg6aDpHhS+egs9SSCXAXQn/I WpaT80fsyKxSkLfNlhTLuLIRjI4Qzo2ZmEuD3KX61ybRheGzHUp3Hi0M8fJLodOw2ibR 9oSPTIJgju+8jgtadb7WG0Qkyiw7/ZcMFuBGnzqVcmCE3Bjef18hbIhliY2zoNnZoPB1 uong== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kxzb4qdU; 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 h14-20020a0562140dae00b00534e7931aabsi8713061qvh.434.2023.01.19.10.12.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:12: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=kxzb4qdU; 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 1pIZON-0005uw-GQ; Thu, 19 Jan 2023 13:12:03 -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 1pIZOL-0005ud-S4 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:01 -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 1pIZOI-0004HM-7H for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:01 -0500 Received: by mail-wr1-x42c.google.com with SMTP id q10so2701063wrs.2 for ; Thu, 19 Jan 2023 10:11:57 -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=I0FrZ6m+/DDXlf1KBSDr4ILm73xZLFUqafMmPw3ilEY=; b=kxzb4qdUHGlACLRdMddcD09zO033jrQbHucuHZvR+BmQEzP+dWMD5eZ8yeEuoqEUpy e7xyAYJlfn/hRMVZ2LhURTajUsnVNgS5hSZzzTcbV5+PeLTc+r7TCSOyS5txT+F/Pqzl ZD45tjZWHil7mJzsoYMnwb1ZekOU6nNweErITFN8DwW6bEsYonm+OP7oQzp8njuPNreb 9kZasjG0eDYbwMvfD99nzaAEvUHfilGuFBIvjH3f78eU1/HNytQRlipTmfR/9K3+6tlE ZAjNx1MP+otqHTJoUZjrFefvwE6ZbSKiVc835wpM8ojjvpbAFG7SfHVKA/h9MurIIxPo 5aEA== 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=I0FrZ6m+/DDXlf1KBSDr4ILm73xZLFUqafMmPw3ilEY=; b=3Hif77ZGO56LELC+DHLWM3cqA1xghszdBgg6viGfnXCpAEZvgbbTWnk/7+SJj2MKDa eiTMJFcs2nCurGCHm4d1x71nAuDLSK4BCXNLEwGOnLwHda3+66La0ytrLohNsAy9QDdx nVq87D2PXUMk8W6KsSzY9dsDxpxYOhA9rtAJ7+TTwng6luEyn3jAa13VapATH+OW2rzb y2jrXLEL2gb7C77nrBNViRBNlqgZ5GFe+lVmSn9n15PSHTuRQ152ShzqSKnn4sH2cbmT VqzLzEFXNHlvZdM6XQHjDV5bYx3a7ihZDg+O3eKXfP3Ospgheez6RjPQ6xm3Y0qDUiBM 6XAg== X-Gm-Message-State: AFqh2koE6ubht2RzLF30HlCUVoU8oEkPeTfY//DzMUYVpG1tUmwtVO82 dr8z0KGbJScaHYNzqOUIw1sV+w== X-Received: by 2002:a5d:5b0e:0:b0:2bb:e9e6:ac26 with SMTP id bx14-20020a5d5b0e000000b002bbe9e6ac26mr11656342wrb.57.1674151916509; Thu, 19 Jan 2023 10:11:56 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l5-20020adfe9c5000000b002238ea5750csm19848704wrn.72.2023.01.19.10.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:11:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 62F821FFC5; Thu, 19 Jan 2023 18:04:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson Subject: [PATCH 15/18] tests/tcg: skip the vma-pthread test on CI Date: Thu, 19 Jan 2023 18:04:16 +0000 Message-Id: <20230119180419.30304-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 We are getting a lot of failures that are not related to changes so this could be a flaky test. Signed-off-by: Alex Bennée Cc: Richard Henderson Reviewed-by: Richard Henderson --- tests/tcg/multiarch/Makefile.target | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index e7213af492..ae8b3d7268 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -42,6 +42,15 @@ munmap-pthread: LDFLAGS+=-pthread vma-pthread: CFLAGS+=-pthread vma-pthread: LDFLAGS+=-pthread +# The vma-pthread seems very sensitive on gitlab and we currently +# don't know if its exposing a real bug or the test is flaky. +ifneq ($(GITLAB_CI),) +run-vma-pthread: vma-pthread + $(call skip-test, $<, "flaky on CI?") +run-plugin-vma-pthread-with-%: vma-pthread + $(call skip-test, $<, "flaky on CI?") +endif + # We define the runner for test-mmap after the individual # architectures have defined their supported pages sizes. If no # additional page sizes are defined we only run the default test. From patchwork Thu Jan 19 18:04:17 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: 644112 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp363285pvb; Thu, 19 Jan 2023 10:12:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXummAV4SohrsDS7Joa7o3He404vrSCF17UcJmPSqJtoxm6RldJwsua5TTlIjjnjkUo2N8Wy X-Received: by 2002:ac8:5384:0:b0:3b4:fb8:ac2e with SMTP id x4-20020ac85384000000b003b40fb8ac2emr15492433qtp.57.1674151964886; Thu, 19 Jan 2023 10:12:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151964; cv=none; d=google.com; s=arc-20160816; b=v+GNOKXa5EvEn6IX4nptzZ9JdrlnKCxJCOBeyHyqGZPXamn6WZSEXT7/T2ty08R8Hy PhjbyxCjddr3SpADTz1M2jiv70rE4C11n1gx9IX13W9UuF4h/xdSq4jQCL8H/08aaO/H vPGC726rm4uPKMSLVLBdoAHVg4IhzwmHtbg5kEbnInCvovVFGuDFSJrYdK9CNazv0KGp NrKjf+a5sosDsGgmLcMU8veF8tnAnjqLNA1pgF7jMpjsbZDCLsUVMDYbBaVVNcSIjIwe BrzDrw5F0b3WejlFHwYYnyJ5kF5RLd7OODkaMngLLkgbHgvcV2q0b///t7OusoZgRiG2 edHw== 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=O11vIssB0c/YQGszKfyHBYwLF94tVnKcI4eAkWMf9bM=; b=NWT5FKuB+02U5ZBNuPJFLxYKtqoftUVArhJJbjIETzxwX4Hh18RPK4mbauUj5Qdw7P JAq83c4DvJy+MQQpRgKOinfsgWlvc+bHMLrjdzXiKoWbKTm7azVzTCimusbs7fKlI4sR LI1hLrf8cpZH7O1FW2jkeNMFuflriywIUa3Zh91YnJGi+4Gq3+cscrXMb81y8Bc9dsCA eWnj2B3IyWA1sB/tShgY+xB5pKnXIdvhbpx9o6njDUHQUtviP/TVDhRH3I4o0RaCp2YH uWAchLb7Hd1mnm9GeNnELok0Qf9d1TORyYY1swC1cm92K4/PaKRlx78ROblrsx4Yd0lP Mdhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WZWlox0R; 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 g25-20020ac84819000000b003afd20c3d27si17295590qtq.101.2023.01.19.10.12.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:12: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=WZWlox0R; 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 1pIZOQ-0005vr-3I; Thu, 19 Jan 2023 13:12:06 -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 1pIZON-0005uu-33 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:03 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIZOK-0004JR-6M for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:02 -0500 Received: by mail-wr1-x434.google.com with SMTP id r9so2687902wrw.4 for ; Thu, 19 Jan 2023 10:11:59 -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=O11vIssB0c/YQGszKfyHBYwLF94tVnKcI4eAkWMf9bM=; b=WZWlox0R3p/s7s+bmjW1SNYTCHayfD1vWSS9zyBZMGjR6AGlWDfF/4GbN/f84r3H/K RuDV5UKbkl/0Rq87I8FdMWHUI77m4VfkWdd32xOPuk73057G2JmLKKA5/kbu1S2b0qAQ NoUZlKrOBB8+oxWshnfpAQwO/uZEwIaGz3G90T2i9Mt6W4gZqrRNem1yfDwdVfD+0yaE IDGDUndZ9ZZGGkJPVonMA37HM0JIs5kNgPQlOnqnU7NVz3WFfpwjZuTdPnGwfZQ/9WTT YWI8swXdznveB0wF+OrExIotFgUHI3OSem9Yn7to4mJ+tGXrh6WUA7HnLIKbWdYFzHW2 Yt0Q== 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=O11vIssB0c/YQGszKfyHBYwLF94tVnKcI4eAkWMf9bM=; b=fQV7tvBCNKM9kHQIdI6x05q2FzoaR3YLU/QLk3D1Is45WO/xxLY2k3DbNn8FlxfYxu ZopEzeSlJV8h7t8jCT4dmklcY50XL/YczFEW1g3Eg4t3KACGeBc8fQ0+SdZwf85oWHOu CUZ81z6WofJHkw227YWhTvZren0pofrlfp3zxOmVC3cxQjC0nlRPiva8tOka0d8sLOcE Iaj/McNgLQaBbFwRY2Eu9NTHyduQf7HBUpAJI6413BJuYDh+E9JFLWlQ2LIp2EVDty3Y 71cvbg3xx4rHyXixf4OeVT1QhR6ukB1JgRFhTy2QGQb0gBHgYSHEiAr00pBYt86jxepc MayQ== X-Gm-Message-State: AFqh2ko2YQWXzTvSn2JlkYla2NXITit/yWQXJMjqVx7fHo7rvZqWD0ti ms7uKujlXpmJyEMKtAVEJajkgA== X-Received: by 2002:a5d:4152:0:b0:2a6:37a6:a071 with SMTP id c18-20020a5d4152000000b002a637a6a071mr17572019wrq.21.1674151918726; Thu, 19 Jan 2023 10:11:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f6-20020adffcc6000000b002bbdcd15e44sm30206662wrs.37.2023.01.19.10.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:11:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B0D01FFC6; Thu, 19 Jan 2023 18:04:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson Subject: [PATCH 16/18] tests/tcg: Use SIGKILL for timeout Date: Thu, 19 Jan 2023 18:04:17 +0000 Message-Id: <20230119180419.30304-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson linux-user blocks all signals while attempting to handle guest signals (e.g. ABRT), which means that the default TERM sent by timeout has no effect -- KILL instead. When a guest aborts (possible nios2 guest bug), sending SIGABRT to itself, I have caught one thread waiting in start_exclusive, and all of the others blocked in exclusive_idle. I look at that and think there's a bug in our start_exclusive locking, but I can't prove it. Signed-off-by: Richard Henderson Message-Id: <20230117035701.168514-2-richard.henderson@linaro.org> [AJB: expanded commit message from cover letter] Signed-off-by: Alex Bennée --- tests/tcg/Makefile.target | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 14bc013181..a3b0aaf8af 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -54,10 +54,10 @@ cc-option = if $(call cc-test, $1); then \ # $1 = test name, $2 = cmd, $3 = desc ifeq ($(filter %-softmmu, $(TARGET)),) -run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \ +run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2 > $1.out, \ TEST,$(or $3, $*, $<) on $(TARGET_NAME)) else -run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2, \ +run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2, \ TEST,$(or $3, $*, $<) on $(TARGET_NAME)) endif From patchwork Thu Jan 19 18:04:18 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: 644114 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp363396pvb; Thu, 19 Jan 2023 10:13:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXsG+OP3uD4akPK24wO8kpspUhEFvz2XcXxm7EzSSoQpUFXL4qcXDgR8CqN3YyFRtr1xvE97 X-Received: by 2002:a0c:f783:0:b0:534:252f:b08e with SMTP id s3-20020a0cf783000000b00534252fb08emr16093927qvn.52.1674151980524; Thu, 19 Jan 2023 10:13:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151980; cv=none; d=google.com; s=arc-20160816; b=BalstxqTUFe7xH7k4Waeuf4UwP/vojYQeuy/a/ObZOQizS5MDvJ7diNYLC9jHHayDI +PzeNrSHp1Yk8YCqhVjDmvqs+Ehm0PvCqF8SyBgNMM2wSLzjq4DsZyxUvIaXoCQgk8x0 HBsx9rxXpoZd8mGoXuFaeb+OxVdLU6+OJfIfpL23PxMTNtFYO7ynpc9PsMzqxe6iygFI bAlfnvC7o+YgDhMZku7MKQXpUAyrW4kxfmUnFZ7i9xkjALOAfcRFN9Dwp3FcVyA+T59K T60hEDacwgqOoavDzqopaeMDQ54k3AusHWsNuZuZU7j6s3X+mnOl3/9AQnYztNZgf4ip usaw== 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=pGcy7m167YyxLO7vlX12Q/W9krVoDL14tS+QgowG2zA=; b=0pFOQNituu7Jd/0ekyBrk/C/43BHCpqVU3NuynL8RmvfPNjNd3HZmXAdXZI6CFL8kF GiDBddRDMeI2c5ktuRh0Y27Vt7MZqrhKUm+Ulm9F0IC1rHe4FFgje8IhMKM052FDv2qU E+w+70f9k8jdJg/vSGl0udsESlWiLVGz0FX7VdW44/JwywYnlAwPLFqj7nKNEKltq+Ci khg8ysdH6PTqFM/TNvpaOPQah7EDreCxMdex5vibHRCQC+kV21ue6+X5hXIQJTI8hlHa tKUD28LPCeBc4k6V37fMNryIsSs6h+qjLdg9fnf3u4E3mmpaMt9QPu5/V+/cJsQv6UIU Ds9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ESWVNjyr; 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 jo6-20020a056214500600b005342f00f49bsi14909448qvb.140.2023.01.19.10.13.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:13:00 -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=ESWVNjyr; 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 1pIZOR-0005wK-Mh; Thu, 19 Jan 2023 13:12:07 -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 1pIZOL-0005ug-Vh for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:01 -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 1pIZOK-0004Iy-3r for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:01 -0500 Received: by mail-wr1-x432.google.com with SMTP id n7so2686179wrx.5 for ; Thu, 19 Jan 2023 10:11:59 -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=pGcy7m167YyxLO7vlX12Q/W9krVoDL14tS+QgowG2zA=; b=ESWVNjyr8kag/HawFVlHVVBnbe2EnHCIKI0fxtI2P2RAdA8wet9LLhXKvBJsKII2ti BGbS/TDZz8ZDEdDbHS0CYxwfQEqJl6I3CLjZMvqoCoo5fW5Ip4lzq91lqNfTHs9MgKnj xT74bgD2mOKmALWkO/6i6mBa0CHyupazeNa8x3IX9IDBjBpD57QNEfYlpSvHyLJ8q5NS i0uVqJPdXlIws1YF/X93JgvFnGVyUUNsrtM2fny596WBf48rmnfmk//fuXG3DNBDhgna rtTjFbRTSNlxVC1LumgtyS1vqXpRjQfnFbpGVyUAffd0YCVIAGW7CWtaYXhsArFNfzhN Teog== 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=pGcy7m167YyxLO7vlX12Q/W9krVoDL14tS+QgowG2zA=; b=2ObYHbkAy/cMkrHYTcw2kPpvYcBhuouhnzZqLsk2/ND5b+BsETuKJj/nEQKFAG9XRj 7Vkjk3y/b79iNT30yLOLtmEUTxaNDTjeOElsToolahD8yyvnJHcDSxBDMq+2CGnmR8yv T5kbzlun5bgUPOy2CfG09OoMxG+CUL81b+QSlvkqYDyIGS8hUpQPWU/qqEGaIfDrJay4 jQXgMPhCp5FvGQahpGvNG6lIT5Wstw0aszng9ziOMtU/o/wdOj5YtkeL8+qqudv8yE1s RUk/OpVyLReHOVmuaC15Hz0lhzSq7vz6bHK4JWur9bPTupq+kE9JYyzz0CxTe85fNfiE OlvQ== X-Gm-Message-State: AFqh2kpuHsZjtqD8Cee32wMvhG0v971J9vjjjvxnHV0e8jkjcY8a0fFy dMp8j+P2ccFBgtpI14ntCeHE5w== X-Received: by 2002:a5d:6ac3:0:b0:2be:2295:77e6 with SMTP id u3-20020a5d6ac3000000b002be229577e6mr9189566wrw.51.1674151918014; Thu, 19 Jan 2023 10:11:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n6-20020adfe786000000b002bdbde1d3absm24228102wrm.78.2023.01.19.10.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:11:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9A3C91FFBA; Thu, 19 Jan 2023 18:04:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 17/18] gitlab: wrap up test results for custom runners Date: Thu, 19 Jan 2023 18:04:18 +0000 Message-Id: <20230119180419.30304-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 Instead of spewing the whole log to stdout lets just define them as build artefacts so we can examine them later. Where we are running check-tcg run it first as those tests are yet to be integrated into meson. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/custom-runners.yml | 11 +++++++++++ .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 13 ++++++------- .../custom-runners/ubuntu-22.04-aarch32.yml | 2 +- .../custom-runners/ubuntu-22.04-aarch64.yml | 13 ++++++------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 97f99e29c2..9fdc476c48 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -13,6 +13,17 @@ variables: GIT_STRATEGY: clone +# All custom runners can extend this template to upload the testlog +# data as an artifact and also feed the junit report +.custom_artifacts_template: + 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 + include: - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' 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 fcaef9e5ef..f512eaeaa3 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -3,6 +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 needs: [] stage: build tags: @@ -19,12 +20,11 @@ ubuntu-20.04-s390x-all-linux-static: - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` + - make --output-sync check-tcg - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; - - make --output-sync -j`nproc` check-tcg - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-all: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -41,9 +41,9 @@ ubuntu-20.04-s390x-all: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-alldbg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -64,9 +64,9 @@ ubuntu-20.04-s390x-alldbg: - make clean - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-clang: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -86,7 +86,6 @@ ubuntu-20.04-s390x-clang: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-tci: needs: [] @@ -109,6 +108,7 @@ ubuntu-20.04-s390x-tci: - make --output-sync -j`nproc` ubuntu-20.04-s390x-notcg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -128,4 +128,3 @@ ubuntu-20.04-s390x-notcg: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; 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 2c386fa3e9..42137aaf2a 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -3,6 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch32-all: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -22,4 +23,3 @@ ubuntu-22.04-aarch32-all: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; 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 725ca8ffea..8ba85be440 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -3,6 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch64-all-linux-static: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -19,12 +20,11 @@ ubuntu-22.04-aarch64-all-linux-static: - ../configure --enable-debug --static --disable-system --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` + - make check-tcg - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; - - make --output-sync -j`nproc --ignore=40` check-tcg - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-all: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -44,9 +44,9 @@ ubuntu-22.04-aarch64-all: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-alldbg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -63,9 +63,9 @@ ubuntu-22.04-aarch64-alldbg: - make clean - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-clang: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -85,7 +85,6 @@ ubuntu-22.04-aarch64-clang: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-tci: needs: [] @@ -108,6 +107,7 @@ ubuntu-22.04-aarch64-tci: - make --output-sync -j`nproc --ignore=40` ubuntu-22.04-aarch64-notcg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -127,4 +127,3 @@ ubuntu-22.04-aarch64-notcg: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; From patchwork Thu Jan 19 18:04:19 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: 644113 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp363302pvb; Thu, 19 Jan 2023 10:12:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXst1QgEHxiemaXynqtHT4SRZ+DBsiJOhZriyaMHHhQi5d2u4J85aAehdIWUv7uvc2Xeh+UQ X-Received: by 2002:a05:6102:fa8:b0:3d1:7a69:677b with SMTP id e40-20020a0561020fa800b003d17a69677bmr8860507vsv.31.1674151967515; Thu, 19 Jan 2023 10:12:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151967; cv=none; d=google.com; s=arc-20160816; b=ShtTbk+FD47NgJCWI8IXBZlPaAikv3RMI53OkndWv0th5dc8XRvBBA/W1Z9e8UAWUF TbSD3L2i75EABG2Pji5ZY7wkOc5dliTNs8tmj+oIldHO7uSJi+3gFx0wZW5rFBp53UZy kqSBtmnvQRuNbbgb03PE6lTr/sE1b6emNYYuti5ZazR8d0GTN5vqjl31Qg1PpfAIcW4B RmQqYVX0g2Nmsb5tKROwZdE9rQKm9oD2xJqaU8bv3wkgdii+rZdtNmH6HuoWo/kLBaT8 lF5Oxcjm1AbyAhTAIz7NT6U66vaqwT8I/vfCojwyZdGvMJGUHKDVEame79JStXu4+ueV NKhg== 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=V4xI8bo14KeFRnLcZP2zQAO50blmIYYQdO0Kt1h2R3I=; b=UeWipSxJW8CMOeaz5Qy+5WysoYGDXbXfkX1pXi06SEuwQhokulzynj22eoeoIdV9em xFlqRtCxUw11qsTi0I0c1gRpJ09ghOUqcMO4AhSGpsw/UeXCUeAp/jDCobDr6ZhCcam7 vwVjDMXfYUwl6EDIdMA3dj+rNovxpNdxfKl1e+yVwu5oxbaT0p65z7u5DPWEocXhFqvS Z6EwIBal9BoWSoCDhgTzMIimVWpyLVXOd6/0PkHODZdlszga4gM5mlTEnHXj/4XAKxce E0YorjqgjbtyMhgFf8Kobec9k6BznjBt92MF4fp+ULxWearvJqcDouusKQHVhtdVcZdj TMNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w8i9hhZd; 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 e184-20020a3769c1000000b0070651246788si2819686qkc.224.2023.01.19.10.12.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:12: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=w8i9hhZd; 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 1pIZOQ-0005wI-Ql; Thu, 19 Jan 2023 13:12:06 -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 1pIZON-0005uv-3B for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:03 -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 1pIZOK-0004Ir-50 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:12:02 -0500 Received: by mail-wm1-x334.google.com with SMTP id m5-20020a05600c4f4500b003db03b2559eso1884484wmq.5 for ; Thu, 19 Jan 2023 10:11:58 -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=V4xI8bo14KeFRnLcZP2zQAO50blmIYYQdO0Kt1h2R3I=; b=w8i9hhZdEUy25DjQN2Fc1rEUCK9QpDbGDCEIo5o3+N/PO8wGGB/pG+V53OBc7en9CK aKxasMohpTf3X6EwZyfWi4n8hjEmbu48ewrAKELf/mNekAa1e28RARnILVMLgMKckB7C j8xm8hkM9NW6mELNJojpDk3LKnzEwPG2NQtczfm3qhPrmhBaFkytMkIpPDkrqOtjq5qB tFv5g31uSWLwukDYuT397zxvIR79XS1iUTjBeqcFCwKWgqx4t143Q6ATmJobxUv2a5rH xl6iFOwSkvowqkcA1exHSeAlxGF+b7/nsGVxAimja+e86JP44+gt9tTUPX2Q3wmTinay 1jzQ== 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=V4xI8bo14KeFRnLcZP2zQAO50blmIYYQdO0Kt1h2R3I=; b=mA6trmEDSLAp3vB0dKKLg9hsQMWv5WSNpWDXhWQnyu0s83PVNmCRe4dgjc1A2bPuVo J3Am9vSNdCj8cBDrIy11WDkkCku6GT8xvAI4f8vUeOtkWBaa+T7o0wy7qmUxsjk7qM+c wpQ0+cDovzqrl09vOBLekrPviS4J6NIadVTrMjTrpUlpqRZFggj17E98Cl9OpKrVYwF/ 9UCcVmb5wFCqgHcwXii4b0ej/Bl3kmyg9vmdW/WIo55hLGgzrlf5xkt9thLYZJZ92ZM4 Gg8z3BiiwWjvNIkPTZMhVjwu11hIkZZRxpeDDOKfqYFAcYmYy9rhRiIe+bhmokYf8OIk nLng== X-Gm-Message-State: AFqh2kpWhTS/y9yYhd0FZraN6SjfcrHbe2ugVHWKoz5/IPbWFDfpY5ih /3WR03UT6fGictJPfbBuUn+2sg== X-Received: by 2002:a05:600c:4b9a:b0:3da:fcdc:cafd with SMTP id e26-20020a05600c4b9a00b003dafcdccafdmr11093021wmp.13.1674151917706; Thu, 19 Jan 2023 10:11:57 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h1-20020a05600c350100b003d990372dd5sm5786808wmq.20.2023.01.19.10.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:11:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B09B11FFC7; Thu, 19 Jan 2023 18:04:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 18/18] MAINTAINERS: Fix the entry for tests/tcg/nios2 Date: Thu, 19 Jan 2023 18:04:19 +0000 Message-Id: <20230119180419.30304-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-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 From: Thomas Huth tests/tcg/nios2/Makefile.target has accidentally been added to the Microblaze section. Move it into the correct nios2 section instead - and while we're at it, it should also cover the whole folder, and not only the Makefile. Fixes: 67f80eb4d0 ("tests/tcg: enable debian-nios2-cross for test building") Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230119130326.2030297-1-thuth@redhat.com> Signed-off-by: Alex Bennée --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 08ad1e5341..e73b04194a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -240,7 +240,6 @@ F: target/microblaze/ F: hw/microblaze/ F: disas/microblaze.c F: tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh -F: tests/tcg/nios2/Makefile.target MIPS TCG CPUs M: Philippe Mathieu-Daudé @@ -262,6 +261,7 @@ F: hw/nios2/ F: disas/nios2.c F: configs/devices/nios2-softmmu/default.mak F: tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh +F: tests/tcg/nios2/ OpenRISC TCG CPUs M: Stafford Horne