testsuites/ada: Introduce init.c files

Provide an init.c for each Ada test instead of the #include <config.h>
magic which works only due to hand crafted include paths.

Update #3818.

58 files changed, 58 insertions, 58 deletions

diff --git a/testsuites/ada/tmtests/tm01/Makefile.am b/testsuites/ada/tmtests/tm01/Makefile.am
index 249b65d1a9..1d854caf12 100644
--- a/testsuites/ada/tmtests/tm01/Makefile.am
+++ b/testsuites/ada/tmtests/tm01/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm01
 ada_tm01_SOURCES = tm01.adb config.h tmtest.adb tmtest.ads
-ada_tm01_SOURCES += ../../support/init.c
+ada_tm01_SOURCES += init.c
 
 ada_tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm01/config.h b/testsuites/ada/tmtests/tm01/init.c
index b2a057674a..8f2fb49790 100644
--- a/testsuites/ada/tmtests/tm01/config.h
+++ b/testsuites/ada/tmtests/tm01/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm02/Makefile.am b/testsuites/ada/tmtests/tm02/Makefile.am
index 3d4f79ff13..fe3f609399 100644
--- a/testsuites/ada/tmtests/tm02/Makefile.am
+++ b/testsuites/ada/tmtests/tm02/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm02
 ada_tm02_SOURCES = tm02.adb config.h tmtest.adb tmtest.ads
-ada_tm02_SOURCES += ../../support/init.c
+ada_tm02_SOURCES += init.c
 
 ada_tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm02/config.h b/testsuites/ada/tmtests/tm02/init.c
index 18a1ad722a..d8123f0452 100644
--- a/testsuites/ada/tmtests/tm02/config.h
+++ b/testsuites/ada/tmtests/tm02/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm03/Makefile.am b/testsuites/ada/tmtests/tm03/Makefile.am
index 75032a2a9e..89eb8d02f5 100644
--- a/testsuites/ada/tmtests/tm03/Makefile.am
+++ b/testsuites/ada/tmtests/tm03/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm03
 ada_tm03_SOURCES = tm03.adb config.h tmtest.adb tmtest.ads
-ada_tm03_SOURCES += ../../support/init.c
+ada_tm03_SOURCES += init.c
 
 ada_tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm03/config.h b/testsuites/ada/tmtests/tm03/init.c
index 61daeb963e..439c8ca168 100644
--- a/testsuites/ada/tmtests/tm03/config.h
+++ b/testsuites/ada/tmtests/tm03/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm04/Makefile.am b/testsuites/ada/tmtests/tm04/Makefile.am
index da74604bdd..1120d2b0b3 100644
--- a/testsuites/ada/tmtests/tm04/Makefile.am
+++ b/testsuites/ada/tmtests/tm04/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm04
 ada_tm04_SOURCES = tm04.adb config.h tmtest.adb tmtest.ads
-ada_tm04_SOURCES += ../../support/init.c
+ada_tm04_SOURCES += init.c
 
 ada_tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm04/config.h b/testsuites/ada/tmtests/tm04/init.c
index 42f8aeeef0..2cf05da2e1 100644
--- a/testsuites/ada/tmtests/tm04/config.h
+++ b/testsuites/ada/tmtests/tm04/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm05/Makefile.am b/testsuites/ada/tmtests/tm05/Makefile.am
index 99829f37e9..ce88c76a36 100644
--- a/testsuites/ada/tmtests/tm05/Makefile.am
+++ b/testsuites/ada/tmtests/tm05/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm05
 ada_tm05_SOURCES = tm05.adb config.h tmtest.adb tmtest.ads
-ada_tm05_SOURCES += ../../support/init.c
+ada_tm05_SOURCES += init.c
 
 ada_tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm05/config.h b/testsuites/ada/tmtests/tm05/init.c
index 7b56b81b99..7fb0f854ee 100644
--- a/testsuites/ada/tmtests/tm05/config.h
+++ b/testsuites/ada/tmtests/tm05/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm06/Makefile.am b/testsuites/ada/tmtests/tm06/Makefile.am
index 5dea7d44cc..de26a58bcf 100644
--- a/testsuites/ada/tmtests/tm06/Makefile.am
+++ b/testsuites/ada/tmtests/tm06/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm06
 ada_tm06_SOURCES = tm06.adb config.h tmtest.adb tmtest.ads
