diff options
| author | Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> | 2026-08-27 22:15:01 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2026-09-04 16:06:22 +0100 |
| commit | 522b299ca4316d8cad57f9496ffcba87dcc20719 (patch) | |
| tree | a84cffdad3bd6f3e71f84d2e7b2735be4d13bbfe /tests | |
| parent | 00eb02b4f5f5ad56bd3a302c364e5579d3f9a5db (diff) | |
| download | qemu-522b299ca4316d8cad57f9496ffcba87dcc20719.tar.gz qemu-522b299ca4316d8cad57f9496ffcba87dcc20719.zip | |
tests/tcg/meson.build: implement ./configure containers options
./configure --disable-containers now skip containers build.
./configure --container-command "/path/to/docker" can be used to
override autodetection.
Tested-by: Aniket Sahu <asahu1x@linux.ibm.com>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Message-ID: <20260827221506.91574-101-pierrick.bouvier@oss.qualcomm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tcg/meson.build | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 144577fd94..2458a231f5 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -78,10 +78,23 @@ if gdb.found() endforeach endif -docker_probe = run_command(docker_wrapper, 'probe', check: false) -docker_supported = docker_probe.returncode() == 0 -if docker_supported - docker_wrapper = [docker_wrapper, '--command', docker_probe.stdout().strip()] +docker_supported = false +if get_option('containers') + if get_option('container_command') != '' + # make sure command is working + cmd = get_option('container_command').split() + run_command([cmd, 'info'], check: true) + docker_supported = true + docker_wrapper = [docker_wrapper, '--command', + get_option('container_command')] + else + docker_probe = run_command(docker_wrapper, 'probe', check: false) + docker_supported = docker_probe.returncode() == 0 + if docker_supported + docker_wrapper = [docker_wrapper, '--command', + docker_probe.stdout().strip()] + endif + endif endif # plugins come first, as we need to build the list |