From ec0bbbd2a994979992b2e9dcde7b97e89ccf5b31 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 5 Jul 2025 20:21:00 +0100 Subject: [PATCH 1/2] meson: do not reference variable unless feature that defines it is enabled SYSTEMD_LANGUAGE_FALLBACK_MAP is used by the localed test, and language_fallback_map is defined by the localed meson. If the feature is disabled, the test is not built so the env var is not needed, and the meson variable is not defined so the build fails. --- src/test/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/meson.build b/src/test/meson.build index 286fcac5c7..e99605af72 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -12,7 +12,9 @@ generated_sources += test_hashmap_ordered_c path = run_command(sh, '-c', 'echo "$PATH"', check: true).stdout().strip() test_env = environment() -test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map) +if conf.get('ENABLE_LOCALED') == 1 + test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map) +endif test_env.set('PATH', meson.project_build_root() + ':' + path) test_env.set('PROJECT_BUILD_ROOT', meson.project_build_root()) test_env.set('SYSTEMD_SLOW_TESTS', want_slow_tests ? '1' : '0') From 163e6662042a853b448802bb195504dca49d7bbe Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 5 Jul 2025 20:21:51 +0100 Subject: [PATCH 2/2] meson: call qemu with -machine virt on aarch64 'qemu-system-aarch64 -device help' fails when no machine is specified. Use the 'virt' type which seems to be what everyone uses for VMs. --- test/integration-tests/TEST-64-UDEV-STORAGE/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build index 76b0ebeb87..0b1b3d9a97 100644 --- a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build +++ b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build @@ -7,7 +7,10 @@ udev_storage_test_template = { } qemu = find_program('qemu-system-@0@'.format(host_machine.cpu_family()), 'qemu-kvm', dirs : ['/usr/libexec'], native : true, required : false) -if qemu.found() +if qemu.found() and host_machine.cpu_family() == 'aarch64' + # qemu-system-aarch64 errors out if no machine is specified + devices = run_command(qemu, '-device', 'help', '-machine', 'virt', check : true).stdout().strip() +elif qemu.found() devices = run_command(qemu, '-device', 'help', check : true).stdout().strip() else devices = ''