[PATCH] tests: skip vmx tests when ESX is disabled

Daniel P. Berrangé via Devel posted 1 patch 3 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20251121113934.3946555-1-berrange@redhat.com
tests/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] tests: skip vmx tests when ESX is disabled
Posted by Daniel P. Berrangé via Devel 3 weeks ago
From: Daniel P. Berrangé <berrange@redhat.com>

Since the recent change:

  commit f82d30307da8bea396a32dcab2ba9be5c3236b7c
  Author: Michal Prívozník <mprivozn@redhat.com>
  Date:   Fri Nov 14 10:35:14 2025 +0100

    vmx2xmltest: Drop custom file name parse function

The VMX parsing uses the esxParseVMXFileName() function in
the ESX library. This is unavailable when the ESX driver is
disabled, so the tests must be skipped too.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/meson.build b/tests/meson.build
index cd53e48aa4..1f25f674f4 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -548,7 +548,7 @@ if conf.has('WITH_VMWARE')
   ]
 endif
 
-if conf.has('WITH_VMX')
+if conf.has('WITH_VMX') and conf.has('WITH_ESX')
   tests += [
     { 'name': 'vmx2xmltest', 'include': [ esx_inc_dir ], 'link_with': [ esx_lib ] },
     { 'name': 'xml2vmxtest' },
-- 
2.51.1

Re: [PATCH] tests: skip vmx tests when ESX is disabled
Posted by Peter Krempa via Devel 3 weeks ago
On Fri, Nov 21, 2025 at 11:39:34 +0000, Daniel P. Berrangé via Devel wrote:
> From: Daniel P. Berrangé <berrange@redhat.com>
> 
> Since the recent change:
> 
>   commit f82d30307da8bea396a32dcab2ba9be5c3236b7c
>   Author: Michal Prívozník <mprivozn@redhat.com>
>   Date:   Fri Nov 14 10:35:14 2025 +0100
> 
>     vmx2xmltest: Drop custom file name parse function
> 
> The VMX parsing uses the esxParseVMXFileName() function in
> the ESX library. This is unavailable when the ESX driver is
> disabled, so the tests must be skipped too.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  tests/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index cd53e48aa4..1f25f674f4 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -548,7 +548,7 @@ if conf.has('WITH_VMWARE')
>    ]
>  endif
>  
> -if conf.has('WITH_VMX')
> +if conf.has('WITH_VMX') and conf.has('WITH_ESX')
>    tests += [
>      { 'name': 'vmx2xmltest', 'include': [ esx_inc_dir ], 'link_with': [ esx_lib ] },
>      { 'name': 'xml2vmxtest' },

Reviewed-by: Peter Krempa <pkrempa@redhat.com>