tests/avocado/tuxrun_baselines: Fix ppc64 tests for binaries without slirp
PATCH 1/1 tests/avocado/tuxrun_baselines: Fix ppc64 tests for binaries without slirp
The ppc64 tuxrun tests are currently failing if "slirp" has been disabled in the binary since they are using "-netdev user" now. We have to skip the test if this network backend is missing.
--- tests/avocado/tuxrun_baselines.py | 1 + 1 file changed, 1 insertion(+)
tests/avocado/tuxrun_baselines.py +1 -0
@@ -184,6 +184,7 @@ def common_tuxrun(self, def ppc64_common_tuxrun(self, sums, prefix): # add device args to command line. + self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22', '-device', 'virtio-net,netdev=vnet') self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
Signature · 1 line
2.31.1
Quoted 9 lines · Thomas Huth
The ppc64 tuxrun tests are currently failing if "slirp" has been disabled in the binary since they are using "-netdev user" now. We have to skip the test if this network backend is missing.
Fixes 6ee3624236 ("improve code coverage for ppc64")Signed-off-by Thomas Huth <[email protected]>--- tests/avocado/tuxrun_baselines.py | 1 + 1 file changed, 1 insertion(+)
Quoted 7 lines · Thomas Huth
The ppc64 tuxrun tests are currently failing if "slirp" has been disabled in the binary since they are using "-netdev user" now. We have to skip the test if this network backend is missing.
Fixes 6ee3624236 ("improve code coverage for ppc64")Signed-off-by Thomas Huth <[email protected]>---
Thomas, let me know if you need me to queue this up. I'll send a PR in the next few days.
Daniel
Quoted 15 lines
tests/avocado/tuxrun_baselines.py | 1 + 1 file changed, 1 insertion(+)tests/avocado/tuxrun_baselines.py +1
-0@@ -184,6 +184,7 @@ def common_tuxrun(self, def ppc64_common_tuxrun(self, sums, prefix): # add device args to command line. + self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22', '-device', 'virtio-net,netdev=vnet') self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
Quoted 4 lines · Thomas Huth
The ppc64 tuxrun tests are currently failing if "slirp" has been disabled in the binary since they are using "-netdev user" now. We have to skip the test if this network backend is missing.
Do the boot tests require networking? I doubt they do.
You could instead remove the -netdev user option if slirp is not present.
Quoted 23 lines
Fixes 6ee3624236 ("improve code coverage for ppc64")Signed-off-by Thomas Huth <[email protected]>--- tests/avocado/tuxrun_baselines.py | 1 + 1 file changed, 1 insertion(+)tests/avocado/tuxrun_baselines.py +1
-1@@ -184,6 +184,7 @@ def common_tuxrun(self, def ppc64_common_tuxrun(self, sums, prefix): # add device args to command line. + self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22', '-device', 'virtio-net,netdev=vnet') self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}', --2.31.1
Quoted 9 lines · Joel Stanley
Quoted 4 lines · Thomas Huth
The ppc64 tuxrun tests are currently failing if "slirp" has been disabled in the binary since they are using "-netdev user" now. We have to skip the test if this network backend is missing.
Do the boot tests require networking? I doubt they do.
You could instead remove the -netdev user option if slirp is not present.
Yes, that's an option. Not sure whether it's worth the effort here, though, since most of our CI pipelines run with slirp enabled anyway (it's just one job, avocado-cfi-ppc64-s390x, which is failing due to this missing check)
Thomas
Quoted 23 lines
Quoted 22 lines
Fixes 6ee3624236 ("improve code coverage for ppc64")Signed-off-by Thomas Huth <[email protected]>--- tests/avocado/tuxrun_baselines.py | 1 + 1 file changed, 1 insertion(+)tests/avocado/tuxrun_baselines.py +1
-1@@ -184,6 +184,7 @@ def common_tuxrun(self, def ppc64_common_tuxrun(self, sums, prefix): # add device args to command line. + self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22', '-device', 'virtio-net,netdev=vnet') self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}', --2.31.1
Daniel Henrique Barboza
AppliedQuoted 7 lines · Thomas Huth
The ppc64 tuxrun tests are currently failing if "slirp" has been disabled in the binary since they are using "-netdev user" now. We have to skip the test if this network backend is missing.
Fixes 6ee3624236 ("improve code coverage for ppc64")Signed-off-by Thomas Huth <[email protected]>---
Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,
Daniel
Quoted 15 lines
tests/avocado/tuxrun_baselines.py | 1 + 1 file changed, 1 insertion(+)tests/avocado/tuxrun_baselines.py +1
-0@@ -184,6 +184,7 @@ def common_tuxrun(self, def ppc64_common_tuxrun(self, sums, prefix): # add device args to command line. + self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22', '-device', 'virtio-net,netdev=vnet') self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
Quoted 6 lines · Thomas Huth
The ppc64 tuxrun tests are currently failing if "slirp" has been disabled in the binary since they are using "-netdev user" now. We have to skip the test if this network backend is missing.
Fixes 6ee3624236 ("improve code coverage for ppc64")Signed-off-by Thomas Huth <[email protected]>
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro