Message ID | 20230301104450.1017-1-quintela@redhat.com |
---|---|
State | New |
Headers | show |
Series | test: Check vnc enable before compiling vnc test | expand |
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>
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 > >
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
Signed-off-by: Juan Quintela <quintela@redhat.com> --- tests/qtest/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)