-ada_tm06_SOURCES += ../../support/init.c
+ada_tm06_SOURCES += init.c
 
 ada_tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm06/config.h b/testsuites/ada/tmtests/tm06/init.c
index c8ae6d5751..88f27f6b2f 100644
--- a/testsuites/ada/tmtests/tm06/config.h
+++ b/testsuites/ada/tmtests/tm06/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm07/Makefile.am b/testsuites/ada/tmtests/tm07/Makefile.am
index 25074547a7..de21b0029d 100644
--- a/testsuites/ada/tmtests/tm07/Makefile.am
+++ b/testsuites/ada/tmtests/tm07/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm07
 ada_tm07_SOURCES = tm07.adb config.h tmtest.adb tmtest.ads
-ada_tm07_SOURCES += ../../support/init.c
+ada_tm07_SOURCES += init.c
 
 ada_tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm07/config.h b/testsuites/ada/tmtests/tm07/init.c
index f6ca20e61f..dcbf73a3ae 100644
--- a/testsuites/ada/tmtests/tm07/config.h
+++ b/testsuites/ada/tmtests/tm07/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm08/Makefile.am b/testsuites/ada/tmtests/tm08/Makefile.am
index 0e21c0d7ac..77dc7e173e 100644
--- a/testsuites/ada/tmtests/tm08/Makefile.am
+++ b/testsuites/ada/tmtests/tm08/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm08
 ada_tm08_SOURCES = tm08.adb config.h tmtest.adb tmtest.ads
-ada_tm08_SOURCES += ../../support/init.c
+ada_tm08_SOURCES += init.c
 
 ada_tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm08/config.h b/testsuites/ada/tmtests/tm08/init.c
index 1c6324f773..ded1a2e130 100644
--- a/testsuites/ada/tmtests/tm08/config.h
+++ b/testsuites/ada/tmtests/tm08/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm09/Makefile.am b/testsuites/ada/tmtests/tm09/Makefile.am
index c18e062364..d5c0df35a1 100644
--- a/testsuites/ada/tmtests/tm09/Makefile.am
+++ b/testsuites/ada/tmtests/tm09/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm09
 ada_tm09_SOURCES = tm09.adb config.h tmtest.adb tmtest.ads
-ada_tm09_SOURCES += ../../support/init.c
+ada_tm09_SOURCES += init.c
 
 ada_tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm09/config.h b/testsuites/ada/tmtests/tm09/init.c
index c14f17c385..0db14c4815 100644
--- a/testsuites/ada/tmtests/tm09/config.h
+++ b/testsuites/ada/tmtests/tm09/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm10/Makefile.am b/testsuites/ada/tmtests/tm10/Makefile.am
index aa9b23f750..6ea9e2579c 100644
--- a/testsuites/ada/tmtests/tm10/Makefile.am
+++ b/testsuites/ada/tmtests/tm10/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm10
 ada_tm10_SOURCES = tm10.adb config.h tmtest.adb tmtest.ads
-ada_tm10_SOURCES += ../../support/init.c
+ada_tm10_SOURCES += init.c
 
 ada_tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm10/config.h b/testsuites/ada/tmtests/tm10/init.c
index fd96463749..3c3c5261b5 100644
--- a/testsuites/ada/tmtests/tm10/config.h
+++ b/testsuites/ada/tmtests/tm10/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm11/Makefile.am b/testsuites/ada/tmtests/tm11/Makefile.am
index 57f30eb50a..6133b357be 100644
--- a/testsuites/ada/tmtests/tm11/Makefile.am
+++ b/testsuites/ada/tmtests/tm11/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm11
 ada_tm11_SOURCES = tm11.adb config.h tmtest.adb tmtest.ads
-ada_tm11_SOURCES += ../../support/init.c
+ada_tm11_SOURCES += init.c
 
 ada_tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm11/config.h b/testsuites/ada/tmtests/tm11/init.c
index e4ed6d1c83..93f4e1d1e4 100644
--- a/testsuites/ada/tmtests/tm11/config.h
+++ b/testsuites/ada/tmtests/tm11/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm12/Makefile.am b/testsuites/ada/tmtests/tm12/Makefile.am
index a1b8205bad..3314b07915 100644
--- a/testsuites/ada/tmtests/tm12/Makefile.am
+++ b/testsuites/ada/tmtests/tm12/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm12
 ada_tm12_SOURCES = tm12.adb config.h tmtest.adb tmtest.ads
