From d9bc278bc31446a2c536e2ab62bf46cd74f6c854 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Mon, 8 Jan 2024 19:02:39 +0100 Subject: [PATCH 1/3] tests/xen: document the expected skip reasons for XTF tests Signed-off-by: Samuel Verschelde --- tests/xen/test_xtf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/xen/test_xtf.py b/tests/xen/test_xtf.py index 542d92109..3cfae08bf 100644 --- a/tests/xen/test_xtf.py +++ b/tests/xen/test_xtf.py @@ -11,10 +11,14 @@ @pytest.mark.usefixtures("host_with_hvm_fep", "host_with_dynamically_disabled_ept_sp") class TestXtf: _common_skips = [ + # UMIP requires hardware support, that is a recent enough CPU 'test-hvm32-umip', 'test-hvm64-umip', + # PV Superpages, a thing which was removed long ago from the hypervisor. Always skips 'test-pv64-xsa-167', - 'test-pv64-xsa-182' + # Depends on pv linear pagetables, which is disabled by default but can be activated on Xen's cmdline. + # Is not needed for Linux. It is for a NetBSD PV guest. + 'test-pv64-xsa-182', ] def _extract_skipped_tests(self, output): From 91a52b6a4c2d25ff43991d73df5a8937d36e1878 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Mon, 8 Jan 2024 19:04:13 +0100 Subject: [PATCH 2/3] tests/xen: make logs clearer when an unexpected XTF test is skipped Signed-off-by: Samuel Verschelde --- tests/xen/test_xtf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/xen/test_xtf.py b/tests/xen/test_xtf.py index 3cfae08bf..bee55e635 100644 --- a/tests/xen/test_xtf.py +++ b/tests/xen/test_xtf.py @@ -46,6 +46,7 @@ def test_all(self, host, xtf_runner): "Checking whether they belong to the allowed list...") for skipped_test in skipped_tests: if skipped_test not in self._common_skips: + logging.error(f"... At least one doesn't") raise logging.info("... They do") else: From 27e63c43e435a736c13583088a8262826b4c8a66 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Mon, 8 Jan 2024 19:05:13 +0100 Subject: [PATCH 3/3] tests/xen: add test-pv64-xsa-444 to list of common skips for XTF It depends on CPU features (DBEXT). Signed-off-by: Samuel Verschelde --- tests/xen/test_xtf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/xen/test_xtf.py b/tests/xen/test_xtf.py index bee55e635..dc2ae47ff 100644 --- a/tests/xen/test_xtf.py +++ b/tests/xen/test_xtf.py @@ -19,6 +19,8 @@ class TestXtf: # Depends on pv linear pagetables, which is disabled by default but can be activated on Xen's cmdline. # Is not needed for Linux. It is for a NetBSD PV guest. 'test-pv64-xsa-182', + # Will skip if DBEXT support is not present + 'test-pv64-xsa-444', ] def _extract_skipped_tests(self, output):