From nobody Sun May 11 02:46:30 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1734539012; cv=none;
d=zohomail.com; s=zohoarc;
b=dq3lMErcKAmiNjDNfkve3myasDoAgZf9RJ0z89+xBXdva/IhewxNUBBKI3MLNDNW4tVKSfRq41G9aRMu1gA2FPNtTzqVWMB1BAX0Jxq5MnSvjsQ2kizENSNaM2Y0wpzjIfVqStd21/FUJM68AB5offcW67IqoznUPm5s0AbWDGU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734539012;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=PdsXyF3OC+6k01wdvpRGDBTvPRZa71R2EiA5i0mTRfY=;
b=cYOo9L9DELE0P7HWP6p3rIp5pYxhS9MHikg5kZpXnKL+5m86FKfDT7dg5aPVenkiwe8tuNRsXch4VfONvJzgDAmShNI7Boa1kPRDnymybIwI3SrJOv1ZxvVFm6kdZEF1nU47tIzO+mKxhPB2+vCP4HiuqRoVrjcIyfRxsfR5PmM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<alex.bennee@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 173453901288783.62728129603067;
Wed, 18 Dec 2024 08:23:32 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
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 <alex.bennee@linaro.org>)
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 <alex.bennee@linaro.org>)
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 <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 08:21:23 -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)
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)
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Ed Maste <emaste@freebsd.org>, Eric Farman <farman@linux.ibm.com>,
Thomas Huth <thuth@redhat.com>, Li-Wen Hsu <lwhsu@freebsd.org>,
Daniel Henrique Barboza <dbarboza@ventanamicro.com>,
Aurelien Jarno <aurelien@aurel32.net>, Fabiano Rosas <farosas@suse.de>,
Radoslaw Biernacki <rad@semihalf.com>,
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-riscv@nongnu.org, Nicholas Piggin <npiggin@gmail.com>,
Joel Stanley <joel@jms.id.au>, Beraldo Leal <bleal@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Jiaxun Yang <jiaxun.yang@flygoat.com>, Weiwei Li <liwei1518@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, Cleber Rosa <crosa@redhat.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
John Snow <jsnow@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Palmer Dabbelt <palmer@dabbelt.com>, Bin Meng <bmeng.cn@gmail.com>,
Daniel Henrique Barboza <danielhb413@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Liu Zhiwei <zhiwei_liu@linux.alibaba.com>,
Wainer dos Santos Moschetta <wainersm@redhat.com>,
Laurent Vivier <laurent@vivier.eu>,
Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>,
Richard Henderson <richard.henderson@linaro.org>,
Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>,
Halil Pasic <pasic@linux.ibm.com>, qemu-arm@nongnu.org,
Harsh Prateek Bora <harshpb@linux.ibm.com>, qemu-ppc@nongnu.org,
Bernhard Beschow <shentey@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>, qemu-s390x@nongnu.org,
Laurent Vivier <lvivier@redhat.com>,
Alistair Francis <alistair.francis@wdc.com>,
=?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
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
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1734539013575116600
I was seeing failures on vnc-display-test on FreeBSD:
make vm-build-freebsd V=3D1 TARGET_LIST=3Daarch64-softmmu BUILD_TARGET=3D=
check-qtest QEMU_LOCAL=3D1 DEBUG=3D1
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 pr=
ocess 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=C3=A9e <alex.bennee@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
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 =3D qemu_keymap
endif
=20
+keymap_targets =3D []
if native_qemu_keymap.found()
- t =3D []
foreach km, args: keymaps
# generate with qemu-kvm
- t +=3D custom_target(km,
- build_by_default: true,
- output: km,
- command: [native_qemu_keymap, '-f', '@OUTPUT@', arg=
s.split()],
- install: have_system,
- install_dir: qemu_datadir / 'keymaps')
+ keymap_targets +=3D 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 =3D {
if vnc.found()
gvnc =3D dependency('gvnc-1.0', method: 'pkg-config', required: false)
if gvnc.found()
- qtests +=3D {'vnc-display-test': [gvnc]}
+ qtests +=3D {'vnc-display-test': [gvnc, keymap_targets]}
qtests_generic +=3D [ 'vnc-display-test' ]
endif
endif
--=20
2.39.5