From patchwork Sun Mar 9 17:19:08 2025 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: 871871 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp643687wri; Sun, 9 Mar 2025 10:21:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVEjf1p6nQv8eaMbex54qPuEmnhW9od9+8un0Fm3JHEo2uPSGKvmagjLnJk3GHtqWtT79uamQ==@linaro.org X-Google-Smtp-Source: AGHT+IFfskTUyfh0vM0xcU+OmVRR9m1t9dwQ21BostTBTIPN/ydV7w03c/Fp94UHCnAWJJst5+6S X-Received: by 2002:a05:622a:113:b0:475:11bb:abe with SMTP id d75a77b69052e-47610942d63mr174497451cf.1.1741540869932; Sun, 09 Mar 2025 10:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741540869; cv=none; d=google.com; s=arc-20240605; b=JzJHWgiElMB9SgmA5nimJxuB+Bb23tcc9KhexxfPVwX6Ccfi9bBLxLNfZ63O/ru71c U/U67dajpBCciYpkFmlXjHBypHE1gm703aH4N2bSuwnTmLe9HpGqXvwTsGwfWVoNS3kt aBkG7RCGiA9CR+c1ZONewk+KH5wFU19fklf8HjUpNqDSHz4CKwwRxqLm16eQMwHEMTfh P8MHcik2Ovt0uJdi9rIIrfLRA1u6Sp1Qs6hBnya+5sWuHcVn0HkHDOl/xiu7pBC+Jl9z WnbZt6K+sxTxhY9+3E2LPdtyVVMBfUUGKX/c9zscwu8Zi+3MJo7OvJZGBi6ehnaQLevi UJGQ== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=zd7sNYltQbDeg8BujY3Oc2Qj273T+OtyPIpGg6jTeE8=; fh=eu2DY09p+eeddYDiV+DalJS3Vr0kxK5BujclYkgWvDw=; b=F4HWkUzfFJtYdJ6cPL6uWHbR6NG+ACu/GMRy+U16CiMECCTJCTgJsmFiruAD+P7iG7 E6bw4PrWzFC/GmIsGS7x0sQy+mkoGDwrVXQYT0Xwldt+QmRoKAJe7CjqnKcFtXmDi0BW LPqoOs5yuXq5JIZQS3ZKLY4e5yz1z863dGtJIy9QxNh8+IOZHcuLi9mLbhevsevD1qiE Z06C3y64vN5jKkCls1ocSx3T8PWyez5YSb1hLUhf9YtHE7dbSQmihAiH6GHHHe/+LpU+ jGJ2k8xdEhudCF0H/81hi+GjNHMDzRdUzid/BO6cwgwNfWVJXkSiuH70P9M8plMnD506 CE3w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x2DeQbp+; 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-4767c3c79edsi18143621cf.3.2025.03.09.10.21.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Mar 2025 10:21:09 -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=x2DeQbp+; 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 1trKJQ-0004NQ-Je; Sun, 09 Mar 2025 13:19:40 -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 1trKJM-0004Mr-8i for qemu-devel@nongnu.org; Sun, 09 Mar 2025 13:19:36 -0400 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 1trKJG-00065P-Ty for qemu-devel@nongnu.org; Sun, 09 Mar 2025 13:19:35 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso5145505e9.3 for ; Sun, 09 Mar 2025 10:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741540764; x=1742145564; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zd7sNYltQbDeg8BujY3Oc2Qj273T+OtyPIpGg6jTeE8=; b=x2DeQbp+MBa2ShcJmHToA2WY8fiRG2I+YcpQhdK87ivxBview6S/xUwRNBJ3WsbGI+ UCee8SoDWg3jZNq2lfRPqKN7COObTgykyGUqMEkM1uGUqDm3wMzRD0kemsmSmJc9UPNa /zoJhL1OUuWpSI2zngq0MtgheyX7Z57CW7a8AtJ2mDvt6IxuLsIPvrApwkL4VGXTaw+T 7jdJ/kSU8D9xcGkvlcsvsLCioEd6fyx6j6Bmx5Hl7aUFdrZ+EP1TVlXmFJbbVLF59TRY YHdjWrdVmBhX7H3AdOCWnUpqXfrZ08VNTw0EYLlAoKnWZ7Z8pU0bD6qSe3XNuaGLZ8wk zt5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741540764; x=1742145564; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zd7sNYltQbDeg8BujY3Oc2Qj273T+OtyPIpGg6jTeE8=; b=V8gcpz4FfKSnNPHgwSNXC/gMHNNTpehan1Mj3DBxLsb7f0ShxT0mSuPLaX1UU/u7Wd IuhK2yZzHcrsTyZeOsSquiHz2ilpfZGDkx2TSceBRyjCyWiIGWNwWo9DyCR6Q2DkBhUA IbX1jpfUXajXMb36cP7mM3K0mw9cxs+ut+RF9Qh6ZKJdeTL7RlHMYuIhN3eP4Q2QqJoh Pir2SITQmcLv6CGk5izHsKYlANoMj9pwtD+LMpUYnk0HNYbMZfpRbQ7oYasPtTrImdJF sqkcqsZODyydlB5Ry9mb80X9dhQfXbxcsS3RlnHz2IBhHDcg3+LIHD1+PtleJBFB00ba EUDg== X-Gm-Message-State: AOJu0YxSXAHUR4aroipb/Ph+Gta3Mq6JD31NlAzrVmgKVs0zfsFSS+J+ Cdtb0/c0/nZ2j/F+p5AEdBi0UXEAoeE95aCsKZqwyVf2k384E/vpQxL9OCZtGMQ= X-Gm-Gg: ASbGncvj1AvQNsofWM41vntTat503hZyAPji26AaAuNLIZa7qcOohfO7f/0qf4xrZnJ IRu9381SvLaCJf7q+Q6JFU+Wgs6pEHAzhhyk89vstQA33c8wFOUwMS6xnwaCIKBjQ1WRsUIYzni IlazEuOk4cIdp50wSEg2d5xwHMni/UI2eQQjTMAnN4o4VyFrzNOY1iCF3DzWfBgSPNKOpugglcO wJNtgMxRwAVcbyoJxvm3ySrZBpZmeTKKZkN+jmW8sp8qBKnkGhb302n2t3aiKM2ph78MapYTaWu zRag7UGqYZG5UYmL5maw8/qU7gyENCEkkf58vdFfv2ne4xk= X-Received: by 2002:a05:600c:1c04:b0:43c:f629:66f4 with SMTP id 5b1f17b1804b1-43cf62969f2mr10963505e9.0.1741540763684; Sun, 09 Mar 2025 10:19:23 -0700 (PDT) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ce3d5a0e2sm67265395e9.12.2025.03.09.10.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 10:19:23 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2EA645F9DA; Sun, 9 Mar 2025 17:19:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH] tests/functional: skip vulkan tests when not configured Date: Sun, 9 Mar 2025 17:19:08 +0000 Message-Id: <20250309171908.3087067-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 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 The CI images don't have the vulkan drivers for the non-existent hardware even if they can't see the DRI devices. Skip the test early in this case. While at it fix the missing logging which doesn't seem to like f-strings. Signed-off-by: Alex Bennée --- tests/functional/test_aarch64_virt_gpu.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index c6f7738e93..f19a47f8b6 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -18,7 +18,7 @@ from qemu_test.linuxkernel import LinuxKernelTest from re import search -from subprocess import check_output +from subprocess import check_output, CalledProcessError class Aarch64VirtGPUMachine(LinuxKernelTest): @@ -75,7 +75,7 @@ def _launch_virt_gpu(self, gpu_device): elif "'type' does not accept value 'egl-headless'" in excp.output: self.skipTest("egl-headless support is not available") else: - self.log.info(f"unhandled launch failure: {excp.output}") + self.log.info("unhandled launch failure: %s", excp.output) raise excp self.wait_for_console_pattern('buildroot login:') @@ -119,7 +119,11 @@ def test_aarch64_virt_with_vulkan_gpu(self): self.require_device('virtio-gpu-gl-pci') - vk_info = check_output(["vulkaninfo", "--summary"], encoding="utf-8") + try: + vk_info = check_output(["vulkaninfo", "--summary"], + encoding="utf-8") + except CalledProcessError as excp: + self.skipTest(f"Miss-configured host Vulkan: {excp.output}") if search(r"driverID\s+=\s+DRIVER_ID_NVIDIA_PROPRIETARY", vk_info): self.skipTest("Test skipped on NVIDIA proprietary driver")