From patchwork Wed May 3 09:12:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 678840 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp949716wrs; Wed, 3 May 2023 02:23:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6/st+iFQgxpkLemiktn+lpuzgNIrt5yuAcG+dysXbM5RM2hCCaKXHa5mBQiLkAKOnNvd80 X-Received: by 2002:a05:622a:1716:b0:3ef:357b:751f with SMTP id h22-20020a05622a171600b003ef357b751fmr1836008qtk.14.1683105805762; Wed, 03 May 2023 02:23:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683105805; cv=none; d=google.com; s=arc-20160816; b=Nt6i/mADyNPDnlV4SqCkPWhhqMIOmB3Zuu31cEvyTgV1URNAU7McAfQygj6h483+kw YaYWSwo3Q6UfUlg6I/A1JXgVejdQkH6dmNP3OiNSJLH2Xp/nbCTRMnxiqgPIbsVjNgbw JDSWO79diHZfmc4cRHOWaKB+reUnAMCG8knSM6UgD2nupA1oYW3OjvGL1rAaC8hebfWa 1SFhiZQgxNC3iIcGxZWKxmAByFojkRKWiD0W2iqrUhZ/GCWDiXw4//248f+KViebUljL gH75Cfxl1EGuxI4zLnsPeSVP4kt0SoEs1qecbgQaKAMNEPfx0cjTAiC2tFdPAHtgX/1k l1sg== 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=BaX2dnRzYU8iVo190OC5WZA7wUtx7L7d4Pkiir1d0ZY=; b=Xhwc2xGIDHGGtnWS5+xHiPz8yjWvRLPeqwKKM6JY3aRqNS14vGfDMszXtnVjCUMu0l bktpru8AbYAcupYEdwaIOp8WxMUUuGFhouDZBo9Jea6NAjOb6YwrMcDZj5HlhcFq8GyL 2kIIcSEw7y5UinSTYJeDxI6hdhV6uuRP2oDunQ2Ta5L5n6QhUVIphMS8m75MyG18Lvfl +eI9diuO/PnjRVigWRppWiDaD8w83+hsSBe+BQKBTYWi0kSqJibAI073zbu45hxL+R7k JDsis+cnX1uCSL+yhHl8ZiGEehGhxebPf4m4hq3hIH/MVWhyzrJWgVJVU+blwkd9hqRb 0TDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XOc9HK8R; 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 g5-20020ac85805000000b003e4ecc375c2si2932821qtg.519.2023.05.03.02.23.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 02:23:25 -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=XOc9HK8R; 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 1pu8hJ-0000tT-Ha; Wed, 03 May 2023 05:22:53 -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 1pu8h6-0000KD-AF for qemu-devel@nongnu.org; Wed, 03 May 2023 05:22:41 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu8h4-00066J-CV for qemu-devel@nongnu.org; Wed, 03 May 2023 05:22:39 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3063891d61aso1658608f8f.0 for ; Wed, 03 May 2023 02:22:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683105755; x=1685697755; 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=BaX2dnRzYU8iVo190OC5WZA7wUtx7L7d4Pkiir1d0ZY=; b=XOc9HK8R5MqW10eJ+nQ7NSFIUMMtVR8U/kVTDVZVYMdj0fky20OujG0aEKFOi+vE5a ucaSkYgR1SqNIyd5ftxWnilOdLeogJirg4aSBXEApV1IZK2lgQatJKjDtTDaQbaOJj7E K2RxHFWaizT9Ko2uBKaSwvCM1B+B/3lO+VV0T9ySvhhcJWAl62cK48iP+EjgsQBS/B7Q maQKpecbivW2TpPe77TobSPCwLBbNBdhCf5KX9C/zKfLa1Non58K/OKYSXXOBoA0KG/U PfZRJ4cRHmEXI7MKjL0NHtTNn3mOBoiMMnklfX7bGsp3wE2gybPGx+Q3i73IX6Msj33E KxpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683105755; x=1685697755; 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=BaX2dnRzYU8iVo190OC5WZA7wUtx7L7d4Pkiir1d0ZY=; b=aJD+sx7hfsUqCeB5XV6qRbDpizU+JUu2KA78RR23RHSkDspOoTfNhwflIeWYdPtEME Vnoxwr5ECdyUeKiL0qnx7psTLa4l0sxBxQ8rn3sFSXTYq8gK7fwFwYTcSFnYS7AOQM4k hIW0vLm1BIvUI3WbD6V70aS4oN72fUg36t3fiZMySsEUL3nd5VJtphUFVJaS3DpUlIvI Vi5jOhQOvVzi4KudWXR2fwkV7ZooON17EB6wnWZmwSnkDd37ela5xtNhQMPfDZTW7cj/ DYYc52rbGspJobh/N5ekayZBJQ8D3DwAJMxZNFA3ta3cJ7Z6Ri78C6pMPitG/YSJifx1 kvcA== X-Gm-Message-State: AC+VfDy+UnOt7UMSPAXPz82iHluU6MDbGUXzSPnaTLg7GVO2oPOJx/J1 5r1yGuoW69kXV4GYnPnHTs6xVQ== X-Received: by 2002:a5d:4841:0:b0:2fa:ce3:9a0 with SMTP id n1-20020a5d4841000000b002fa0ce309a0mr13532921wrs.36.1683105754032; Wed, 03 May 2023 02:22:34 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k6-20020a5d5186000000b003062b57ffd1sm8684068wrv.50.2023.05.03.02.22.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 02:22:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 47F8E1FFCD; Wed, 3 May 2023 10:12:47 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Artyom Tarasenko , "Edgar E. Iglesias" , Wainer dos Santos Moschetta , Thomas Huth , Leif Lindholm , Paolo Bonzini , Gerd Hoffmann , Helge Deller , Xiaojuan Yang , Stefan Hajnoczi , Cleber Rosa , Peter Maydell , Eduardo Habkost , Juan Quintela , John Snow , Yoshinori Sato , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Pavel Dovgalyuk , Andrew Jeffery , qemu-s390x@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , qemu-arm@nongnu.org, Bastian Koppelmann , Beraldo Leal , Max Filippov , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Mark Cave-Ayland , Jiaxun Yang , Radoslaw Biernacki , Aurelien Jarno , David Hildenbrand , Markus Armbruster , Song Gao , Joel Stanley , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 22/22] tests/qtest: skip bcm2835-test if no raspi3b model Date: Wed, 3 May 2023 10:12:44 +0100 Message-Id: <20230503091244.1450613-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230503091244.1450613-1-alex.bennee@linaro.org> References: <20230503091244.1450613-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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 can't assume the machine exists and should gracefully skip the test if we haven't built the model. This is ostensibly fixed by db2237c459 (tests/qtest: Restrict bcm2835-dma-test to CONFIG_RASPI) but I still hit it during my tests. Other qtests seem to use this pattern to gracefully skip stuff. Signed-off-by: Alex Bennée --- tests/qtest/bcm2835-dma-test.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/qtest/bcm2835-dma-test.c b/tests/qtest/bcm2835-dma-test.c index 8293d822b9..2e6245e9e2 100644 --- a/tests/qtest/bcm2835-dma-test.c +++ b/tests/qtest/bcm2835-dma-test.c @@ -107,12 +107,11 @@ static void bcm2835_dma_test_interrupts(void) int main(int argc, char **argv) { - int ret; g_test_init(&argc, &argv, NULL); - qtest_add_func("/bcm2835/dma/test_interrupts", + if (qtest_has_machine("raspi3b")) { + qtest_add_func("/bcm2835/dma/test_interrupts", bcm2835_dma_test_interrupts); - qtest_start("-machine raspi3b"); - ret = g_test_run(); - qtest_end(); - return ret; + qtest_start("-machine raspi3b"); + } + return g_test_run(); }