-ada_tm12_SOURCES += ../../support/init.c
+ada_tm12_SOURCES += init.c
 
 ada_tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm12/config.h b/testsuites/ada/tmtests/tm12/init.c
index 1d9df47b78..421e44fab3 100644
--- a/testsuites/ada/tmtests/tm12/config.h
+++ b/testsuites/ada/tmtests/tm12/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm13/Makefile.am b/testsuites/ada/tmtests/tm13/Makefile.am
index 8a0a8d9fb4..1aed6def5c 100644
--- a/testsuites/ada/tmtests/tm13/Makefile.am
+++ b/testsuites/ada/tmtests/tm13/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm13
 ada_tm13_SOURCES = tm13.adb config.h tmtest.adb tmtest.ads
-ada_tm13_SOURCES += ../../support/init.c
+ada_tm13_SOURCES += init.c
 
 ada_tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm13/config.h b/testsuites/ada/tmtests/tm13/init.c
index b05713dd8d..ecf18b29ab 100644
--- a/testsuites/ada/tmtests/tm13/config.h
+++ b/testsuites/ada/tmtests/tm13/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm14/Makefile.am b/testsuites/ada/tmtests/tm14/Makefile.am
index d2cde84616..d1be5e7a21 100644
--- a/testsuites/ada/tmtests/tm14/Makefile.am
+++ b/testsuites/ada/tmtests/tm14/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm14
 ada_tm14_SOURCES = tm14.adb config.h tmtest.adb tmtest.ads
-ada_tm14_SOURCES += ../../support/init.c
+ada_tm14_SOURCES += init.c
 
 ada_tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm14/config.h b/testsuites/ada/tmtests/tm14/init.c
index ee8a005be0..3555139575 100644
--- a/testsuites/ada/tmtests/tm14/config.h
+++ b/testsuites/ada/tmtests/tm14/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm15/Makefile.am b/testsuites/ada/tmtests/tm15/Makefile.am
index 9f94ba797a..258d178f7f 100644
--- a/testsuites/ada/tmtests/tm15/Makefile.am
+++ b/testsuites/ada/tmtests/tm15/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm15
 ada_tm15_SOURCES = tm15.adb config.h tmtest.adb tmtest.ads
-ada_tm15_SOURCES += ../../support/init.c
+ada_tm15_SOURCES += init.c
 
 ada_tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm15/config.h b/testsuites/ada/tmtests/tm15/init.c
index 1753ca083c..c1b831d4bf 100644
--- a/testsuites/ada/tmtests/tm15/config.h
+++ b/testsuites/ada/tmtests/tm15/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm16/Makefile.am b/testsuites/ada/tmtests/tm16/Makefile.am
index 8b7595b2e5..3fd0aa53c8 100644
--- a/testsuites/ada/tmtests/tm16/Makefile.am
+++ b/testsuites/ada/tmtests/tm16/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm16
 ada_tm16_SOURCES = tm16.adb config.h tmtest.adb tmtest.ads
-ada_tm16_SOURCES += ../../support/init.c
+ada_tm16_SOURCES += init.c
 
 ada_tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm16/config.h b/testsuites/ada/tmtests/tm16/init.c
index 324be4e677..64e613fbd8 100644
--- a/testsuites/ada/tmtests/tm16/config.h
+++ b/testsuites/ada/tmtests/tm16/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm17/Makefile.am b/testsuites/ada/tmtests/tm17/Makefile.am
index 2e74d1118d..52c73aa5d7 100644
--- a/testsuites/ada/tmtests/tm17/Makefile.am
+++ b/testsuites/ada/tmtests/tm17/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm17
 ada_tm17_SOURCES = tm17.adb config.h tmtest.adb tmtest.ads
-ada_tm17_SOURCES += ../../support/init.c
+ada_tm17_SOURCES += init.c
 
 ada_tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm17/config.h b/testsuites/ada/tmtests/tm17/init.c
index 9eb0d0f1a6..a4115412e3 100644
--- a/testsuites/ada/tmtests/tm17/config.h
+++ b/testsuites/ada/tmtests/tm17/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm18/Makefile.am b/testsuites/ada/tmtests/tm18/Makefile.am
index a61ec0e3cb..c583bb1b56 100644
--- a/testsuites/ada/tmtests/tm18/Makefile.am
+++ b/testsuites/ada/tmtests/tm18/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm18
 ada_tm18_SOURCES = tm18.adb config.h tmtest.adb tmtest.ads
