* [PATCH] tests/functional: preserve PYTHONPATH entries
@ 2026-03-23 8:47 Alyssa Ross
2026-03-23 8:53 ` Paolo Bonzini
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alyssa Ross @ 2026-03-23 8:47 UTC (permalink / raw)
To: Thomas Huth, Philippe Mathieu-Daudé, Daniel P. Berrangé
Cc: qemu-devel
Otherwise, it's not possible to use a packaged qemu.qmp.
Fixes: 1497377857 ("tests/functional: Prepare the meson build system for the functional tests")
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
tests/functional/meson.build | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 9bec5a0751..8c4d7f70e1 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -76,8 +76,10 @@ foreach speed : ['quick', 'thorough']
endif
test_env.set('QEMU_TEST_QEMU_BINARY', test_emulator.full_path())
test_env.set('QEMU_BUILD_ROOT', meson.project_build_root())
- test_env.set('PYTHONPATH', meson.project_source_root() / 'python:' +
- meson.current_source_dir())
+ test_env.prepend('PYTHONPATH',
+ meson.project_source_root() / 'python',
+ meson.current_source_dir(),
+ separator : ':')
# Define the GDB environment variable if gdb is available.
gdb = get_option('gdb')
@@ -96,8 +98,10 @@ foreach speed : ['quick', 'thorough']
teststamp = testname + '.tstamp'
test_precache_env = environment()
test_precache_env.set('QEMU_TEST_PRECACHE', meson.current_build_dir() / teststamp)
- test_precache_env.set('PYTHONPATH', meson.project_source_root() / 'python:' +
- meson.current_source_dir())
+ test_precache_env.prepend('PYTHONPATH',
+ meson.project_source_root() / 'python',
+ meson.current_source_dir(),
+ separator : ':')
precache = custom_target('func-precache-' + testname,
output: teststamp,
command: [python, testpath],
base-commit: 8e711856d7639cbffa51405f2cc2366e3d9e3a23
--
2.53.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/functional: preserve PYTHONPATH entries
2026-03-23 8:47 [PATCH] tests/functional: preserve PYTHONPATH entries Alyssa Ross
@ 2026-03-23 8:53 ` Paolo Bonzini
2026-03-23 9:18 ` Thomas Huth
2026-03-23 9:23 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2026-03-23 8:53 UTC (permalink / raw)
To: Alyssa Ross
Cc: Thomas Huth, Philippe Mathieu-Daudé,
Daniel P . Berrangé, qemu-devel
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/functional: preserve PYTHONPATH entries
2026-03-23 8:47 [PATCH] tests/functional: preserve PYTHONPATH entries Alyssa Ross
2026-03-23 8:53 ` Paolo Bonzini
@ 2026-03-23 9:18 ` Thomas Huth
2026-03-23 9:23 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2026-03-23 9:18 UTC (permalink / raw)
To: Alyssa Ross, Philippe Mathieu-Daudé, Daniel P. Berrangé
Cc: qemu-devel
On 23/03/2026 09.47, Alyssa Ross wrote:
> Otherwise, it's not possible to use a packaged qemu.qmp.
>
> Fixes: 1497377857 ("tests/functional: Prepare the meson build system for the functional tests")
> Signed-off-by: Alyssa Ross <hi@alyssa.is>
> ---
> tests/functional/meson.build | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
> index 9bec5a0751..8c4d7f70e1 100644
> --- a/tests/functional/meson.build
> +++ b/tests/functional/meson.build
> @@ -76,8 +76,10 @@ foreach speed : ['quick', 'thorough']
> endif
> test_env.set('QEMU_TEST_QEMU_BINARY', test_emulator.full_path())
> test_env.set('QEMU_BUILD_ROOT', meson.project_build_root())
> - test_env.set('PYTHONPATH', meson.project_source_root() / 'python:' +
> - meson.current_source_dir())
> + test_env.prepend('PYTHONPATH',
> + meson.project_source_root() / 'python',
> + meson.current_source_dir(),
> + separator : ':')
>
> # Define the GDB environment variable if gdb is available.
> gdb = get_option('gdb')
> @@ -96,8 +98,10 @@ foreach speed : ['quick', 'thorough']
> teststamp = testname + '.tstamp'
> test_precache_env = environment()
> test_precache_env.set('QEMU_TEST_PRECACHE', meson.current_build_dir() / teststamp)
> - test_precache_env.set('PYTHONPATH', meson.project_source_root() / 'python:' +
> - meson.current_source_dir())
> + test_precache_env.prepend('PYTHONPATH',
> + meson.project_source_root() / 'python',
> + meson.current_source_dir(),
> + separator : ':')
> precache = custom_target('func-precache-' + testname,
> output: teststamp,
> command: [python, testpath],
>
> base-commit: 8e711856d7639cbffa51405f2cc2366e3d9e3a23
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/functional: preserve PYTHONPATH entries
2026-03-23 8:47 [PATCH] tests/functional: preserve PYTHONPATH entries Alyssa Ross
2026-03-23 8:53 ` Paolo Bonzini
2026-03-23 9:18 ` Thomas Huth
@ 2026-03-23 9:23 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-03-23 9:23 UTC (permalink / raw)
To: Alyssa Ross, Thomas Huth, Daniel P. Berrangé; +Cc: qemu-devel
On 23/3/26 09:47, Alyssa Ross wrote:
> Otherwise, it's not possible to use a packaged qemu.qmp.
>
> Fixes: 1497377857 ("tests/functional: Prepare the meson build system for the functional tests")
> Signed-off-by: Alyssa Ross <hi@alyssa.is>
> ---
> tests/functional/meson.build | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-03-23 9:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-23 8:47 [PATCH] tests/functional: preserve PYTHONPATH entries Alyssa Ross
2026-03-23 8:53 ` Paolo Bonzini
2026-03-23 9:18 ` Thomas Huth
2026-03-23 9:23 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox