@@ -50,8 +50,18 @@ LIBKVM_riscv += lib/riscv/ucall.c
5050# Non-compiled test targets
5151TEST_PROGS_x86 += x86/nx_huge_pages_test.sh
5252
53+ # Compiled test targets valid on all architectures with libkvm support
54+ TEST_GEN_PROGS_COMMON = demand_paging_test
55+ TEST_GEN_PROGS_COMMON += dirty_log_test
56+ TEST_GEN_PROGS_COMMON += guest_print_test
57+ TEST_GEN_PROGS_COMMON += kvm_binary_stats_test
58+ TEST_GEN_PROGS_COMMON += kvm_create_max_vcpus
59+ TEST_GEN_PROGS_COMMON += kvm_page_table_test
60+ TEST_GEN_PROGS_COMMON += set_memory_region_test
61+
5362# Compiled test targets
54- TEST_GEN_PROGS_x86 = x86/cpuid_test
63+ TEST_GEN_PROGS_x86 = $(TEST_GEN_PROGS_COMMON)
64+ TEST_GEN_PROGS_x86 += x86/cpuid_test
5565TEST_GEN_PROGS_x86 += x86/cr4_cpuid_sync_test
5666TEST_GEN_PROGS_x86 += x86/dirty_log_page_splitting_test
5767TEST_GEN_PROGS_x86 += x86/feature_msrs_test
@@ -119,27 +129,21 @@ TEST_GEN_PROGS_x86 += x86/triple_fault_event_test
119129TEST_GEN_PROGS_x86 += x86/recalc_apic_map_test
120130TEST_GEN_PROGS_x86 += access_tracking_perf_test
121131TEST_GEN_PROGS_x86 += coalesced_io_test
122- TEST_GEN_PROGS_x86 += demand_paging_test
123- TEST_GEN_PROGS_x86 += dirty_log_test
124132TEST_GEN_PROGS_x86 += dirty_log_perf_test
125133TEST_GEN_PROGS_x86 += guest_memfd_test
126- TEST_GEN_PROGS_x86 += guest_print_test
127134TEST_GEN_PROGS_x86 += hardware_disable_test
128- TEST_GEN_PROGS_x86 += kvm_create_max_vcpus
129- TEST_GEN_PROGS_x86 += kvm_page_table_test
130135TEST_GEN_PROGS_x86 += memslot_modification_stress_test
131136TEST_GEN_PROGS_x86 += memslot_perf_test
132137TEST_GEN_PROGS_x86 += mmu_stress_test
133138TEST_GEN_PROGS_x86 += rseq_test
134- TEST_GEN_PROGS_x86 += set_memory_region_test
135139TEST_GEN_PROGS_x86 += steal_time
136- TEST_GEN_PROGS_x86 += kvm_binary_stats_test
137140TEST_GEN_PROGS_x86 += system_counter_offset_test
138141TEST_GEN_PROGS_x86 += pre_fault_memory_test
139142
140143# Compiled outputs used by test targets
141144TEST_GEN_PROGS_EXTENDED_x86 += x86/nx_huge_pages_test
142145
146+ TEST_GEN_PROGS_arm64 = $(TEST_GEN_PROGS_COMMON)
143147TEST_GEN_PROGS_arm64 += arm64/aarch32_id_regs
144148TEST_GEN_PROGS_arm64 += arm64/arch_timer_edge_cases
145149TEST_GEN_PROGS_arm64 += arm64/debug-exceptions
@@ -158,22 +162,16 @@ TEST_GEN_PROGS_arm64 += arm64/no-vgic-v3
158162TEST_GEN_PROGS_arm64 += access_tracking_perf_test
159163TEST_GEN_PROGS_arm64 += arch_timer
160164TEST_GEN_PROGS_arm64 += coalesced_io_test
161- TEST_GEN_PROGS_arm64 += demand_paging_test
162- TEST_GEN_PROGS_arm64 += dirty_log_test
163165TEST_GEN_PROGS_arm64 += dirty_log_perf_test
164- TEST_GEN_PROGS_arm64 += guest_print_test
165166TEST_GEN_PROGS_arm64 += get-reg-list
166- TEST_GEN_PROGS_arm64 += kvm_create_max_vcpus
167- TEST_GEN_PROGS_arm64 += kvm_page_table_test
168167TEST_GEN_PROGS_arm64 += memslot_modification_stress_test
169168TEST_GEN_PROGS_arm64 += memslot_perf_test
170169TEST_GEN_PROGS_arm64 += mmu_stress_test
171170TEST_GEN_PROGS_arm64 += rseq_test
172- TEST_GEN_PROGS_arm64 += set_memory_region_test
173171TEST_GEN_PROGS_arm64 += steal_time
174- TEST_GEN_PROGS_arm64 += kvm_binary_stats_test
175172
176- TEST_GEN_PROGS_s390 = s390/memop
173+ TEST_GEN_PROGS_s390 = $(TEST_GEN_PROGS_COMMON)
174+ TEST_GEN_PROGS_s390 += s390/memop
177175TEST_GEN_PROGS_s390 += s390/resets
178176TEST_GEN_PROGS_s390 += s390/sync_regs_test
179177TEST_GEN_PROGS_s390 += s390/tprot
@@ -182,27 +180,14 @@ TEST_GEN_PROGS_s390 += s390/debug_test
182180TEST_GEN_PROGS_s390 += s390/cpumodel_subfuncs_test
183181TEST_GEN_PROGS_s390 += s390/shared_zeropage_test
184182TEST_GEN_PROGS_s390 += s390/ucontrol_test
185- TEST_GEN_PROGS_s390 += demand_paging_test
186- TEST_GEN_PROGS_s390 += dirty_log_test
187- TEST_GEN_PROGS_s390 += guest_print_test
188- TEST_GEN_PROGS_s390 += kvm_create_max_vcpus
189- TEST_GEN_PROGS_s390 += kvm_page_table_test
190183TEST_GEN_PROGS_s390 += rseq_test
191- TEST_GEN_PROGS_s390 += set_memory_region_test
192- TEST_GEN_PROGS_s390 += kvm_binary_stats_test
193184
185+ TEST_GEN_PROGS_riscv = $(TEST_GEN_PROGS_COMMON)
194186TEST_GEN_PROGS_riscv += riscv/sbi_pmu_test
195187TEST_GEN_PROGS_riscv += riscv/ebreak_test
196188TEST_GEN_PROGS_riscv += arch_timer
197189TEST_GEN_PROGS_riscv += coalesced_io_test
198- TEST_GEN_PROGS_riscv += demand_paging_test
199- TEST_GEN_PROGS_riscv += dirty_log_test
200190TEST_GEN_PROGS_riscv += get-reg-list
201- TEST_GEN_PROGS_riscv += guest_print_test
202- TEST_GEN_PROGS_riscv += kvm_binary_stats_test
203- TEST_GEN_PROGS_riscv += kvm_create_max_vcpus
204- TEST_GEN_PROGS_riscv += kvm_page_table_test
205- TEST_GEN_PROGS_riscv += set_memory_region_test
206191TEST_GEN_PROGS_riscv += steal_time
207192
208193SPLIT_TESTS += arch_timer
0 commit comments