| Message ID | 20220105135009.1584676-28-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | testing/next and other misc fixes | expand |
On 1/5/22 14:50, Alex Bennée wrote: > This stops a bunch of tests failing because of a lack of > "./qemu-system-x86-64" in a build directory where you have configured > only one non-default target. I suspect what we really need is: > > :avocado: tags=arch:host This doesn't seem right, these tests are generic... > to be properly multi-arch safe. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/avocado/empty_cpu_model.py | 3 +++ > tests/avocado/info_usernet.py | 3 +++ > tests/avocado/migration.py | 1 + > tests/avocado/version.py | 1 + > tests/avocado/vnc.py | 1 + > 5 files changed, 9 insertions(+) > > diff --git a/tests/avocado/empty_cpu_model.py b/tests/avocado/empty_cpu_model.py > index 22f504418d..ffe27780a3 100644 > --- a/tests/avocado/empty_cpu_model.py > +++ b/tests/avocado/empty_cpu_model.py > @@ -11,6 +11,9 @@ > > class EmptyCPUModel(QemuSystemTest): > def test(self): > + """ > + :avocado: tags=arch:x86_64 > + """ > self.vm.add_args('-S', '-display', 'none', '-machine', 'none', '-cpu', '') > self.vm.set_qmp_monitor(enabled=False) > self.vm.launch() > diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py > index dc01f74150..bafbc0e23e 100644 > --- a/tests/avocado/info_usernet.py > +++ b/tests/avocado/info_usernet.py > @@ -16,6 +16,9 @@ > class InfoUsernet(QemuSystemTest): > > def test_hostfwd(self): > + """ > + :avocado: tags=arch:x86_64 > + """ > self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22') > self.vm.launch() > res = self.vm.command('human-monitor-command', > diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py > index 584d6ef53f..4e5516f425 100644 > --- a/tests/avocado/migration.py > +++ b/tests/avocado/migration.py > @@ -22,6 +22,7 @@ > class Migration(QemuSystemTest): > """ > :avocado: tags=migration > + :avocado: tags=arch:x86_64 > """ > > timeout = 10 > diff --git a/tests/avocado/version.py b/tests/avocado/version.py > index ded7f039c1..be794b9354 100644 > --- a/tests/avocado/version.py > +++ b/tests/avocado/version.py > @@ -15,6 +15,7 @@ > class Version(QemuSystemTest): > """ > :avocado: tags=quick > + :avocado: tags=arch:x86_64 > """ > def test_qmp_human_info_version(self): > self.vm.add_args('-nodefaults') > diff --git a/tests/avocado/vnc.py b/tests/avocado/vnc.py > index 096432988f..1f80647414 100644 > --- a/tests/avocado/vnc.py > +++ b/tests/avocado/vnc.py > @@ -14,6 +14,7 @@ > class Vnc(QemuSystemTest): > """ > :avocado: tags=vnc,quick > + :avocado: tags=arch:x86_64 > """ > def test_no_vnc(self): > self.vm.add_args('-nodefaults', '-S')
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > On 1/5/22 14:50, Alex Bennée wrote: >> This stops a bunch of tests failing because of a lack of >> "./qemu-system-x86-64" in a build directory where you have configured >> only one non-default target. I suspect what we really need is: >> >> :avocado: tags=arch:host > > This doesn't seem right, these tests are generic... This failure went away after I nuked the build dir and re-ran configure so maybe the failure was due to stale data. I'll drop it for now.
On Wed, Jan 05, 2022 at 01:50:02PM +0000, Alex Bennée wrote: > This stops a bunch of tests failing because of a lack of > "./qemu-system-x86-64" in a build directory where you have configured > only one non-default target. I suspect what we really need is: > > :avocado: tags=arch:host > > to be properly multi-arch safe. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/avocado/empty_cpu_model.py | 3 +++ > tests/avocado/info_usernet.py | 3 +++ > tests/avocado/migration.py | 1 + > tests/avocado/version.py | 1 + > tests/avocado/vnc.py | 1 + > 5 files changed, 9 insertions(+) > > diff --git a/tests/avocado/empty_cpu_model.py b/tests/avocado/empty_cpu_model.py > index 22f504418d..ffe27780a3 100644 > --- a/tests/avocado/empty_cpu_model.py > +++ b/tests/avocado/empty_cpu_model.py > @@ -11,6 +11,9 @@ > > class EmptyCPUModel(QemuSystemTest): > def test(self): > + """ > + :avocado: tags=arch:x86_64 > + """ > self.vm.add_args('-S', '-display', 'none', '-machine', 'none', '-cpu', '') > self.vm.set_qmp_monitor(enabled=False) > self.vm.launch() > diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py > index dc01f74150..bafbc0e23e 100644 > --- a/tests/avocado/info_usernet.py > +++ b/tests/avocado/info_usernet.py > @@ -16,6 +16,9 @@ > class InfoUsernet(QemuSystemTest): > > def test_hostfwd(self): > + """ > + :avocado: tags=arch:x86_64 > + """ > self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22') > self.vm.launch() > res = self.vm.command('human-monitor-command', > diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py > index 584d6ef53f..4e5516f425 100644 > --- a/tests/avocado/migration.py > +++ b/tests/avocado/migration.py > @@ -22,6 +22,7 @@ > class Migration(QemuSystemTest): > """ > :avocado: tags=migration > + :avocado: tags=arch:x86_64 > """ > > timeout = 10 > diff --git a/tests/avocado/version.py b/tests/avocado/version.py > index ded7f039c1..be794b9354 100644 > --- a/tests/avocado/version.py > +++ b/tests/avocado/version.py > @@ -15,6 +15,7 @@ > class Version(QemuSystemTest): > """ > :avocado: tags=quick > + :avocado: tags=arch:x86_64 > """ > def test_qmp_human_info_version(self): > self.vm.add_args('-nodefaults') > diff --git a/tests/avocado/vnc.py b/tests/avocado/vnc.py > index 096432988f..1f80647414 100644 > --- a/tests/avocado/vnc.py > +++ b/tests/avocado/vnc.py > @@ -14,6 +14,7 @@ > class Vnc(QemuSystemTest): > """ > :avocado: tags=vnc,quick > + :avocado: tags=arch:x86_64 > """ > def test_no_vnc(self): > self.vm.add_args('-nodefaults', '-S') > -- > 2.30.2 > Reviewed-by: Beraldo Leal <bleal@redhat.com> -- Beraldo
diff --git a/tests/avocado/empty_cpu_model.py b/tests/avocado/empty_cpu_model.py index 22f504418d..ffe27780a3 100644 --- a/tests/avocado/empty_cpu_model.py +++ b/tests/avocado/empty_cpu_model.py @@ -11,6 +11,9 @@ class EmptyCPUModel(QemuSystemTest): def test(self): + """ + :avocado: tags=arch:x86_64 + """ self.vm.add_args('-S', '-display', 'none', '-machine', 'none', '-cpu', '') self.vm.set_qmp_monitor(enabled=False) self.vm.launch() diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py index dc01f74150..bafbc0e23e 100644 --- a/tests/avocado/info_usernet.py +++ b/tests/avocado/info_usernet.py @@ -16,6 +16,9 @@ class InfoUsernet(QemuSystemTest): def test_hostfwd(self): + """ + :avocado: tags=arch:x86_64 + """ self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22') self.vm.launch() res = self.vm.command('human-monitor-command', diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py index 584d6ef53f..4e5516f425 100644 --- a/tests/avocado/migration.py +++ b/tests/avocado/migration.py @@ -22,6 +22,7 @@ class Migration(QemuSystemTest): """ :avocado: tags=migration + :avocado: tags=arch:x86_64 """ timeout = 10 diff --git a/tests/avocado/version.py b/tests/avocado/version.py index ded7f039c1..be794b9354 100644 --- a/tests/avocado/version.py +++ b/tests/avocado/version.py @@ -15,6 +15,7 @@ class Version(QemuSystemTest): """ :avocado: tags=quick + :avocado: tags=arch:x86_64 """ def test_qmp_human_info_version(self): self.vm.add_args('-nodefaults') diff --git a/tests/avocado/vnc.py b/tests/avocado/vnc.py index 096432988f..1f80647414 100644 --- a/tests/avocado/vnc.py +++ b/tests/avocado/vnc.py @@ -14,6 +14,7 @@ class Vnc(QemuSystemTest): """ :avocado: tags=vnc,quick + :avocado: tags=arch:x86_64 """ def test_no_vnc(self): self.vm.add_args('-nodefaults', '-S')
This stops a bunch of tests failing because of a lack of "./qemu-system-x86-64" in a build directory where you have configured only one non-default target. I suspect what we really need is: :avocado: tags=arch:host to be properly multi-arch safe. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/avocado/empty_cpu_model.py | 3 +++ tests/avocado/info_usernet.py | 3 +++ tests/avocado/migration.py | 1 + tests/avocado/version.py | 1 + tests/avocado/vnc.py | 1 + 5 files changed, 9 insertions(+)