Move hftest headers to a test inc directory.
Other common test headers can also go under this directory, rather
than having shared 'inc' directories scattered around the test source
tree.
Change-Id: I990bdc11ad08bd44377ac2e064c566f552ff22b5
diff --git a/src/arch/aarch64/hftest/interrupts.c b/src/arch/aarch64/hftest/interrupts.c
index 447d1d2..a7eb401 100644
--- a/src/arch/aarch64/hftest/interrupts.c
+++ b/src/arch/aarch64/hftest/interrupts.c
@@ -20,8 +20,8 @@
#include "hf/dlog.h"
-#include "hftest.h"
#include "msr.h"
+#include "test/hftest.h"
extern uint8_t vector_table_el1;
static void (*irq_callback)(void);
diff --git a/test/arch/dlog_test.c b/test/arch/dlog_test.c
index 49403e1..f31ba26 100644
--- a/test/arch/dlog_test.c
+++ b/test/arch/dlog_test.c
@@ -16,7 +16,7 @@
#include "hf/dlog.h"
-#include "hftest.h"
+#include "test/hftest.h"
/**
* Test that logs are written to the buffer, and the rest is empty.
diff --git a/test/arch/mm_test.c b/test/arch/mm_test.c
index e2d1eb8..bf0c186 100644
--- a/test/arch/mm_test.c
+++ b/test/arch/mm_test.c
@@ -18,7 +18,7 @@
#include "hf/arch/mm.h"
-#include "hftest.h"
+#include "test/hftest.h"
/** There must be at least two levels in the page table. */
#define MAX_LEVEL_LOWER_BOUND 1
diff --git a/test/hftest/BUILD.gn b/test/hftest/BUILD.gn
index f73272a..d65397b 100644
--- a/test/hftest/BUILD.gn
+++ b/test/hftest/BUILD.gn
@@ -15,7 +15,7 @@
import("//build/toolchain/platform.gni")
config("hftest_config") {
- include_dirs = [ "inc" ]
+ include_dirs = [ "//test/inc" ]
}
# Testing framework for a primary VM.
diff --git a/test/hftest/common.c b/test/hftest/common.c
index 7a1cea0..877f1db 100644
--- a/test/hftest/common.c
+++ b/test/hftest/common.c
@@ -21,8 +21,8 @@
#include "hf/memiter.h"
#include "hf/std.h"
-#include "hftest.h"
#include "hftest_common.h"
+#include "test/hftest.h"
HFTEST_ENABLE();
diff --git a/test/hftest/inc/hftest_common.h b/test/hftest/hftest_common.h
similarity index 96%
rename from test/hftest/inc/hftest_common.h
rename to test/hftest/hftest_common.h
index d141076..fba4a54 100644
--- a/test/hftest/inc/hftest_common.h
+++ b/test/hftest/hftest_common.h
@@ -17,7 +17,7 @@
#include "hf/fdt.h"
#include "hf/memiter.h"
-#include "hftest_impl.h"
+#include "test/hftest_impl.h"
void hftest_use_registered_list(void);
void hftest_use_list(struct hftest_test list[], size_t count);
diff --git a/test/hftest/linux_main.c b/test/hftest/linux_main.c
index 6ff258b..2ebe91b 100644
--- a/test/hftest/linux_main.c
+++ b/test/hftest/linux_main.c
@@ -23,8 +23,8 @@
#include "hf/memiter.h"
-#include "hftest.h"
#include "hftest_common.h"
+#include "test/hftest.h"
#include <sys/reboot.h>
void test_main(int argc, const char *argv[])
diff --git a/test/hftest/mm.c b/test/hftest/mm.c
index 4446b24..7c78ab9 100644
--- a/test/hftest/mm.c
+++ b/test/hftest/mm.c
@@ -16,7 +16,7 @@
#include "hf/arch/vm/mm.h"
-#include "hftest.h"
+#include "test/hftest.h"
/* Number of pages reserved for page tables. Increase if necessary. */
#define PTABLE_PAGES 3
diff --git a/test/hftest/power_mgmt.c b/test/hftest/power_mgmt.c
index 2daba31..4c651a6 100644
--- a/test/hftest/power_mgmt.c
+++ b/test/hftest/power_mgmt.c
@@ -20,7 +20,7 @@
#include "hf/spinlock.h"
-#include "hftest.h"
+#include "test/hftest.h"
struct cpu_start_state {
void (*entry)(uintptr_t arg);
diff --git a/test/hftest/service.c b/test/hftest/service.c
index 94adea8..0d35aa1 100644
--- a/test/hftest/service.c
+++ b/test/hftest/service.c
@@ -24,7 +24,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
alignas(4096) uint8_t kstack[4096];
diff --git a/test/hftest/standalone_main.c b/test/hftest/standalone_main.c
index 193623c..586b3b3 100644
--- a/test/hftest/standalone_main.c
+++ b/test/hftest/standalone_main.c
@@ -23,8 +23,8 @@
#include "hf/memiter.h"
#include "hf/mm.h"
-#include "hftest.h"
#include "hftest_common.h"
+#include "test/hftest.h"
alignas(4096) uint8_t kstack[4096];
diff --git a/test/hftest/inc/hftest.h b/test/inc/test/hftest.h
similarity index 98%
rename from test/hftest/inc/hftest.h
rename to test/inc/test/hftest.h
index 6752665..bcd22d8 100644
--- a/test/hftest/inc/hftest.h
+++ b/test/inc/test/hftest.h
@@ -114,4 +114,4 @@
uintptr_t hftest_get_cpu_id(size_t index);
/* Above this point is the public API. Now include the implementation. */
-#include <hftest_impl.h>
+#include "hftest_impl.h"
diff --git a/test/hftest/inc/hftest_impl.h b/test/inc/test/hftest_impl.h
similarity index 100%
rename from test/hftest/inc/hftest_impl.h
rename to test/inc/test/hftest_impl.h
diff --git a/test/linux/hftest_socket.c b/test/linux/hftest_socket.c
index 1e55551..6c9a244 100644
--- a/test/linux/hftest_socket.c
+++ b/test/linux/hftest_socket.c
@@ -24,7 +24,7 @@
#include "vmapi/hf/call.h"
#include "vmapi/hf/transport.h"
-#include "hftest.h"
+#include "test/hftest.h"
alignas(4096) uint8_t kstack[4096];
diff --git a/test/linux/linux.c b/test/linux/linux.c
index beffe8e..d98d412 100644
--- a/test/linux/linux.c
+++ b/test/linux/linux.c
@@ -25,7 +25,7 @@
#include "hf/dlog.h"
#include "hf/socket.h"
-#include "hftest.h"
+#include "test/hftest.h"
#include <sys/socket.h>
#include <sys/syscall.h>
#include <sys/types.h>
diff --git a/test/vmapi/arch/aarch64/arch_features.c b/test/vmapi/arch/aarch64/arch_features.c
index 2d5196d..66f29db 100644
--- a/test/vmapi/arch/aarch64/arch_features.c
+++ b/test/vmapi/arch/aarch64/arch_features.c
@@ -17,7 +17,7 @@
#include "vmapi/hf/call.h"
#include "../msr.h"
-#include "hftest.h"
+#include "test/hftest.h"
/**
* Test that encoding a system register using the implementation defined syntax
diff --git a/test/vmapi/arch/aarch64/gicv3/busy_secondary.c b/test/vmapi/arch/aarch64/gicv3/busy_secondary.c
index 2c1a7be..8e39a2e 100644
--- a/test/vmapi/arch/aarch64/gicv3/busy_secondary.c
+++ b/test/vmapi/arch/aarch64/gicv3/busy_secondary.c
@@ -24,8 +24,8 @@
#include "vmapi/hf/call.h"
#include "gicv3.h"
-#include "hftest.h"
#include "msr.h"
+#include "test/hftest.h"
/**
* Converts a number of nanoseconds to the equivalent number of timer ticks.
diff --git a/test/vmapi/arch/aarch64/gicv3/gicv3.c b/test/vmapi/arch/aarch64/gicv3/gicv3.c
index b2bf118..3d356cd 100644
--- a/test/vmapi/arch/aarch64/gicv3/gicv3.c
+++ b/test/vmapi/arch/aarch64/gicv3/gicv3.c
@@ -27,7 +27,7 @@
#include "vmapi/hf/call.h"
#include "../msr.h"
-#include "hftest.h"
+#include "test/hftest.h"
alignas(PAGE_SIZE) uint8_t send_page[PAGE_SIZE];
alignas(PAGE_SIZE) uint8_t recv_page[PAGE_SIZE];
diff --git a/test/vmapi/arch/aarch64/gicv3/interrupts.c b/test/vmapi/arch/aarch64/gicv3/interrupts.c
index 1b42ee3..3472663 100644
--- a/test/vmapi/arch/aarch64/gicv3/interrupts.c
+++ b/test/vmapi/arch/aarch64/gicv3/interrupts.c
@@ -24,7 +24,7 @@
#include "../msr.h"
#include "gicv3.h"
-#include "hftest.h"
+#include "test/hftest.h"
SET_UP(interrupts)
{
diff --git a/test/vmapi/arch/aarch64/gicv3/services/busy.c b/test/vmapi/arch/aarch64/gicv3/services/busy.c
index e8f63e5..f52eb2a 100644
--- a/test/vmapi/arch/aarch64/gicv3/services/busy.c
+++ b/test/vmapi/arch/aarch64/gicv3/services/busy.c
@@ -21,7 +21,7 @@
#include "vmapi/hf/call.h"
#include "common.h"
-#include "hftest.h"
+#include "test/hftest.h"
/*
* Secondary VM that loops forever after receiving a message.
diff --git a/test/vmapi/arch/aarch64/gicv3/services/common.c b/test/vmapi/arch/aarch64/gicv3/services/common.c
index 8bcbfd9..ba18d39 100644
--- a/test/vmapi/arch/aarch64/gicv3/services/common.c
+++ b/test/vmapi/arch/aarch64/gicv3/services/common.c
@@ -18,7 +18,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
/**
* Try to receive a message from the mailbox, blocking if necessary, and
diff --git a/test/vmapi/arch/aarch64/gicv3/services/systemreg.c b/test/vmapi/arch/aarch64/gicv3/services/systemreg.c
index 6538c84..8ada16e 100644
--- a/test/vmapi/arch/aarch64/gicv3/services/systemreg.c
+++ b/test/vmapi/arch/aarch64/gicv3/services/systemreg.c
@@ -24,7 +24,7 @@
#include "vmapi/hf/call.h"
#include "common.h"
-#include "hftest.h"
+#include "test/hftest.h"
/*
* Secondary VM that tries to access GICv3 system registers.
diff --git a/test/vmapi/arch/aarch64/gicv3/services/timer.c b/test/vmapi/arch/aarch64/gicv3/services/timer.c
index cdd3d53..948c746 100644
--- a/test/vmapi/arch/aarch64/gicv3/services/timer.c
+++ b/test/vmapi/arch/aarch64/gicv3/services/timer.c
@@ -27,7 +27,7 @@
#include "vmapi/hf/call.h"
#include "common.h"
-#include "hftest.h"
+#include "test/hftest.h"
/*
* Secondary VM that sets timers in response to messages, and sends messages
diff --git a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
index 7151273..0637dce 100644
--- a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
+++ b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
@@ -22,7 +22,7 @@
#include "hf/spci.h"
#include "gicv3.h"
-#include "hftest.h"
+#include "test/hftest.h"
SET_UP(timer_secondary)
{
diff --git a/test/vmapi/arch/aarch64/smc_whitelist.c b/test/vmapi/arch/aarch64/smc_whitelist.c
index 718be64..fe0c664 100644
--- a/test/vmapi/arch/aarch64/smc_whitelist.c
+++ b/test/vmapi/arch/aarch64/smc_whitelist.c
@@ -16,8 +16,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "smc.h"
+#include "test/hftest.h"
TEST(smc_whitelist, not_whitelisted_unknown)
{
diff --git a/test/vmapi/arch/aarch64/smccc.c b/test/vmapi/arch/aarch64/smccc.c
index e79646a..d42cc16 100644
--- a/test/vmapi/arch/aarch64/smccc.c
+++ b/test/vmapi/arch/aarch64/smccc.c
@@ -19,8 +19,8 @@
#include "vmapi/hf/call.h"
#include "vmapi/hf/spci.h"
-#include "hftest.h"
#include "smc.h"
+#include "test/hftest.h"
static struct spci_value hvc(uint32_t func, uint64_t arg0, uint64_t arg1,
uint64_t arg2, uint64_t arg3, uint64_t arg4,
diff --git a/test/vmapi/primary_only/faults.c b/test/vmapi/primary_only/faults.c
index c56d314..d9c1b46 100644
--- a/test/vmapi/primary_only/faults.c
+++ b/test/vmapi/primary_only/faults.c
@@ -23,7 +23,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
alignas(PAGE_SIZE) static char tx[PAGE_SIZE];
alignas(PAGE_SIZE) static char rx[PAGE_SIZE];
diff --git a/test/vmapi/primary_only/primary_only.c b/test/vmapi/primary_only/primary_only.c
index 067cfc1..a7bf9af 100644
--- a/test/vmapi/primary_only/primary_only.c
+++ b/test/vmapi/primary_only/primary_only.c
@@ -22,7 +22,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
/*
* TODO: Some of these tests are duplicated between 'primary_only' and
diff --git a/test/vmapi/primary_with_secondaries/abort.c b/test/vmapi/primary_with_secondaries/abort.c
index 3b6b995..dea9611 100644
--- a/test/vmapi/primary_with_secondaries/abort.c
+++ b/test/vmapi/primary_with_secondaries/abort.c
@@ -16,8 +16,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/boot.c b/test/vmapi/primary_with_secondaries/boot.c
index 8df25f8..7902659 100644
--- a/test/vmapi/primary_with_secondaries/boot.c
+++ b/test/vmapi/primary_with_secondaries/boot.c
@@ -18,8 +18,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/floating_point.c b/test/vmapi/primary_with_secondaries/floating_point.c
index 88656e4..a12328d 100644
--- a/test/vmapi/primary_with_secondaries/floating_point.c
+++ b/test/vmapi/primary_with_secondaries/floating_point.c
@@ -22,8 +22,8 @@
#include "vmapi/hf/call.h"
#include "../msr.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/interrupts.c b/test/vmapi/primary_with_secondaries/interrupts.c
index e315b9e..ac64049 100644
--- a/test/vmapi/primary_with_secondaries/interrupts.c
+++ b/test/vmapi/primary_with_secondaries/interrupts.c
@@ -20,8 +20,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/mailbox.c b/test/vmapi/primary_with_secondaries/mailbox.c
index 0a880f7..f08c696 100644
--- a/test/vmapi/primary_with_secondaries/mailbox.c
+++ b/test/vmapi/primary_with_secondaries/mailbox.c
@@ -21,8 +21,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/memory_sharing.c b/test/vmapi/primary_with_secondaries/memory_sharing.c
index 78938af..e6cc222 100644
--- a/test/vmapi/primary_with_secondaries/memory_sharing.c
+++ b/test/vmapi/primary_with_secondaries/memory_sharing.c
@@ -21,8 +21,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
alignas(PAGE_SIZE) static uint8_t pages[4 * PAGE_SIZE];
diff --git a/test/vmapi/primary_with_secondaries/no_services.c b/test/vmapi/primary_with_secondaries/no_services.c
index e4dea80..0c83a8b 100644
--- a/test/vmapi/primary_with_secondaries/no_services.c
+++ b/test/vmapi/primary_with_secondaries/no_services.c
@@ -23,8 +23,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
static alignas(PAGE_SIZE) uint8_t send_page[PAGE_SIZE];
diff --git a/test/vmapi/primary_with_secondaries/run_race.c b/test/vmapi/primary_with_secondaries/run_race.c
index 6212ecb..672815d 100644
--- a/test/vmapi/primary_with_secondaries/run_race.c
+++ b/test/vmapi/primary_with_secondaries/run_race.c
@@ -24,8 +24,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/services/abort.c b/test/vmapi/primary_with_secondaries/services/abort.c
index 23649f2..660fa6d 100644
--- a/test/vmapi/primary_with_secondaries/services/abort.c
+++ b/test/vmapi/primary_with_secondaries/services/abort.c
@@ -19,7 +19,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
alignas(PAGE_SIZE) static uint8_t pages[2 * PAGE_SIZE];
diff --git a/test/vmapi/primary_with_secondaries/services/boot.c b/test/vmapi/primary_with_secondaries/services/boot.c
index 5cd7226..3ee35a6 100644
--- a/test/vmapi/primary_with_secondaries/services/boot.c
+++ b/test/vmapi/primary_with_secondaries/services/boot.c
@@ -19,7 +19,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
/*
* This must match the size specified for services1 in
diff --git a/test/vmapi/primary_with_secondaries/services/check_state.c b/test/vmapi/primary_with_secondaries/services/check_state.c
index 49939dd..1b8db1f 100644
--- a/test/vmapi/primary_with_secondaries/services/check_state.c
+++ b/test/vmapi/primary_with_secondaries/services/check_state.c
@@ -20,7 +20,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
void send_with_retry(spci_vm_id_t sender_vm_id, spci_vm_id_t target_vm_id,
uint32_t size)
diff --git a/test/vmapi/primary_with_secondaries/services/echo.c b/test/vmapi/primary_with_secondaries/services/echo.c
index 990a2c0..b34778e 100644
--- a/test/vmapi/primary_with_secondaries/services/echo.c
+++ b/test/vmapi/primary_with_secondaries/services/echo.c
@@ -19,7 +19,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
TEST_SERVICE(echo)
{
diff --git a/test/vmapi/primary_with_secondaries/services/echo_with_notification.c b/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
index e62ae58..df602ef 100644
--- a/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
+++ b/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
@@ -23,7 +23,7 @@
#include "vmapi/hf/call.h"
#include "../msr.h"
-#include "hftest.h"
+#include "test/hftest.h"
static void irq(void)
{
diff --git a/test/vmapi/primary_with_secondaries/services/floating_point.c b/test/vmapi/primary_with_secondaries/services/floating_point.c
index a1ccbb7..f5c0bcc 100644
--- a/test/vmapi/primary_with_secondaries/services/floating_point.c
+++ b/test/vmapi/primary_with_secondaries/services/floating_point.c
@@ -22,7 +22,7 @@
#include "vmapi/hf/call.h"
#include "../msr.h"
-#include "hftest.h"
+#include "test/hftest.h"
TEST_SERVICE(fp_fill)
{
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c
index 2afef68..ed8bb87 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible.c
@@ -23,8 +23,8 @@
#include "vmapi/hf/call.h"
#include "vmapi/hf/spci.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
/*
* Secondary VM that sends messages in response to interrupts, and interrupts
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
index e90c1a5..87463a3 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
@@ -22,8 +22,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
static void irq(void)
{
diff --git a/test/vmapi/primary_with_secondaries/services/memory.c b/test/vmapi/primary_with_secondaries/services/memory.c
index 0f65749..524f006 100644
--- a/test/vmapi/primary_with_secondaries/services/memory.c
+++ b/test/vmapi/primary_with_secondaries/services/memory.c
@@ -19,8 +19,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
alignas(PAGE_SIZE) static uint8_t page[PAGE_SIZE];
diff --git a/test/vmapi/primary_with_secondaries/services/receive_block.c b/test/vmapi/primary_with_secondaries/services/receive_block.c
index 0ca2181..1fa34ab 100644
--- a/test/vmapi/primary_with_secondaries/services/receive_block.c
+++ b/test/vmapi/primary_with_secondaries/services/receive_block.c
@@ -22,8 +22,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/*
diff --git a/test/vmapi/primary_with_secondaries/services/relay.c b/test/vmapi/primary_with_secondaries/services/relay.c
index 661d292..681b944 100644
--- a/test/vmapi/primary_with_secondaries/services/relay.c
+++ b/test/vmapi/primary_with_secondaries/services/relay.c
@@ -18,7 +18,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
TEST_SERVICE(relay)
{
diff --git a/test/vmapi/primary_with_secondaries/services/smp.c b/test/vmapi/primary_with_secondaries/services/smp.c
index 1644ae4..9030fb5 100644
--- a/test/vmapi/primary_with_secondaries/services/smp.c
+++ b/test/vmapi/primary_with_secondaries/services/smp.c
@@ -26,8 +26,8 @@
#include "vmapi/hf/spci.h"
#include "../psci.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#define ARG_VALUE 42
diff --git a/test/vmapi/primary_with_secondaries/services/spci_check.c b/test/vmapi/primary_with_secondaries/services/spci_check.c
index 0cb1cc0..05715d4 100644
--- a/test/vmapi/primary_with_secondaries/services/spci_check.c
+++ b/test/vmapi/primary_with_secondaries/services/spci_check.c
@@ -19,8 +19,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
TEST_SERVICE(spci_check)
diff --git a/test/vmapi/primary_with_secondaries/services/wfi.c b/test/vmapi/primary_with_secondaries/services/wfi.c
index f31a27b..6d61194 100644
--- a/test/vmapi/primary_with_secondaries/services/wfi.c
+++ b/test/vmapi/primary_with_secondaries/services/wfi.c
@@ -21,8 +21,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
/*
* Secondary VM that enables an interrupt, disables interrupts globally, and
diff --git a/test/vmapi/primary_with_secondaries/smp.c b/test/vmapi/primary_with_secondaries/smp.c
index 4c20c66..1199d83 100644
--- a/test/vmapi/primary_with_secondaries/smp.c
+++ b/test/vmapi/primary_with_secondaries/smp.c
@@ -20,8 +20,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/spci.c b/test/vmapi/primary_with_secondaries/spci.c
index c7c4581..6862333 100644
--- a/test/vmapi/primary_with_secondaries/spci.c
+++ b/test/vmapi/primary_with_secondaries/spci.c
@@ -22,8 +22,8 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
#include "primary_with_secondary.h"
+#include "test/hftest.h"
#include "util.h"
/**
diff --git a/test/vmapi/primary_with_secondaries/sysregs.h b/test/vmapi/primary_with_secondaries/sysregs.h
index e4025d2..50faab4 100644
--- a/test/vmapi/primary_with_secondaries/sysregs.h
+++ b/test/vmapi/primary_with_secondaries/sysregs.h
@@ -19,7 +19,7 @@
#include "vmapi/hf/call.h"
#include "../msr.h"
-#include "hftest.h"
+#include "test/hftest.h"
#define TRY_READ(REG) dlog(#REG "=%#x\n", read_msr(REG))
diff --git a/test/vmapi/primary_with_secondaries/util.c b/test/vmapi/primary_with_secondaries/util.c
index eaa2dd1..19657c4 100644
--- a/test/vmapi/primary_with_secondaries/util.c
+++ b/test/vmapi/primary_with_secondaries/util.c
@@ -22,7 +22,7 @@
#include "vmapi/hf/call.h"
-#include "hftest.h"
+#include "test/hftest.h"
static alignas(PAGE_SIZE) uint8_t send_page[PAGE_SIZE];
static alignas(PAGE_SIZE) uint8_t recv_page[PAGE_SIZE];
