30
30
)
31
31
DATA_FILES = Path ("./data/msr" )
32
32
33
+ pytestmark = pytest .mark .skipif (
34
+ global_props .cpu_architecture != "x86_64" , reason = "Only run in x86_64"
35
+ )
36
+
33
37
34
38
def read_msr_csv (fd ):
35
39
"""Read a CSV of MSRs"""
@@ -105,7 +109,6 @@ def skip_test_based_on_artifacts(snapshot_artifacts_dir):
105
109
pytest .skip (re .sub (" +" , " " , reason ))
106
110
107
111
108
- @pytest .mark .skipif (PLATFORM != "x86_64" , reason = "CPUID is only supported on x86_64." )
109
112
@pytest .mark .parametrize (
110
113
"num_vcpus" ,
111
114
[1 , 2 , 16 ],
@@ -126,7 +129,6 @@ def test_cpuid(uvm_plain_any, num_vcpus, htt):
126
129
_check_cpuid_x86 (vm , num_vcpus , "true" if num_vcpus > 1 else "false" )
127
130
128
131
129
- @pytest .mark .skipif (PLATFORM != "x86_64" , reason = "CPUID is only supported on x86_64." )
130
132
@pytest .mark .skipif (
131
133
cpuid_utils .get_cpu_vendor () != cpuid_utils .CpuVendor .AMD ,
132
134
reason = "L3 cache info is only present in 0x80000006 for AMD" ,
@@ -143,9 +145,6 @@ def test_extended_cache_features(uvm_plain_any):
143
145
_check_extended_cache_features (vm )
144
146
145
147
146
- @pytest .mark .skipif (
147
- PLATFORM != "x86_64" , reason = "The CPU brand string is masked only on x86_64."
148
- )
149
148
def test_brand_string (uvm_plain_any ):
150
149
"""
151
150
Ensure good formatting for the guest brand string.
@@ -204,10 +203,6 @@ def test_brand_string(uvm_plain_any):
204
203
assert False
205
204
206
205
207
- @pytest .mark .skipif (
208
- PLATFORM != "x86_64" ,
209
- reason = "This is x86_64 specific test." ,
210
- )
211
206
def test_host_vs_guest_cpu_features_x86_64 (uvm_nano ):
212
207
"""Check CPU features host vs guest"""
213
208
@@ -929,9 +924,6 @@ def test_cpu_cpuid_restore(microvm_factory, guest_kernel, msr_cpu_template):
929
924
)
930
925
931
926
932
- @pytest .mark .skipif (
933
- PLATFORM != "x86_64" , reason = "CPU features are masked only on x86_64."
934
- )
935
927
@pytest .mark .parametrize ("cpu_template" , ["T2" , "T2S" , "C3" ])
936
928
def test_cpu_template (uvm_plain_any , cpu_template , microvm_factory ):
937
929
"""
@@ -1249,7 +1241,6 @@ def check_enabled_features(test_microvm, cpu_template):
1249
1241
)
1250
1242
1251
1243
1252
- @pytest .mark .skipif (PLATFORM != "x86_64" , reason = "This test is specific to x86_64." )
1253
1244
def test_c3_on_skylake_show_warning (uvm_plain , cpu_template ):
1254
1245
"""
1255
1246
This test verifies that the warning message about MMIO stale data mitigation
0 commit comments