test: Check vnc enable before compiling vnc test

[PATCH] test: Check vnc enable before compiling vnc test

Posted by Juan Quintela 1 year, 2 months ago

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/qtest/meson.build | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 29a4efb4c2..62eecf2edf 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -309,10 +309,12 @@ qtests = {
   'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'),
 }
 
-gvnc = dependency('gvnc-1.0', required: false)
-if gvnc.found()
-  qtests += {'vnc-display-test': [gvnc]}
-  qtests_generic += [ 'vnc-display-test' ]
+if vnc.found()
+  gvnc = dependency('gvnc-1.0', required: false)
+  if gvnc.found()
+    qtests += {'vnc-display-test': [gvnc]}
+    qtests_generic += [ 'vnc-display-test' ]
+  endif
 endif
 
 if dbus_display
-- 
2.39.2

Re: [PATCH] test: Check vnc enable before compiling vnc test

Posted by Marc-André Lureau 1 year, 2 months ago

On Wed, Mar 1, 2023 at 2:45 PM Juan Quintela <quintela@redhat.com> wrote:
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  tests/qtest/meson.build | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 29a4efb4c2..62eecf2edf 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -309,10 +309,12 @@ qtests = {
>    'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'),
>  }
>
> -gvnc = dependency('gvnc-1.0', required: false)
> -if gvnc.found()
> -  qtests += {'vnc-display-test': [gvnc]}
> -  qtests_generic += [ 'vnc-display-test' ]
> +if vnc.found()
> +  gvnc = dependency('gvnc-1.0', required: false)
> +  if gvnc.found()
> +    qtests += {'vnc-display-test': [gvnc]}
> +    qtests_generic += [ 'vnc-display-test' ]
> +  endif
>  endif
>
>  if dbus_display
> --
> 2.39.2
>
>


-- 
Marc-André Lureau

Re: [PATCH] test: Check vnc enable before compiling vnc test

Posted by Thomas Huth 1 year, 2 months ago

On 01/03/2023 11.44, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>   tests/qtest/meson.build | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 29a4efb4c2..62eecf2edf 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -309,10 +309,12 @@ qtests = {
>     'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'),
>   }
>   
> -gvnc = dependency('gvnc-1.0', required: false)
> -if gvnc.found()
> -  qtests += {'vnc-display-test': [gvnc]}
> -  qtests_generic += [ 'vnc-display-test' ]
> +if vnc.found()
> +  gvnc = dependency('gvnc-1.0', required: false)
> +  if gvnc.found()
> +    qtests += {'vnc-display-test': [gvnc]}
> +    qtests_generic += [ 'vnc-display-test' ]
> +  endif
>   endif

Reviewed-by: Thomas Huth <thuth@redhat.com>