-ada_tm18_SOURCES += ../../support/init.c
+ada_tm18_SOURCES += init.c
 
 ada_tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm18/config.h b/testsuites/ada/tmtests/tm18/init.c
index cebc0653d9..b9f602170f 100644
--- a/testsuites/ada/tmtests/tm18/config.h
+++ b/testsuites/ada/tmtests/tm18/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm19/Makefile.am b/testsuites/ada/tmtests/tm19/Makefile.am
index f594559539..ce882a628b 100644
--- a/testsuites/ada/tmtests/tm19/Makefile.am
+++ b/testsuites/ada/tmtests/tm19/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm19
 ada_tm19_SOURCES = tm19.adb config.h tmtest.adb tmtest.ads
-ada_tm19_SOURCES += ../../support/init.c
+ada_tm19_SOURCES += init.c
 
 ada_tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm19/config.h b/testsuites/ada/tmtests/tm19/init.c
index b41632e8a2..5dda49aaee 100644
--- a/testsuites/ada/tmtests/tm19/config.h
+++ b/testsuites/ada/tmtests/tm19/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm20/Makefile.am b/testsuites/ada/tmtests/tm20/Makefile.am
index 71b7798d40..508010465e 100644
--- a/testsuites/ada/tmtests/tm20/Makefile.am
+++ b/testsuites/ada/tmtests/tm20/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm20
 ada_tm20_SOURCES = tm20.adb config.h tmtest.adb tmtest.ads
-ada_tm20_SOURCES += ../../support/init.c
+ada_tm20_SOURCES += init.c
 
 ada_tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm20/config.h b/testsuites/ada/tmtests/tm20/init.c
index 2085f4ea0b..6c5481debb 100644
--- a/testsuites/ada/tmtests/tm20/config.h
+++ b/testsuites/ada/tmtests/tm20/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm21/Makefile.am b/testsuites/ada/tmtests/tm21/Makefile.am
index 92fb9b3250..7910db02e4 100644
--- a/testsuites/ada/tmtests/tm21/Makefile.am
+++ b/testsuites/ada/tmtests/tm21/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm21
 ada_tm21_SOURCES = tm21.adb config.h tmtest.adb tmtest.ads
-ada_tm21_SOURCES += ../../support/init.c
+ada_tm21_SOURCES += init.c
 
 ada_tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm21/config.h b/testsuites/ada/tmtests/tm21/init.c
index 1398cd6a86..a3646f313b 100644
--- a/testsuites/ada/tmtests/tm21/config.h
+++ b/testsuites/ada/tmtests/tm21/init.c
@@ -35,6 +35,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm22/Makefile.am b/testsuites/ada/tmtests/tm22/Makefile.am
index b40061c52e..d042545351 100644
--- a/testsuites/ada/tmtests/tm22/Makefile.am
+++ b/testsuites/ada/tmtests/tm22/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm22
 ada_tm22_SOURCES = tm22.adb config.h tmtest.adb tmtest.ads
-ada_tm22_SOURCES += ../../support/init.c
+ada_tm22_SOURCES += init.c
 
 ada_tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm22/config.h b/testsuites/ada/tmtests/tm22/init.c
index 7da538839e..368119d9a3 100644
--- a/testsuites/ada/tmtests/tm22/config.h
+++ b/testsuites/ada/tmtests/tm22/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm23/Makefile.am b/testsuites/ada/tmtests/tm23/Makefile.am
index ab12b04e3c..25414705bd 100644
--- a/testsuites/ada/tmtests/tm23/Makefile.am
+++ b/testsuites/ada/tmtests/tm23/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm23
 ada_tm23_SOURCES = tm23.adb config.h tmtest.adb tmtest.ads
-ada_tm23_SOURCES += ../../support/init.c
+ada_tm23_SOURCES += init.c
 
 ada_tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm23/config.h b/testsuites/ada/tmtests/tm23/init.c
index 98fcf60487..9ad2f691a0 100644
--- a/testsuites/ada/tmtests/tm23/config.h
+++ b/testsuites/ada/tmtests/tm23/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm24/Makefile.am b/testsuites/ada/tmtests/tm24/Makefile.am
index da6caa8738..1130cbc88a 100644
--- a/testsuites/ada/tmtests/tm24/Makefile.am
+++ b/testsuites/ada/tmtests/tm24/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm24
 ada_tm24_SOURCES = tm24.adb config.h tmtest.adb tmtest.ads
