From patchwork Wed Dec 18 16:21:03 2024 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: 13913909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99C0DE77188 for ; Wed, 18 Dec 2024 16:23:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNwor-0000ve-Oh; Wed, 18 Dec 2024 11:22: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 1tNwoA-0008FG-Nd for qemu-devel@nongnu.org; Wed, 18 Dec 2024 11:22:02 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNwnl-0006v1-Eu for qemu-devel@nongnu.org; Wed, 18 Dec 2024 11:21:56 -0500 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a9a68480164so1087753166b.3 for ; Wed, 18 Dec 2024 08:21:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734538882; x=1735143682; 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=mCt/XKeevqFcUeaAFdo8/4jI+v0v7BmPv+SZKaqvYL11kmwxxWJ4Fh57WSTk8lBd59 vva11JARS9GNCaD0JSSc8TJtNPpUtkN3/6B0fa0BTzMpTXE04Xl8JNbvFzRNb3UG5eci AhuXeI6N5jppjIrgMkcrcylqZd6SeCnblgMvCzKnrQLSfeMEwfqgWJ5ejjNmRY1o4K9l fV0hCGwmQ2LzirgjDf2ozbbTSjDNqSFCfUPVBJUmy8JXWt4VCXQSBO3ILsV3bZ7wTl71 XzL9mHbu/KvL2ZQz0qYhIX2zJ/V2yCVHnLtOfH8w63EwL+LmpGfrlJCcWhf/UnhnIMr0 wkIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734538882; x=1735143682; 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=PuJbVBlIrpmqJAOXY+4JdX9v4fjpQ9BrQHBE+6cr3a76TD+nzuByrnWr262lZN7aH3 qA4QS5Usmy0hw8VkZ60r4Uu1SfkqqCq4dPOajQ7Qfa4/ADFEWV84n2e2ecRqviLktnnt BhOK03hcMX9jVWE6IJt5oeZ/Vh8+3R2we0onXUrnaA0WXpEwaD6KKI+vUBLuV0ZF/0v1 eniUFNEzJHBol4mk3ZB/jaSXMfce45h9vXgQuOkJ1v01UvWhulBDspVqT1u7aNwHesXm 0M1+in7pssfN6ToCIOdTKk1Q9dYXMg1Sd5EiiKXcONR43HUyFtXvJzLZpRQcn1edGtj8 K8nw== X-Gm-Message-State: AOJu0YxB+7++IY5fdhXGZ4+wAuTeJ+EzaCTPtyKAkftLhTlU4xB1AtvZ EfhXIo6sMNgPGjphmaeRa5bMBbsNBk2q4OcxQPAHbPomnonLBintzKyUl/VGcWo= X-Gm-Gg: ASbGncu+Run3HtL1wfNIX2o31Mol/HWDets8AvycvVfNXz/ytAVn0mUsb95C4CMrZyZ oVrqck/UqIgwg4fOmH4T258odbguHeOn18z2BSVrgIhyrcmFFE8fCsE38ej0poopANViue9jop4 VMHcuNV7e4SGkdZEIM/zxS9JF4qUm38R1LwL2jMDmRiXrG6aNi7WvaYxaG0IavKmXodTLr+NFu3 J/pztiWTIR06eZNwg2dXYGdhyvg19NmCe3ZhEuVQ5+loGtV4eKURzg= X-Google-Smtp-Source: AGHT+IGTxUZXO7yFbI9sh2Q11ZePUMnJWKylZVeka4mA3KpIR4gYKu2HSvUvfFi9pJ2qkO54dWQOLg== X-Received: by 2002:a17:907:c0f:b0:aa5:2a57:1779 with SMTP id a640c23a62f3a-aabf4966c66mr274241466b.59.1734538882107; Wed, 18 Dec 2024 08:21:22 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d652f35365sm5747835a12.80.2024.12.18.08.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 08:21:17 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BE41B60C08; Wed, 18 Dec 2024 16:21:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Eric Farman , Thomas Huth , Li-Wen Hsu , Daniel Henrique Barboza , Aurelien Jarno , Fabiano Rosas , Radoslaw Biernacki , Mark Cave-Ayland , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , qemu-riscv@nongnu.org, Nicholas Piggin , Joel Stanley , Beraldo Leal , Markus Armbruster , Jiaxun Yang , Weiwei Li , Peter Maydell , Cleber Rosa , Leif Lindholm , Christian Borntraeger , John Snow , Marcel Apfelbaum , Palmer Dabbelt , Bin Meng , Daniel Henrique Barboza , Paolo Bonzini , Liu Zhiwei , Wainer dos Santos Moschetta , Laurent Vivier , Pavel Dovgalyuk , Richard Henderson , Marcin Juszkiewicz , Halil Pasic , qemu-arm@nongnu.org, Harsh Prateek Bora , qemu-ppc@nongnu.org, Bernhard Beschow , "Michael S. Tsirkin" , qemu-s390x@nongnu.org, Laurent Vivier , Alistair Francis , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v2 27/27] pc-bios: ensure keymaps dependencies set vnc tests Date: Wed, 18 Dec 2024 16:21:03 +0000 Message-Id: <20241218162104.3493551-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241218162104.3493551-1-alex.bennee@linaro.org> References: <20241218162104.3493551-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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