From patchwork Tue Jan 7 16:52:05 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: 855494 Delivered-To: patch@linaro.org Received: by 2002:adf:8b05:0:b0:385:e875:8a9e with SMTP id n5csp318454wra; Tue, 7 Jan 2025 08:55:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWE7yMhVvMBTc5cMEbeiyVAQZF7fEKSIbXWasWarTEj+cgJpInjW1YugFVpKJ0U5Ou7SNPd1A==@linaro.org X-Google-Smtp-Source: AGHT+IEFEiXWESXwKB3c3rIesTJ1KXNUE40yyidB6Lg4dqJJiQN/sKQKk8P6mPJAX9voSfBZGjvP X-Received: by 2002:ac8:5a0b:0:b0:467:6563:8b1d with SMTP id d75a77b69052e-46b3ac39541mr48666131cf.6.1736268957170; Tue, 07 Jan 2025 08:55:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736268957; cv=none; d=google.com; s=arc-20240605; b=Qvl7jab3oVEHXeBncD4TL0wWCP51CuOwMsCpssAfc+eLxOhry2P4Y1NmGbWygpg6N2 DAZAIiYRUNuMrn8jfHBOhJXu2zkmCaVm8YuwxLT6gcy5sD4/StSxb8qdZ3iMKBlbrEPQ XIa4Ut17SN1jdqjVv8H9dhKaSE8AYMIWrxGlk9U4n3ULK6rRB39Y1+FCNh0oFYeuFBKD RJyn2hWCmrDJUwMFf9KznYqsX99jRMeRir5axTx8i0H5HRbv9pS4zo1t0EBBhEfEIpKg lp2b0+BNIBbU+vAMYzQkyukkbW/PA342MDhAYRo6pBVygVQvJyq/HnD5W12RJ3m9Qx72 W0AQ== 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:cc:to :from:dkim-signature; bh=PdsXyF3OC+6k01wdvpRGDBTvPRZa71R2EiA5i0mTRfY=; fh=gCrRMsBOO2s5UczjHW2I0Xj39iNRWP/OR2J6q01yAGs=; b=hIBB+GhihuK52MS0QBJ9OKa9LWzmK3OrMY4wramlZU9C7Hw7UEM2gYPHxKopsNBpY9 sOXLUdzFzcym4jad0K+Opm2pqNV0WXy2ReLioHCP2xVV72wFAafI25fFzOOoRjBQ0DVh Q/KZ+akUWWVv1DmFzhri8vW26ZSuNJuk8WHC+OAMD1A0yDTGFjVqymBDTjbCe5PENVMv eZsRXisrnf0vMQmA4HhOHUtMPCTe4Oa9eWwNK7m3obxtXgkLsaHt9TdMz1CfYe3t1VXn JRqc0JkaGQWxX96+n4r38j587M3jUNs/e3tcicFz35iUgu6UATjSyCJkW2QfoQt3pvwH qPCQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nMYn7GTQ; 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-46a3ebd60b7si487906861cf.530.2025.01.07.08.55.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jan 2025 08:55:57 -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=nMYn7GTQ; 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 1tVCqP-0006ro-T8; Tue, 07 Jan 2025 11:54:17 -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 1tVCpX-000575-Fo for qemu-devel@nongnu.org; Tue, 07 Jan 2025 11:53:24 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tVCoZ-0005w6-Qc for qemu-devel@nongnu.org; Tue, 07 Jan 2025 11:53:23 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43635796b48so95547515e9.0 for ; Tue, 07 Jan 2025 08:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736268742; x=1736873542; darn=nongnu.org; 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=PdsXyF3OC+6k01wdvpRGDBTvPRZa71R2EiA5i0mTRfY=; b=nMYn7GTQCb9bdsHUmcrWHZcORIqdTlR7MrKlA3FdvPPhlTGfhkzusPTXXiQ1ib0hCf s1N/ENcIHoLTs1gS8b/YUB6ZVU8aCmzGGtOCLmyYXcavpyT9NOBf8Erq9HP60XIweqqI QNnqwTuN1d9VTzcexgLvCRLlEF52iOazvsqntbwJ7m2aWGkrBwO+FicyINSV8BTeQbnu IWD1uQ/3JazO2LbrXYO/SjBwxvQMDHglARzfpXwrTzX+gWnff8/6ksyJ9pp34D78IDjB gpF5n8oHrazy3lE0UXq33QkobVZY/2MJj3r7Y0DTQcN+KyPIEYJJiMfg9uZ8HE2nRJ1s bpRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736268742; x=1736873542; 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=PdsXyF3OC+6k01wdvpRGDBTvPRZa71R2EiA5i0mTRfY=; b=p8oaDFg/nVrFdURxxbPiIkQHuEgMkAKvj3EXXWq3ONN4lN+rN/32pCnHzp+BIfdv/t muX1x7cgS7TAWCyhi+nG9iu4G1NZPVGqGUJ44eYCZsFBlXgX3vZVyH4OW7kb8rn7R2O1 B7WkrZ+VpZN6W+aJ/PLqdz7BI9/V6D29cEUyWbuI5FZmpPozgM7fR3BzgSz4NeZVwKP8 sasWR8fUDn1LNW9XpCxi/zkAGsL+fY73J2mCHPqdknPMhG5xtdIIxPYgUVejSevNMJXg huAA1zV1OpMibGbkXsBYj2EFDbfv1c4EHnhDPVhQwipHnV1QtssiK1fSmrCAVO3Teip4 uDTA== X-Gm-Message-State: AOJu0YwBEUlhfKuOXAejamHkAn/FsKktPeMkBbo66ZSREnrj/7PCIm41 YqMdYXA8K+5ESDuLRUNu/oRwKSr/RLkoueGABMcg7J7XLl94Xcm3MQI2kwihe6M= X-Gm-Gg: ASbGncsMF3/5KjZlECKJqIDd8tZsxnnN0hlc1TEgkQU8kccY5mX9sIDdrOlgJWFhZ0l Pb+0Xp67Usl8Z5plM9gRlFTCjMhnJAkBqr+EpmCs6IqiG0aF/WzAHO7y/jqGjihk22bezkPD5qn EhejCjZh5bmkefai3Om6sM3QZtEOjAdedKAJTVBcZ0AV/18StbXm2bql7Hsz+NLE+cfYvDtBI8j kGLhZrCWluedYStp7vFvjfUELWMuTxjhN+lNTsutA1hdCbPLMpJYfE= X-Received: by 2002:a05:600c:3550:b0:435:1a2:262a with SMTP id 5b1f17b1804b1-436dc1c20b8mr33295065e9.3.1736268742341; Tue, 07 Jan 2025 08:52:22 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b417afsm643187885e9.36.2025.01.07.08.52.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2025 08:52:20 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7A69B6030B; Tue, 7 Jan 2025 16:52:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Beraldo Leal , Ed Maste , Halil Pasic , qemu-ppc@nongnu.org, John Snow , Radoslaw Biernacki , Nicholas Piggin , Markus Armbruster , Leif Lindholm , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Bin Meng , Daniel Henrique Barboza , Marcel Apfelbaum , qemu-riscv@nongnu.org, Christian Borntraeger , Wainer dos Santos Moschetta , qemu-s390x@nongnu.org, Alistair Francis , Liu Zhiwei , Fabiano Rosas , Weiwei Li , Harsh Prateek Bora , qemu-arm@nongnu.org, Li-Wen Hsu , Palmer Dabbelt , Daniel Henrique Barboza , Richard Henderson , Cleber Rosa , Marcin Juszkiewicz , Peter Maydell , Laurent Vivier , Aurelien Jarno , Eric Farman , Pavel Dovgalyuk , Jiaxun Yang , Thomas Huth , Laurent Vivier , Joel Stanley , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Bernhard Beschow , "Michael S. Tsirkin" Subject: [PATCH v3 27/29] pc-bios: ensure keymaps dependencies set vnc tests Date: Tue, 7 Jan 2025 16:52:05 +0000 Message-Id: <20250107165208.743958-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250107165208.743958-1-alex.bennee@linaro.org> References: <20250107165208.743958-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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=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 I was seeing failures on vnc-display-test on FreeBSD: make vm-build-freebsd V=1 TARGET_LIST=aarch64-softmmu BUILD_TARGET=check-qtest QEMU_LOCAL=1 DEBUG=1 Leads to: qemu-system-aarch64: -vnc none: could not read keymap file: 'en-us' Broken pipe ../src/tests/qtest/libqtest.c:196: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) which was as far as I could tell because we don't populate the $BLD/pc-bios/keymaps (although something attempts to symlink qemu-bundle/usr/local/share/qemu/keymaps/ to that dir). Signed-off-by: Alex Bennée Cc: Paolo Bonzini --- pc-bios/keymaps/meson.build | 17 ++++++++--------- tests/qtest/meson.build | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index 0bd8ce0077..a79a09b276 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -39,19 +39,18 @@ else native_qemu_keymap = qemu_keymap endif +keymap_targets = [] if native_qemu_keymap.found() - t = [] foreach km, args: keymaps # generate with qemu-kvm - t += custom_target(km, - build_by_default: true, - output: km, - command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], - install: have_system, - install_dir: qemu_datadir / 'keymaps') + keymap_targets += custom_target(km, + build_by_default: true, + output: km, + command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], + install: have_system, + install_dir: qemu_datadir / 'keymaps') endforeach - - alias_target('update-keymaps', t) + alias_target('update-keymaps', keymap_targets) else install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') endif diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index c5a70021c5..f75c1057a4 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -383,7 +383,7 @@ qtests = { if vnc.found() gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false) if gvnc.found() - qtests += {'vnc-display-test': [gvnc]} + qtests += {'vnc-display-test': [gvnc, keymap_targets]} qtests_generic += [ 'vnc-display-test' ] endif endif