| Message ID | 20250205155946.2811296-6-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | tests/functional: a few misc cleanups and fixes | expand |
On 5/2/25 16:59, Daniel P. Berrangé wrote: > The test_mem_addr_space is validating handling of QEMU with various > memory address settings. All of the test cases are setting 'maxmem' > to a value that exceeds the 32-bit address space, so these must all > be skipped on 32-bit hosts. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > tests/functional/qemu_test/__init__.py | 2 +- > tests/functional/qemu_test/decorators.py | 12 ++++++++++++ > tests/functional/test_mem_addr_space.py | 17 ++++++++++++++++- > 3 files changed, 29 insertions(+), 2 deletions(-) > diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qemu_test/decorators.py > index 1651eb739a..d3a8cf0483 100644 > --- a/tests/functional/qemu_test/decorators.py > +++ b/tests/functional/qemu_test/decorators.py > @@ -5,6 +5,7 @@ > import importlib > import os > import platform > +import sys > from unittest import skipUnless > > from .cmd import which > @@ -118,3 +119,14 @@ def skipIfMissingImports(*args): > > return skipUnless(has_imports, 'required import(s) "%s" not installed' % > ", ".join(args)) > + > +''' > +Decorator to skip execution of a test on 32-bit targets > +Example: > + > + @skipIf32BitTarget() > +''' > +def skipIf32BitTarget(): > + enoughBits = sys.maxsize > 2**32 > + return skipUnless(enoughBits, > + 'Test requires a host with 64-bit address space') skipIf32BitHost?
On Wed, Feb 05, 2025 at 05:40:48PM +0100, Philippe Mathieu-Daudé wrote: > On 5/2/25 16:59, Daniel P. Berrangé wrote: > > The test_mem_addr_space is validating handling of QEMU with various > > memory address settings. All of the test cases are setting 'maxmem' > > to a value that exceeds the 32-bit address space, so these must all > > be skipped on 32-bit hosts. > > > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > > --- > > tests/functional/qemu_test/__init__.py | 2 +- > > tests/functional/qemu_test/decorators.py | 12 ++++++++++++ > > tests/functional/test_mem_addr_space.py | 17 ++++++++++++++++- > > 3 files changed, 29 insertions(+), 2 deletions(-) > > > > diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qemu_test/decorators.py > > index 1651eb739a..d3a8cf0483 100644 > > --- a/tests/functional/qemu_test/decorators.py > > +++ b/tests/functional/qemu_test/decorators.py > > @@ -5,6 +5,7 @@ > > import importlib > > import os > > import platform > > +import sys > > from unittest import skipUnless > > from .cmd import which > > @@ -118,3 +119,14 @@ def skipIfMissingImports(*args): > > return skipUnless(has_imports, 'required import(s) "%s" not installed' % > > ", ".join(args)) > > + > > +''' > > +Decorator to skip execution of a test on 32-bit targets > > +Example: > > + > > + @skipIf32BitTarget() > > +''' > > +def skipIf32BitTarget(): > > + enoughBits = sys.maxsize > 2**32 > > + return skipUnless(enoughBits, > > + 'Test requires a host with 64-bit address space') > > skipIf32BitHost? I don't mind either way. With regards, Daniel
On 5/2/25 17:53, Daniel P. Berrangé wrote: > On Wed, Feb 05, 2025 at 05:40:48PM +0100, Philippe Mathieu-Daudé wrote: >> On 5/2/25 16:59, Daniel P. Berrangé wrote: >>> The test_mem_addr_space is validating handling of QEMU with various >>> memory address settings. All of the test cases are setting 'maxmem' >>> to a value that exceeds the 32-bit address space, so these must all >>> be skipped on 32-bit hosts. >>> >>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> >>> --- >>> tests/functional/qemu_test/__init__.py | 2 +- >>> tests/functional/qemu_test/decorators.py | 12 ++++++++++++ >>> tests/functional/test_mem_addr_space.py | 17 ++++++++++++++++- >>> 3 files changed, 29 insertions(+), 2 deletions(-) >> >> >>> diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qemu_test/decorators.py >>> index 1651eb739a..d3a8cf0483 100644 >>> --- a/tests/functional/qemu_test/decorators.py >>> +++ b/tests/functional/qemu_test/decorators.py >>> @@ -5,6 +5,7 @@ >>> import importlib >>> import os >>> import platform >>> +import sys >>> from unittest import skipUnless >>> from .cmd import which >>> @@ -118,3 +119,14 @@ def skipIfMissingImports(*args): >>> return skipUnless(has_imports, 'required import(s) "%s" not installed' % >>> ", ".join(args)) >>> + >>> +''' >>> +Decorator to skip execution of a test on 32-bit targets "hosts" >>> +Example: >>> + >>> + @skipIf32BitTarget() >>> +''' >>> +def skipIf32BitTarget(): >>> + enoughBits = sys.maxsize > 2**32 >>> + return skipUnless(enoughBits, >>> + 'Test requires a host with 64-bit address space') >> >> skipIf32BitHost? > > I don't mind either way. Preferably using skipIf32BitHost to match the error message: Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 2/5/25 07:59, Daniel P. Berrangé wrote: > + > +''' > +Decorator to skip execution of a test on 32-bit targets > +Example: > + > + @skipIf32BitTarget() > +''' > +def skipIf32BitTarget(): > + enoughBits = sys.maxsize > 2**32 This will work for true 32-bit hosts, and possibly for containers running emulation, but it won't work for cross-compilation (x86_64 to i686 or aarch64 to arm). Perhaps "file qemu-system-foo" | grep "ELF 32-bit" ? I don't know that we've actually selected the executable at this point though... r~
On 2/5/25 08:53, Daniel P. Berrangé wrote: >>> +Decorator to skip execution of a test on 32-bit targets >>> +Example: >>> + >>> + @skipIf32BitTarget() >>> +''' >>> +def skipIf32BitTarget(): >>> + enoughBits = sys.maxsize > 2**32 >>> + return skipUnless(enoughBits, >>> + 'Test requires a host with 64-bit address space') >> >> skipIf32BitHost? > > I don't mind either way. Definitely host. r~
On Wed, Feb 05, 2025 at 10:24:08AM -0800, Richard Henderson wrote: > On 2/5/25 07:59, Daniel P. Berrangé wrote: > > + > > +''' > > +Decorator to skip execution of a test on 32-bit targets > > +Example: > > + > > + @skipIf32BitTarget() > > +''' > > +def skipIf32BitTarget(): > > + enoughBits = sys.maxsize > 2**32 > > This will work for true 32-bit hosts, and possibly for containers running > emulation, but it won't work for cross-compilation (x86_64 to i686 or > aarch64 to arm). If we've cross compiled qemu-system-XXXX then we won't be able to execute any functional tests for those binaries, so is it actually a problem ? With regards, Daniel
On 2/5/25 10:47, Daniel P. Berrangé wrote: > On Wed, Feb 05, 2025 at 10:24:08AM -0800, Richard Henderson wrote: >> On 2/5/25 07:59, Daniel P. Berrangé wrote: >>> + >>> +''' >>> +Decorator to skip execution of a test on 32-bit targets >>> +Example: >>> + >>> + @skipIf32BitTarget() >>> +''' >>> +def skipIf32BitTarget(): >>> + enoughBits = sys.maxsize > 2**32 >> >> This will work for true 32-bit hosts, and possibly for containers running >> emulation, but it won't work for cross-compilation (x86_64 to i686 or >> aarch64 to arm). > > If we've cross compiled qemu-system-XXXX then we won't be able to > execute any functional tests for those binaries, so is it actually > a problem ? Absolutely we can execute those binaries, for the specific examples above. r~
diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu_test/__init__.py index 5c972843a6..7a90311891 100644 --- a/tests/functional/qemu_test/__init__.py +++ b/tests/functional/qemu_test/__init__.py @@ -15,6 +15,6 @@ from .linuxkernel import LinuxKernelTest from .decorators import skipIfMissingCommands, skipIfNotMachine, \ skipFlakyTest, skipUntrustedTest, skipBigDataTest, skipSlowTest, \ - skipIfMissingImports + skipIfMissingImports, skipIf32BitTarget from .archive import archive_extract from .uncompress import uncompress diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qemu_test/decorators.py index 1651eb739a..d3a8cf0483 100644 --- a/tests/functional/qemu_test/decorators.py +++ b/tests/functional/qemu_test/decorators.py @@ -5,6 +5,7 @@ import importlib import os import platform +import sys from unittest import skipUnless from .cmd import which @@ -118,3 +119,14 @@ def skipIfMissingImports(*args): return skipUnless(has_imports, 'required import(s) "%s" not installed' % ", ".join(args)) + +''' +Decorator to skip execution of a test on 32-bit targets +Example: + + @skipIf32BitTarget() +''' +def skipIf32BitTarget(): + enoughBits = sys.maxsize > 2**32 + return skipUnless(enoughBits, + 'Test requires a host with 64-bit address space') diff --git a/tests/functional/test_mem_addr_space.py b/tests/functional/test_mem_addr_space.py index bb0cf062ca..3e0215beb3 100755 --- a/tests/functional/test_mem_addr_space.py +++ b/tests/functional/test_mem_addr_space.py @@ -10,7 +10,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -from qemu_test import QemuSystemTest +from qemu_test import QemuSystemTest, skipIf32BitTarget import time class MemAddrCheck(QemuSystemTest): @@ -22,6 +22,7 @@ class MemAddrCheck(QemuSystemTest): # first, lets test some 32-bit processors. # for all 32-bit cases, pci64_hole_size is 0. + @skipIf32BitTarget() def test_phybits_low_pse36(self): """ With pse36 feature ON, a processor has 36 bits of addressing. So it can @@ -49,6 +50,7 @@ def test_phybits_low_pse36(self): self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_low_pae(self): """ With pae feature ON, a processor has 36 bits of addressing. So it can @@ -66,6 +68,7 @@ def test_phybits_low_pae(self): self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_pentium_pse36(self): """ Setting maxmem to 59.5G and making sure that QEMU can start with the @@ -82,6 +85,7 @@ def test_phybits_ok_pentium_pse36(self): self.vm.shutdown() self.assertNotRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_pentium_pae(self): """ Test is same as above but now with pae cpu feature turned on. @@ -99,6 +103,7 @@ def test_phybits_ok_pentium_pae(self): self.vm.shutdown() self.assertNotRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_pentium2(self): """ Pentium2 has 36 bits of addressing, so its same as pentium @@ -115,6 +120,7 @@ def test_phybits_ok_pentium2(self): self.vm.shutdown() self.assertNotRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_low_nonpse36(self): """ Pentium processor has 32 bits of addressing without pse36 or pae @@ -135,6 +141,7 @@ def test_phybits_low_nonpse36(self): self.assertRegex(self.vm.get_log(), r'phys-bits too low') # now lets test some 64-bit CPU cases. + @skipIf32BitTarget() def test_phybits_low_tcg_q35_70_amd(self): """ For q35 7.1 machines and above, there is a HT window that starts at @@ -161,6 +168,7 @@ def test_phybits_low_tcg_q35_70_amd(self): self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_low_tcg_q35_71_amd(self): """ AMD_HT_START is defined to be at 1012 GiB. So for q35 machines @@ -181,6 +189,7 @@ def test_phybits_low_tcg_q35_71_amd(self): self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_tcg_q35_70_amd(self): """ Same as q35-7.0 AMD case except that here we check that QEMU can @@ -197,6 +206,7 @@ def test_phybits_ok_tcg_q35_70_amd(self): self.vm.shutdown() self.assertNotRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_tcg_q35_71_amd(self): """ Same as q35-7.1 AMD case except that here we check that QEMU can @@ -213,6 +223,7 @@ def test_phybits_ok_tcg_q35_71_amd(self): self.vm.shutdown() self.assertNotRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_tcg_q35_71_intel(self): """ Same parameters as test_phybits_low_tcg_q35_71_amd() but use @@ -231,6 +242,7 @@ def test_phybits_ok_tcg_q35_71_intel(self): self.vm.shutdown() self.assertNotRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_low_tcg_q35_71_amd_41bits(self): """ AMD processor with 41 bits. Max cpu hw address = 2 TiB. @@ -255,6 +267,7 @@ def test_phybits_low_tcg_q35_71_amd_41bits(self): self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_tcg_q35_71_amd_41bits(self): """ AMD processor with 41 bits. Max cpu hw address = 2 TiB. @@ -273,6 +286,7 @@ def test_phybits_ok_tcg_q35_71_amd_41bits(self): self.vm.shutdown() self.assertNotRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_low_tcg_q35_intel_cxl(self): """ cxl memory window starts after memory device range. Here, we use 1 GiB @@ -293,6 +307,7 @@ def test_phybits_low_tcg_q35_intel_cxl(self): self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') + @skipIf32BitTarget() def test_phybits_ok_tcg_q35_intel_cxl(self): """ Same as above but here we do not reserve any cxl memory window. Hence,
The test_mem_addr_space is validating handling of QEMU with various memory address settings. All of the test cases are setting 'maxmem' to a value that exceeds the 32-bit address space, so these must all be skipped on 32-bit hosts. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tests/functional/qemu_test/__init__.py | 2 +- tests/functional/qemu_test/decorators.py | 12 ++++++++++++ tests/functional/test_mem_addr_space.py | 17 ++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-)