From patchwork Fri Mar 14 13:16:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 873449 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp704090wrq; Fri, 14 Mar 2025 06:21:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+eL9Z4YVUeDRM76Xbbkqb3YlpG+O5drSiV4WIZEC1I/R71VKz7Jo11B6Dx8+4v3Zf3j+iEA==@linaro.org X-Google-Smtp-Source: AGHT+IEla5zBLG7FZMhb9YvAMM2gnUjgt0xLcSeQrvYYHUprTSgTRDXVsoVxQ1f/u+i6N9Av23QT X-Received: by 2002:a05:622a:1aa4:b0:476:903a:b7f1 with SMTP id d75a77b69052e-476c811ee00mr42896351cf.11.1741958492811; Fri, 14 Mar 2025 06:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741958492; cv=none; d=google.com; s=arc-20240605; b=OmmHQA/nIHEenCRvutsbR+UbHVz1rr0Dl01NA26OtFZRCWeVpF6mCMCqyUzlx6Lffe GFQxSVO1qgpqZxpTrHtbawddxV+rRP+71bxuDHoPotfQrNSKCrnVfXfYTI9TAJPpRhC6 A2xXn35yjLfBUfl4dATobCQ0tC8e2A8POJa2qJd8XAmLVSkwSMl8/ABOxkiz42mfq9fC zrXrzQODrRZJkhO9RXCn3fACEa1oLA0/Tjz6awAWPG8XEWYDDrUD7cUycC61998vppRA RGSfQAWUrDdAxAUBok3w5fZcEbpx8hFGzSqox0LOnTsvfHv4+4BXfrh/mhwPU8P2u+Tj 4tmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=/05C1vvU/DoLYE8zWXHa7Rwl5AjnIHXhCOg3oKo2xKA=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=XV+ouAXJmRVmKNeEdlH6LdYAPCCet7knUyP3Sf5To8BgBSOQaV+MW7oK41g+jOBSvF pMrdQjT7fyPh0BMM31bHuGYvIWUP6LPzR5qvOPvRz9H4wchdIaLJYnZOEdjBCsgurWFx uLI9IqOqyz6EkG+xs9ELgPAoYkQX898UqVmbYvz2qImkrlQ2oFU6xEE9JdeRfRI3NH96 PTUIR094Xw1dnH8UlmnNIHU3SiORlVMFOFtPlX2FpGyX6v8dPbnzSTfgHy76un6ICKMz MGaO+Z6Cs4P4YDvM4fdN21xI3IR3NXddwdfbs1/6yRTLOEJR+AoJmyAiIH2mofZx03wu /GrQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fn5iP6eh; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-476bb64caafsi38079581cf.157.2025.03.14.06.21.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 06:21:32 -0700 (PDT) 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=Fn5iP6eh; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tt4uL-0005DJ-AQ; Fri, 14 Mar 2025 09:17:01 -0400 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 1tt4uJ-0005CX-T8 for qemu-devel@nongnu.org; Fri, 14 Mar 2025 09:16:59 -0400 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 1tt4uI-00019g-5e for qemu-devel@nongnu.org; Fri, 14 Mar 2025 09:16:59 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-38dcac27bcbso2094571f8f.0 for ; Fri, 14 Mar 2025 06:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741958217; x=1742563017; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/05C1vvU/DoLYE8zWXHa7Rwl5AjnIHXhCOg3oKo2xKA=; b=Fn5iP6ehHqQbIUeKrcX4cYUjtSAKu3Vu5jLh60kCuMRpqxVURGY2T9+mFvvlEa5Y4r Ew4RpH3tc3Oq9yMn7kuAxsGDOb/gAXj9tEdk/FVPa51ZgdItCYx1KKMc/oLqbqUo6KsO U4rzFsoYtqhTqmlthtIXg2BPXudIPhur8egBiBCbQMf/lG8rvJzNe5PXsAPePuFUamm0 UWM2cQpxFwqZwNgMa+s+gbAmgFJyRnypnrALwUsp6TISGadhjv0X+NR+GmOW0jiI8IOu ncpMgHXJ5wEFqj2/36PoNixUNoz5azy+mxD0/bFuhh4nuuO/xDYX24cc1KkEsWNxj7m4 jm5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741958217; x=1742563017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/05C1vvU/DoLYE8zWXHa7Rwl5AjnIHXhCOg3oKo2xKA=; b=TnTms4slGaa7LVo1AgZE20C7gIxaVUazoWnSlxZ0dcwnr8azuFL7aSxKInt179op6d Iatg5VlisyYcEKRqcQDNMAGm5t13o6EG9v+vP4HFazq4BLzY6uXvPARDOlbL3FyoJomf znHX4QUtsii9sa+9yud/d750CUjvql0PVq1J7hGmEk+J0gbs3M8iTEEpwUpOIx/9b3Dz BKUFCjeA0U8lZbGOwGyJom/dzDZnwNmmXkHVffDpptUThuevQOLnPInHot74BpzloE2K uFUKLLh/JYqrj3JcEIAFw3ZL8DoG4ZVX4iG9TkmlhQ8qHIOMvTKT9ASuxyAD7bBqLoAO jUHA== X-Gm-Message-State: AOJu0YxQEvV8vYKxPVi1fszRQD6M3rRMu0yaoBK7s1PRE+jDUG2K8agF 7LRSwqevlrbz8ewK/9fpKPMLOfXLtLboEL9/2dbDjx9J2waTRTCMoq36pca6lD6H1VqWVQ0A22+ + X-Gm-Gg: ASbGnctYc67pd6/DZTQTjosbJM74sK0hy3fOPu0J6600mS7I9KcmYiWutI6r1u03/Aq zoUzYC44aLBCHB5Q6NVwZcFwnXC/MziME1v8dMpJCfppCkkMpj2GaO6oAcfkVWtRMkBHxhI39iT J7UQ43hJDyx7AZRPfM8pCKaZ3X+WCff4MK+AHb2qa0q5QIQ3b2rl2VOgPR25T5SyKlFf5UoIniw LiQVMcqV+sGhqA1bHSTDOdz/OJ47/fckClbl3N2giBL7H/CBhnKQMkeAYGVojvoIRXKQRC2M53m iNKo+6IOIcw9n1WXBxmVZMJzLiRTRchI+F7t8+rfjyuiwYwoB0m1yM/+vhaVEg== X-Received: by 2002:a5d:6c62:0:b0:391:952:c74a with SMTP id ffacd0b85a97d-395b758f7d1mr6653490f8f.8.1741958216681; Fri, 14 Mar 2025 06:16:56 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395cb7eb93csm5437923f8f.86.2025.03.14.06.16.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 06:16:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/17] meson.build: Set RUST_BACKTRACE for all tests Date: Fri, 14 Mar 2025 13:16:37 +0000 Message-ID: <20250314131637.371866-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250314131637.371866-1-peter.maydell@linaro.org> References: <20250314131637.371866-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@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 want to capture potential Rust backtraces on panics in our test logs, which isn't Rust's default behaviour. Set RUST_BACKTRACE=1 in the add_test_setup environments, so that all our tests get run with this environment variable set. This makes the setting of that variable in the gitlab CI template redundant, so we can remove it. Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250310102950.3752908-1-peter.maydell@linaro.org --- meson.build | 9 ++++++--- .gitlab-ci.d/buildtest-template.yml | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 2f43fd81bf4..7f75256acf9 100644 --- a/meson.build +++ b/meson.build @@ -5,9 +5,12 @@ project('qemu', ['c'], meson_version: '>=1.5.0', meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() }) -add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true) -add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow']) -add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough']) +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true, + env: ['RUST_BACKTRACE=1']) +add_test_setup('slow', exclude_suites: ['thorough'], + env: ['G_TEST_SLOW=1', 'SPEED=slow', 'RUST_BACKTRACE=1']) +add_test_setup('thorough', + env: ['G_TEST_SLOW=1', 'SPEED=thorough', 'RUST_BACKTRACE=1']) meson.add_postconf_script(find_program('scripts/symlink-install-tree.py')) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 4cc19239319..39da7698b09 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -63,7 +63,6 @@ stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG script: - - export RUST_BACKTRACE=1 - source scripts/ci/gitlab-ci-section - section_start buildenv "Setting up to run tests" - scripts/git-submodule.sh update roms/SLOF