-ada_tm24_SOURCES += ../../support/init.c
+ada_tm24_SOURCES += init.c
 
 ada_tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm24/config.h b/testsuites/ada/tmtests/tm24/init.c
index 207ac7eed3..da98a9ddbd 100644
--- a/testsuites/ada/tmtests/tm24/config.h
+++ b/testsuites/ada/tmtests/tm24/init.c
@@ -28,6 +28,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm25/Makefile.am b/testsuites/ada/tmtests/tm25/Makefile.am
index 77f2286d83..dfdc3994a5 100644
--- a/testsuites/ada/tmtests/tm25/Makefile.am
+++ b/testsuites/ada/tmtests/tm25/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm25
 ada_tm25_SOURCES = tm25.adb config.h tmtest.adb tmtest.ads
-ada_tm25_SOURCES += ../../support/init.c
+ada_tm25_SOURCES += init.c
 
 ada_tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm25/config.h b/testsuites/ada/tmtests/tm25/init.c
index 79b6724665..ddbde343b0 100644
--- a/testsuites/ada/tmtests/tm25/config.h
+++ b/testsuites/ada/tmtests/tm25/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm28/Makefile.am b/testsuites/ada/tmtests/tm28/Makefile.am
index a18cc5498b..5f951d8a40 100644
--- a/testsuites/ada/tmtests/tm28/Makefile.am
+++ b/testsuites/ada/tmtests/tm28/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm28
 ada_tm28_SOURCES = tm28.adb config.h tmtest.adb tmtest.ads
-ada_tm28_SOURCES += ../../support/init.c
+ada_tm28_SOURCES += init.c
 
 ada_tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm28/config.h b/testsuites/ada/tmtests/tm28/init.c
index aca19475c3..4451f86000 100644
--- a/testsuites/ada/tmtests/tm28/config.h
+++ b/testsuites/ada/tmtests/tm28/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm29/Makefile.am b/testsuites/ada/tmtests/tm29/Makefile.am
index 3b9c540335..6f4377d6bf 100644
--- a/testsuites/ada/tmtests/tm29/Makefile.am
+++ b/testsuites/ada/tmtests/tm29/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm29
 ada_tm29_SOURCES = tm29.adb config.h tmtest.adb tmtest.ads
-ada_tm29_SOURCES += ../../support/init.c
+ada_tm29_SOURCES += init.c
 
 ada_tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm29/config.h b/testsuites/ada/tmtests/tm29/init.c
index fd99933160..6789a328bc 100644
--- a/testsuites/ada/tmtests/tm29/config.h
+++ b/testsuites/ada/tmtests/tm29/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tmck/Makefile.am b/testsuites/ada/tmtests/tmck/Makefile.am
index 0c4ccd9f95..9a74923c3b 100644
--- a/testsuites/ada/tmtests/tmck/Makefile.am
+++ b/testsuites/ada/tmtests/tmck/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tmck
 ada_tmck_SOURCES = tmck.adb config.h tmtest.adb tmtest.ads
-ada_tmck_SOURCES += ../../support/init.c
+ada_tmck_SOURCES += init.c
 
 ada_tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tmck/config.h b/testsuites/ada/tmtests/tmck/init.c
index 40b56220a9..0bce9d48f3 100644
--- a/testsuites/ada/tmtests/tmck/config.h
+++ b/testsuites/ada/tmtests/tmck/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tmoverhd/Makefile.am b/testsuites/ada/tmtests/tmoverhd/Makefile.am
index e12637fc51..75e9719426 100644
--- a/testsuites/ada/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/ada/tmtests/tmoverhd/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/ada.am
 noinst_PROGRAMS = ada_tmoverhd
 ada_tmoverhd_SOURCES = tmoverhd.adb config.h tmtest.adb tmtest.ads \
     dummy_rtems.adb dummy_rtems.ads
-ada_tmoverhd_SOURCES += ../../support/init.c
+ada_tmoverhd_SOURCES += init.c
 
 ada_tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tmoverhd/config.h b/testsuites/ada/tmtests/tmoverhd/init.c
index df551c90fe..37b6c28faa 100644
--- a/testsuites/ada/tmtests/tmoverhd/config.h
+++ b/testsuites/ada/tmtests/tmoverhd/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */