libtest: <rtems/test.h> to <rtems/test-info.h>

Rename this header file to later move <t.h> to <rtems/test.h>.  The main
feature provided by <rtems/test-info.h> is the output of standard test
information which is consumed by the RTEMS Tester.

Update #3199.

65 files changed, 65 insertions, 65 deletions

diff --git a/testsuites/ada/support/initimpl.h b/testsuites/ada/support/initimpl.h
index 8076194ff1..7fccfddcf7 100644
--- a/testsuites/ada/support/initimpl.h
+++ b/testsuites/ada/support/initimpl.h
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <rtems/score/threadimpl.h>
 
 /*
diff --git a/testsuites/libtests/block08/system.h b/testsuites/libtests/block08/system.h
index 646de6da48..91227539dd 100644
--- a/testsuites/libtests/block08/system.h
+++ b/testsuites/libtests/block08/system.h
@@ -13,7 +13,7 @@
 
 #include <rtems.h>
 #include <rtems/blkdev.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #include <bsp.h>
 
diff --git a/testsuites/libtests/block09/init.c b/testsuites/libtests/block09/init.c
index 73bec67c3f..1dfce2c251 100644
--- a/testsuites/libtests/block09/init.c
+++ b/testsuites/libtests/block09/init.c
@@ -35,7 +35,7 @@
 
 #include <rtems.h>
 #include <rtems/bdbuf.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #include <bsp.h>
 
diff --git a/testsuites/libtests/block10/init.c b/testsuites/libtests/block10/init.c
index 8e67c055d1..1e57a65eb1 100644
--- a/testsuites/libtests/block10/init.c
+++ b/testsuites/libtests/block10/init.c
@@ -35,7 +35,7 @@
 
 #include <rtems.h>
 #include <rtems/bdbuf.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 const char rtems_test_name[] = "BLOCK 10";
 
diff --git a/testsuites/libtests/capture01/system.h b/testsuites/libtests/capture01/system.h
index dc4a37a527..620b7b477f 100644
--- a/testsuites/libtests/capture01/system.h
+++ b/testsuites/libtests/capture01/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 /* functions */
 
diff --git a/testsuites/libtests/dl01/dl01-o1.c b/testsuites/libtests/dl01/dl01-o1.c
index a47beb1d51..70fa2d3be8 100644
--- a/testsuites/libtests/dl01/dl01-o1.c
+++ b/testsuites/libtests/dl01/dl01-o1.c
@@ -10,7 +10,7 @@
  * Hello World as a loadable module.
  */
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl02/dl02-o1.c b/testsuites/libtests/dl02/dl02-o1.c
index 2afb618800..a7ab2d586c 100644
--- a/testsuites/libtests/dl02/dl02-o1.c
+++ b/testsuites/libtests/dl02/dl02-o1.c
@@ -10,7 +10,7 @@
 
 #include <dlfcn.h>
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl02/dl02-o2.c b/testsuites/libtests/dl02/dl02-o2.c
index 507333535b..331fd3bf25 100644
--- a/testsuites/libtests/dl02/dl02-o2.c
+++ b/testsuites/libtests/dl02/dl02-o2.c
@@ -8,7 +8,7 @@
 
 #include "dl-o2.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__)
 
diff --git a/testsuites/libtests/dl05/dl05-o5.cc b/testsuites/libtests/dl05/dl05-o5.cc
index b70790ea7b..c861916ff0 100644
--- a/testsuites/libtests/dl05/dl05-o5.cc
+++ b/testsuites/libtests/dl05/dl05-o5.cc
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl06/dl06-o1.c b/testsuites/libtests/dl06/dl06-o1.c
index 32e9a4acd9..57124ccff5 100644
--- a/testsuites/libtests/dl06/dl06-o1.c
+++ b/testsuites/libtests/dl06/dl06-o1.c
@@ -11,7 +11,7 @@
 #include <dlfcn.h>
 #include <math.h>
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl06/dl06-o2.c b/testsuites/libtests/dl06/dl06-o2.c
index 7d6f6c8d57..3c374b2371 100644
--- a/testsuites/libtests/dl06/dl06-o2.c
+++ b/testsuites/libtests/dl06/dl06-o2.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o1.c b/testsuites/libtests/dl07/dl07-o1.c
index e3a9cec6cf..adb452b96e 100644
--- a/testsuites/libtests/dl07/dl07-o1.c
+++ b/testsuites/libtests/dl07/dl07-o1.c
@@ -9,7 +9,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include "dl-load.h"
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
diff --git a/testsuites/libtests/dl07/dl07-o2.c b/testsuites/libtests/dl07/dl07-o2.c
index bbb493ef21..d31d0e5f4e 100644
--- a/testsuites/libtests/dl07/dl07-o2.c
+++ b/testsuites/libtests/dl07/dl07-o2.c
@@ -10,7 +10,7 @@
 #include "dl-o1.h"
 #include "dl-o2.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o3.c b/testsuites/libtests/dl07/dl07-o3.c
index c499f6cab7..ecdd72f8a9 100644
--- a/testsuites/libtests/dl07/dl07-o3.c
+++ b/testsuites/libtests/dl07/dl07-o3.c
@@ -13,7 +13,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o4.c b/testsuites/libtests/dl07/dl07-o4.c
index c9028ae808..ad9fe9da32 100644
--- a/testsuites/libtests/dl07/dl07-o4.c
+++ b/testsuites/libtests/dl07/dl07-o4.c
@@ -10,7 +10,7 @@
 #include "dl-o1.h"
 #include "dl-o4.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o5.c b/testsuites/libtests/dl07/dl07-o5.c
index fc56fd31a2..cb04a3e5be 100644
--- a/testsuites/libtests/dl07/dl07-o5.c
+++ b/testsuites/libtests/dl07/dl07-o5.c
@@ -11,7 +11,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o1.c b/testsuites/libtests/dl08/dl08-o1.c
index e6173f3a78..422d25bb09 100644
--- a/testsuites/libtests/dl08/dl08-o1.c
+++ b/testsuites/libtests/dl08/dl08-o1.c
@@ -9,7 +9,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include "dl-load.h"
 #include "dl-o1.h"
 #include "dl-o2.h"
diff --git a/testsuites/libtests/dl08/dl08-o2.c b/testsuites/libtests/dl08/dl08-o2.c
index e58c8750e9..f4a459f451 100644
--- a/testsuites/libtests/dl08/dl08-o2.c
+++ b/testsuites/libtests/dl08/dl08-o2.c
@@ -10,7 +10,7 @@
 #include "dl-o2.h"
 #include "dl-o3.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o3.c b/testsuites/libtests/dl08/dl08-o3.c
index c84b3d72ad..af5976c6de 100644
--- a/testsuites/libtests/dl08/dl08-o3.c
+++ b/testsuites/libtests/dl08/dl08-o3.c
@@ -12,7 +12,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o4.c b/testsuites/libtests/dl08/dl08-o4.c
index 72dfbc6850..7cbd4aadd6 100644
--- a/testsuites/libtests/dl08/dl08-o4.c
+++ b/testsuites/libtests/dl08/dl08-o4.c
@@ -10,7 +10,7 @@
 #include "dl-o4.h"
 #include "dl-o5.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o5.c b/testsuites/libtests/dl08/dl08-o5.c
index 9257a684d7..c4fa9ecdf1 100644
--- a/testsuites/libtests/dl08/dl08-o5.c
+++ b/testsuites/libtests/dl08/dl08-o5.c
@@ -11,7 +11,7 @@
 #include "dl-o6.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c b/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c
index 4aee277a3d..b8c4b2aac6 100644
--- a/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c
+++ b/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c
@@ -10,7 +10,7 @@
 #include "dl-o6.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o1.c b/testsuites/libtests/dl09/dl09-o1.c
index 9404a45732..45cc6edcfa 100644
--- a/testsuites/libtests/dl09/dl09-o1.c
+++ b/testsuites/libtests/dl09/dl09-o1.c
@@ -9,7 +9,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include "dl-load.h"
 #include "dl-o1.h"
 #include "dl-o2.h"
diff --git a/testsuites/libtests/dl09/dl09-o2.c b/testsuites/libtests/dl09/dl09-o2.c
index 4b9f15cd28..48a0786b9c 100644
--- a/testsuites/libtests/dl09/dl09-o2.c
+++ b/testsuites/libtests/dl09/dl09-o2.c
@@ -10,7 +10,7 @@
 #include "dl-o2.h"
 #include "dl-o3.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o3.c b/testsuites/libtests/dl09/dl09-o3.c
index 7f8f419bb1..9fb0591d37 100644
--- a/testsuites/libtests/dl09/dl09-o3.c
+++ b/testsuites/libtests/dl09/dl09-o3.c
@@ -12,7 +12,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o4.c b/testsuites/libtests/dl09/dl09-o4.c
index 9fea2e5d5c..2ae0ef5ea8 100644
--- a/testsuites/libtests/dl09/dl09-o4.c
+++ b/testsuites/libtests/dl09/dl09-o4.c
@@ -10,7 +10,7 @@
 #include "dl-o4.h"
 #include "dl-o5.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o5.c b/testsuites/libtests/dl09/dl09-o5.c
