Rearrange includes

For simplicity, tests should just include <xtf/lib.h> and get all the common
infrastructure for free.  All type definitions should come from <xtf/types.h>.
Fix one declaration vs definition mismatch uncovered.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/include/arch/x86/div.h b/include/arch/x86/div.h
index 1985b2d2a12940a74f26de010eecd0dd35c99c53..8e44898e56303971c37c0f92b220f224e1cff847 100644 (file)
--- a/include/arch/x86/div.h
+++ b/include/arch/x86/div.h
@@ -1,7 +1,7 @@
 #ifndef XTF_X86_DIV_H
 #define XTF_X86_DIV_H
 
-#include <stdint.h>
+#include <xtf/types.h>
 
 /*
  * Divide a 64bit number by 32bit divisor without software support.

diff --git a/include/arch/x86/lib.h b/include/arch/x86/lib.h
index 0ebbe90f8362f33f21d826da5f2b00ae4ca3a9ac..1bd016129806b5b9a89a3e6bd8e6a5a8a1b870e7 100644 (file)
--- a/include/arch/x86/lib.h
+++ b/include/arch/x86/lib.h
@@ -1,7 +1,7 @@
 #ifndef XTF_X86_LIB_H
 #define XTF_X86_LIB_H
 
-#include <stdint.h>
+#include <xtf/types.h>
 
 static inline uint64_t rdmsr(uint32_t idx)
 {

diff --git a/include/arch/x86/mm.h b/include/arch/x86/mm.h
index 900468ff132804c1f52958303b3984e868824afa..59c941e2cf143ad46568b2f6768fb1b8c0c9664a 100644 (file)
--- a/include/arch/x86/mm.h
+++ b/include/arch/x86/mm.h
@@ -1,7 +1,7 @@
 #ifndef XTF_X86_MM_H
 #define XTF_X86_MM_H
 
-#include <stdint.h>
+#include <xtf/types.h>
 
 #include <arch/x86/page.h>
 

diff --git a/include/xtf/lib.h b/include/xtf/lib.h
index d18ac2b6b9a85115ab595b22cb46442c884a9419..8991db20835bb338cb5d09edd209bbdd5f21369c 100644 (file)
--- a/include/xtf/lib.h
+++ b/include/xtf/lib.h
@@ -4,7 +4,12 @@
 #include <xtf/types.h>
 #include <xtf/compiler.h>
 #include <xtf/console.h>
+#include <xtf/exlog.h>
+#include <xtf/libc.h>
 #include <xtf/numbers.h>
+#include <xtf/report.h>
+#include <xtf/test.h>
+#include <xtf/traps.h>
 
 #include <arch/x86/lib.h>
 

diff --git a/include/xtf/test.h b/include/xtf/test.h
index f7ef95e17831bd245e3eb14bc6bd75c4447da1d4..d28aac9a542bcb2e7b82e784d98e498dbcbedffb 100644 (file)
--- a/include/xtf/test.h
+++ b/include/xtf/test.h
@@ -17,7 +17,7 @@ void test_main(void);
  * Boolean indicating whether generic Force Emulation Prefix support is
  * available for the test to use.
  */
-extern const bool xtf_has_fep;
+extern bool xtf_has_fep;
 
 #endif /* XTF_TEST_H */
 

diff --git a/tests/example/main.c b/tests/example/main.c
index e3bc288fc0b073330d527a860214ed0311bbf307..c07e9342d2a44ef1e3f9fe63de8f53684d2a70e1 100644 (file)
--- a/tests/example/main.c
+++ b/tests/example/main.c
@@ -1,6 +1,4 @@
-#include <xtf/test.h>
-#include <xtf/report.h>
-#include <xtf/console.h>
+#include <xtf/lib.h>
 
 void test_main(void)
 {

diff --git a/tests/selftest/main.c b/tests/selftest/main.c
index adae1dea3aeb44a062a5d102db3e95bc218ce439..83f7281b8ea1c058c71263369250eb2fbe632b05 100644 (file)
--- a/tests/selftest/main.c
+++ b/tests/selftest/main.c
@@ -1,10 +1,4 @@
-#include <xtf/test.h>
-#include <xtf/report.h>
-#include <xtf/console.h>
-
 #include <xtf/lib.h>
-#include <xtf/traps.h>
-#include <xtf/exlog.h>
 
 #include <arch/x86/processor.h>
 #include <arch/x86/segment.h>