index fb1169256c..badeaed53f 100644
--- a/testsuites/libtests/dl09/dl09-o5.c
+++ b/testsuites/libtests/dl09/dl09-o5.c
@@ -11,7 +11,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o1.c b/testsuites/libtests/dl10/dl10-o1.c
index e6173f3a78..422d25bb09 100644
--- a/testsuites/libtests/dl10/dl10-o1.c
+++ b/testsuites/libtests/dl10/dl10-o1.c
@@ -9,7 +9,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include "dl-load.h"
 #include "dl-o1.h"
 #include "dl-o2.h"
diff --git a/testsuites/libtests/dl10/dl10-o2.c b/testsuites/libtests/dl10/dl10-o2.c
index e58c8750e9..f4a459f451 100644
--- a/testsuites/libtests/dl10/dl10-o2.c
+++ b/testsuites/libtests/dl10/dl10-o2.c
@@ -10,7 +10,7 @@
 #include "dl-o2.h"
 #include "dl-o3.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o3.c b/testsuites/libtests/dl10/dl10-o3.c
index c84b3d72ad..af5976c6de 100644
--- a/testsuites/libtests/dl10/dl10-o3.c
+++ b/testsuites/libtests/dl10/dl10-o3.c
@@ -12,7 +12,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o4.c b/testsuites/libtests/dl10/dl10-o4.c
index 72dfbc6850..7cbd4aadd6 100644
--- a/testsuites/libtests/dl10/dl10-o4.c
+++ b/testsuites/libtests/dl10/dl10-o4.c
@@ -10,7 +10,7 @@
 #include "dl-o4.h"
 #include "dl-o5.h"
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o5.c b/testsuites/libtests/dl10/dl10-o5.c
index be496392c9..832c029ec8 100644
--- a/testsuites/libtests/dl10/dl10-o5.c
+++ b/testsuites/libtests/dl10/dl10-o5.c
@@ -10,7 +10,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o6.c b/testsuites/libtests/dl10/dl10-o6.c
index 5e03a30773..ab6deb189d 100644
--- a/testsuites/libtests/dl10/dl10-o6.c
+++ b/testsuites/libtests/dl10/dl10-o6.c
@@ -9,7 +9,7 @@
 #include "dl-load.h"
 
 #include <inttypes.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 int rtems_main_o5 (void)
 {
diff --git a/testsuites/libtests/mathl/init.c b/testsuites/libtests/mathl/init.c
index af5eb9b4a5..fb390bb2c2 100644
--- a/testsuites/libtests/mathl/init.c
+++ b/testsuites/libtests/mathl/init.c
@@ -24,7 +24,7 @@
 
 #if __rtems__
 #include <bsp.h> /* for device driver prototypes */
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 const char rtems_test_name[] = "MATHL";
 #endif
diff --git a/testsuites/psxtests/psxbarrier01/main.c b/testsuites/psxtests/psxbarrier01/main.c
index 93aa9f788b..45d56d025b 100644
--- a/testsuites/psxtests/psxbarrier01/main.c
+++ b/testsuites/psxtests/psxbarrier01/main.c
@@ -12,7 +12,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c
index 038bbec43c..d2811b409a 100644
--- a/testsuites/psxtests/psxconfig01/init.c
+++ b/testsuites/psxtests/psxconfig01/init.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <tmacros.h>
 
 #include <sys/stat.h>
diff --git a/testsuites/psxtests/psxfenv01/init.c b/testsuites/psxtests/psxfenv01/init.c
index 867b625a1e..15d383f211 100644
--- a/testsuites/psxtests/psxfenv01/init.c
+++ b/testsuites/psxtests/psxfenv01/init.c
@@ -45,7 +45,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <tmacros.h>
 #include <float.h>
 
diff --git a/testsuites/psxtests/psxinttypes01/init.c b/testsuites/psxtests/psxinttypes01/init.c
index 615b9d9ab4..d17ad5bda3 100644
--- a/testsuites/psxtests/psxinttypes01/init.c
+++ b/testsuites/psxtests/psxinttypes01/init.c
@@ -35,7 +35,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxndbm01/init.c b/testsuites/psxtests/psxndbm01/init.c
index d696abf282..a13afa7315 100644
--- a/testsuites/psxtests/psxndbm01/init.c
+++ b/testsuites/psxtests/psxndbm01/init.c
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <sys/stat.h>   /* contains definitions of 'file_mode' */
 #include <string.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <tmacros.h>
 
 const char rtems_test_name[] = "PSXNDBM 01";
diff --git a/testsuites/psxtests/psxrwlock01/main.c b/testsuites/psxtests/psxrwlock01/main.c
index 2984ce965a..d71218bfff 100644
--- a/testsuites/psxtests/psxrwlock01/main.c
+++ b/testsuites/psxtests/psxrwlock01/main.c
@@ -12,7 +12,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/samples/base_mp/system.h b/testsuites/samples/base_mp/system.h
index 3c434397b5..97c76f5e24 100644
--- a/testsuites/samples/base_mp/system.h
+++ b/testsuites/samples/base_mp/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 /* functions */
 
diff --git a/testsuites/samples/base_sp/system.h b/testsuites/samples/base_sp/system.h
index 174496ecbf..0b49edb465 100644
--- a/testsuites/samples/base_sp/system.h
+++ b/testsuites/samples/base_sp/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 /* functions */
 
diff --git a/testsuites/samples/capture/system.h b/testsuites/samples/capture/system.h
index 99c15ec740..7f915dc830 100644
--- a/testsuites/samples/capture/system.h
+++ b/testsuites/samples/capture/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 /* functions */
 
diff --git a/testsuites/samples/cdtest/main.cc b/testsuites/samples/cdtest/main.cc
index 010bc221f0..894e404ba1 100644
--- a/testsuites/samples/cdtest/main.cc
+++ b/testsuites/samples/cdtest/main.cc
@@ -24,7 +24,7 @@
 
 #include <rtems.h>
 #include <rtems/bspIo.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #include <cstdio>
 #include <cstdlib>
diff --git a/testsuites/samples/cdtest/system.h b/testsuites/samples/cdtest/system.h
index 6530682a93..7d14747a32 100644
--- a/testsuites/samples/cdtest/system.h
+++ b/testsuites/samples/cdtest/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 /* functions */
 
diff --git a/testsuites/samples/fileio/system.h b/testsuites/samples/fileio/system.h
index 743acf8406..54e2441184 100644
--- a/testsuites/samples/fileio/system.h
+++ b/testsuites/samples/fileio/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include "tmacros.h"
 
 /* functions */
diff --git a/testsuites/samples/iostream/system.h b/testsuites/samples/iostream/system.h
index fbcc56e063..696cb8df34 100644
--- a/testsuites/samples/iostream/system.h
+++ b/testsuites/samples/iostream/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 /* configuration information */
 
diff --git a/testsuites/samples/nsecs/system.h b/testsuites/samples/nsecs/system.h
index 29627e49db..31c17a4073 100644
--- a/testsuites/samples/nsecs/system.h
+++ b/testsuites/samples/nsecs/system.h
@@ -1,7 +1,7 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #include <bsp.h> /* for device driver prototypes */
 
diff --git a/testsuites/samples/paranoia/system.h b/testsuites/samples/paranoia/system.h
index 6726f81873..740c8ec5b9 100644
--- a/testsuites/samples/paranoia/system.h
+++ b/testsuites/samples/paranoia/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 /* functions */
 
diff --git a/testsuites/samples/pppd/system.h b/testsuites/samples/pppd/system.h
index f83212ed5a..c9972fe9b3 100644
--- a/testsuites/samples/pppd/system.h
+++ b/testsuites/samples/pppd/system.h
@@ -2,7 +2,7 @@
 #define SYSTEM_H
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
diff --git a/testsuites/samples/ticker/system.h b/testsuites/samples/ticker/system.h
index 05261341f7..4ac3f59f16 100644
--- a/testsuites/samples/ticker/system.h
+++ b/testsuites/samples/ticker/system.h
@@ -12,7 +12,7 @@
  */
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <inttypes.h>
 #include "tmacros.h"
 
diff --git a/testsuites/smptests/smpatomic01/init.c b/testsuites/smptests/smpatomic01/init.c
index a3b9e1dc45..ba2ec7baba 100644
--- a/testsuites/smptests/smpatomic01/init.c
+++ b/testsuites/smptests/smpatomic01/init.c
@@ -22,7 +22,7 @@
 #include <rtems/score/smpbarrier.h>
 #include <rtems.h>
 #include <rtems/bsd.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <limits.h>
 #include <string.h>
 
diff --git a/testsuites/smptests/smplock01/init.c b/testsuites/smptests/smplock01/init.c
index bfaa755150..1c33911732 100644
--- a/testsuites/smptests/smplock01/init.c
+++ b/testsuites/smptests/smplock01/init.c
@@ -19,7 +19,7 @@
 #include <rtems/score/smplock.h>
 #include <rtems/score/smplockmcs.h>
 #include <rtems/score/smplockseq.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/smptests/smpscheduler03/init.c b/testsuites/smptests/smpscheduler03/init.c
index 024e3cdd48..33b076b045 100644
--- a/testsuites/smptests/smpscheduler03/init.c
+++ b/testsuites/smptests/smpscheduler03/init.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 void Init(rtems_task_argument arg);
 
diff --git a/testsuites/smptests/smpscheduler05/init.c b/testsuites/smptests/smpscheduler05/init.c
index 4a1d0b6db3..90147ea9d7 100644
--- a/testsuites/smptests/smpscheduler05/init.c
+++ b/testsuites/smptests/smpscheduler05/init.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 void Init(rtems_task_argument arg);
 
diff --git a/testsuites/smptests/smpscheduler06/init.c b/testsuites/smptests/smpscheduler06/init.c
index 1559e04d43..6f26639a86 100644
--- a/testsuites/smptests/smpscheduler06/init.c
+++ b/testsuites/smptests/smpscheduler06/init.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 void Init(rtems_task_argument arg);
 
diff --git a/testsuites/smptests/smpscheduler07/init.c b/testsuites/smptests/smpscheduler07/init.c
index 4583a5eb2a..cdd3370413 100644
--- a/testsuites/smptests/smpscheduler07/init.c
+++ b/testsuites/smptests/smpscheduler07/init.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 void Init(rtems_task_argument arg);
 
diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c
index 8046100091..7428f38830 100644
--- a/testsuites/sptests/spheapprot/init.c
+++ b/testsuites/sptests/spheapprot/init.c
@@ -22,7 +22,7 @@
 
 #include <bsp.h>
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <rtems/score/heapimpl.h>
 
 #include <tmacros.h>
diff --git a/testsuites/sptests/sptimecounter02/init.c b/testsuites/sptests/sptimecounter02/init.c
index fafbaf8af1..ffa53edfd8 100644
--- a/testsuites/sptests/sptimecounter02/init.c
+++ b/testsuites/sptests/sptimecounter02/init.c
@@ -30,7 +30,7 @@
 
 #include <rtems.h>
 #include <rtems/counter.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #include <rtems/score/timecounterimpl.h>
 #include <rtems/timecounter.h>
diff --git a/testsuites/sptests/sptimecounter03/init.c b/testsuites/sptests/sptimecounter03/init.c
index 4ef084d3d2..dd4c100b64 100644
--- a/testsuites/sptests/sptimecounter03/init.c
+++ b/testsuites/sptests/sptimecounter03/init.c
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #include <rtems/bsd.h>
 
diff --git a/testsuites/sptests/sptimecounter04/init.c b/testsuites/sptests/sptimecounter04/init.c
index 42c31277b9..a0645a0895 100644
--- a/testsuites/sptests/sptimecounter04/init.c
+++ b/testsuites/sptests/sptimecounter04/init.c
@@ -18,7 +18,7 @@
 
 #include <time.h>
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <rtems/timespec.h>
 
 #include "tmacros.h"
diff --git a/testsuites/support/include/buffer_test_io.h b/testsuites/support/include/buffer_test_io.h
index ea68fea0d8..f0eae50fbd 100644
--- a/testsuites/support/include/buffer_test_io.h
+++ b/testsuites/support/include/buffer_test_io.h
@@ -5,7 +5,7 @@
 #ifndef __BUFFER_TEST_IO_h
 #define __BUFFER_TEST_IO_h
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index 2c885c6ecc..fe17bc01e7 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <rtems/error.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <rtems/score/threaddispatch.h>
 
 #include <buffer_test_io.h>
diff --git a/testsuites/tmtests/tmfine01/init.c b/testsuites/tmtests/tmfine01/init.c
index bf24ca138f..d62278cb07 100644
--- a/testsuites/tmtests/tmfine01/init.c
+++ b/testsuites/tmtests/tmfine01/init.c
@@ -24,7 +24,7 @@
 #include <sched.h>
 #include <stdio.h>
 
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 
 const char rtems_test_name[] = "TMFINE 1";
 
diff --git a/testsuites/tmtests/tmonetoone/init.c b/testsuites/tmtests/tmonetoone/init.c
index b721a8c531..70f3f51eb2 100644
--- a/testsuites/tmtests/tmonetoone/init.c
+++ b/testsuites/tmtests/tmonetoone/init.c
@@ -19,7 +19,7 @@
 #include <sched.h>
 
 #include <rtems.h>
-#include <rtems/test.h>
+#include <rtems/test-info.h>
 #include <rtems/thread.h>
 
 #include <tmacros.h>