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.

65 files changed, 39 insertions, 39 deletions

diff --git a/testsuites/ada/mptests/mp01/config_base.h b/testsuites/ada/mptests/mp01/config_base.h
index fca97d644d..8f4dda95b9 100644
--- a/testsuites/ada/mptests/mp01/config_base.h
+++ b/testsuites/ada/mptests/mp01/config_base.h
@@ -25,6 +25,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/mptests/mp01/node1/Makefile.am b/testsuites/ada/mptests/mp01/node1/Makefile.am
index 7d78a6f9a2..45b7f4b303 100644
--- a/testsuites/ada/mptests/mp01/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp01_ada_mp01_node1
 mp01_ada_mp01_node1_SOURCES = mp01_node1.adb ../mptest.adb config.h
 mp01_ada_mp01_node1_SOURCES += ../mptest.ads
-mp01_ada_mp01_node1_SOURCES += ../../../support/init.c
+mp01_ada_mp01_node1_SOURCES += init.c
 
 mp01_ada_mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp01/node1/config.h b/testsuites/ada/mptests/mp01/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp01/node1/config.h
+++ b/testsuites/ada/mptests/mp01/node1/init.c
diff --git a/testsuites/ada/mptests/mp01/node2/Makefile.am b/testsuites/ada/mptests/mp01/node2/Makefile.am
index 907766ed9b..ee654411fb 100644
--- a/testsuites/ada/mptests/mp01/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp01_ada_mp01_node2
 mp01_ada_mp01_node2_SOURCES = mp01_node2.adb ../mptest.adb config.h
 mp01_ada_mp01_node2_SOURCES += ../mptest.ads
-mp01_ada_mp01_node2_SOURCES += ../../../support/init.c
+mp01_ada_mp01_node2_SOURCES += init.c
 
 mp01_ada_mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp01/node2/config.h b/testsuites/ada/mptests/mp01/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp01/node2/config.h
+++ b/testsuites/ada/mptests/mp01/node2/init.c
diff --git a/testsuites/ada/mptests/mp03/config_base.h b/testsuites/ada/mptests/mp03/config_base.h
index 9a1c49ebaf..ab111cb4d1 100644
--- a/testsuites/ada/mptests/mp03/config_base.h
+++ b/testsuites/ada/mptests/mp03/config_base.h
@@ -25,6 +25,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/mptests/mp03/node1/Makefile.am b/testsuites/ada/mptests/mp03/node1/Makefile.am
index 679d7a9b9d..4a59642e55 100644
--- a/testsuites/ada/mptests/mp03/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp03_ada_mp03_node1
 mp03_ada_mp03_node1_SOURCES = mp03_node1.adb ../mptest.adb config.h
 mp03_ada_mp03_node1_SOURCES += ../mptest.ads
-mp03_ada_mp03_node1_SOURCES += ../../../support/init.c
+mp03_ada_mp03_node1_SOURCES += init.c
 
 mp03_ada_mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp03/node1/config.h b/testsuites/ada/mptests/mp03/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp03/node1/config.h
+++ b/testsuites/ada/mptests/mp03/node1/init.c
diff --git a/testsuites/ada/mptests/mp03/node2/Makefile.am b/testsuites/ada/mptests/mp03/node2/Makefile.am
index 80db1c1c05..7ed6700a83 100644
--- a/testsuites/ada/mptests/mp03/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp03_ada_mp03_node2
 mp03_ada_mp03_node2_SOURCES = mp03_node2.adb ../mptest.adb config.h
 mp03_ada_mp03_node2_SOURCES += ../mptest.ads
-mp03_ada_mp03_node2_SOURCES += ../../../support/init.c
+mp03_ada_mp03_node2_SOURCES += init.c
 
 mp03_ada_mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp03/node2/config.h b/testsuites/ada/mptests/mp03/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp03/node2/config.h
+++ b/testsuites/ada/mptests/mp03/node2/init.c
diff --git a/testsuites/ada/mptests/mp04/config_base.h b/testsuites/ada/mptests/mp04/config_base.h
index 71aca5305a..ab270747aa 100644
--- a/testsuites/ada/mptests/mp04/config_base.h
+++ b/testsuites/ada/mptests/mp04/config_base.h
@@ -25,6 +25,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/mptests/mp04/node1/Makefile.am b/testsuites/ada/mptests/mp04/node1/Makefile.am
index 496ff62f96..98c7e19145 100644
--- a/testsuites/ada/mptests/mp04/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp04_ada_mp04_node1
 mp04_ada_mp04_node1_SOURCES = mp04_node1.adb ../mptest.adb config.h
 mp04_ada_mp04_node1_SOURCES += ../mptest.ads
-mp04_ada_mp04_node1_SOURCES += ../../../support/init.c
+mp04_ada_mp04_node1_SOURCES += init.c
 
 mp04_ada_mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp04/node1/config.h b/testsuites/ada/mptests/mp04/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp04/node1/config.h
+++ b/testsuites/ada/mptests/mp04/node1/init.c
diff --git a/testsuites/ada/mptests/mp04/node2/Makefile.am b/testsuites/ada/mptests/mp04/node2/Makefile.am
index a2192b11b5..e8cdb3ea8c 100644
--- a/testsuites/ada/mptests/mp04/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp04_ada_mp04_node2
 mp04_ada_mp04_node2_SOURCES = mp04_node2.adb ../mptest.adb config.h
 mp04_ada_mp04_node2_SOURCES += ../mptest.ads
-mp04_ada_mp04_node2_SOURCES += ../../../support/init.c
+mp04_ada_mp04_node2_SOURCES += init.c
 
 mp04_ada_mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp04/node2/config.h b/testsuites/ada/mptests/mp04/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp04/node2/config.h
+++ b/testsuites/ada/mptests/mp04/node2/init.c
diff --git a/testsuites/ada/mptests/mp05/config_base.h b/testsuites/ada/mptests/mp05/config_base.h
index 2728ab2889..1123c5c63c 100644
--- a/testsuites/ada/mptests/mp05/config_base.h
+++ b/testsuites/ada/mptests/mp05/config_base.h
@@ -25,6 +25,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/mptests/mp05/node1/Makefile.am b/testsuites/ada/mptests/mp05/node1/Makefile.am
index edae16e1ab..351bad9ec3 100644
--- a/testsuites/ada/mptests/mp05/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp05_ada_mp05_node1
 mp05_ada_mp05_node1_SOURCES = mp05_node1.adb ../mptest.adb config.h
 mp05_ada_mp05_node1_SOURCES += ../mptest.ads
-mp05_ada_mp05_node1_SOURCES += ../../../support/init.c
+mp05_ada_mp05_node1_SOURCES += init.c
 
 mp05_ada_mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp05/node1/config.h b/testsuites/ada/mptests/mp05/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp05/node1/config.h
+++ b/testsuites/ada/mptests/mp05/node1/init.c
diff --git a/testsuites/ada/mptests/mp05/node2/Makefile.am b/testsuites/ada/mptests/mp05/node2/Makefile.am
index 06aa7e9812..ca623887e3 100644
--- a/testsuites/ada/mptests/mp05/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp05_ada_mp05_node2
 mp05_ada_mp05_node2_SOURCES = mp05_node2.adb ../mptest.adb config.h
 mp05_ada_mp05_node2_SOURCES += ../mptest.ads
-mp05_ada_mp05_node2_SOURCES += ../../../support/init.c
+mp05_ada_mp05_node2_SOURCES += init.c
 
 mp05_ada_mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp05/node2/config.h b/testsuites/ada/mptests/mp05/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp05/node2/config.h
+++ b/testsuites/ada/mptests/mp05/node2/init.c
diff --git a/testsuites/ada/mptests/mp06/config_base.h b/testsuites/ada/mptests/mp06/config_base.h
index f3e3972e79..a0259d0a4f 100644
--- a/testsuites/ada/mptests/mp06/config_base.h
+++ b/testsuites/ada/mptests/mp06/config_base.h
@@ -25,6 +25,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/mptests/mp06/node1/Makefile.am b/testsuites/ada/mptests/mp06/node1/Makefile.am
index 201d17ced5..68771e130c 100644
--- a/testsuites/ada/mptests/mp06/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp06_ada_mp06_node1
 mp06_ada_mp06_node1_SOURCES = mp06_node1.adb ../mptest.adb config.h
 mp06_ada_mp06_node1_SOURCES += ../mptest.ads
-mp06_ada_mp06_node1_SOURCES += ../../../support/init.c
+mp06_ada_mp06_node1_SOURCES += init.c
 
 mp06_ada_mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp06/node1/config.h b/testsuites/ada/mptests/mp06/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp06/node1/config.h
+++ b/testsuites/ada/mptests/mp06/node1/init.c
diff --git a/testsuites/ada/mptests/mp06/node2/Makefile.am b/testsuites/ada/mptests/mp06/node2/Makefile.am
index 3df636d170..8e5d4bd553 100644
--- a/testsuites/ada/mptests/mp06/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp06_ada_mp06_node2
 mp06_ada_mp06_node2_SOURCES = mp06_node2.adb ../mptest.adb config.h
 mp06_ada_mp06_node2_SOURCES += ../mptest.ads
-mp06_ada_mp06_node2_SOURCES += ../../../support/init.c
+mp06_ada_mp06_node2_SOURCES += init.c
 
 mp06_ada_mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp06/node2/config.h b/testsuites/ada/mptests/mp06/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp06/node2/config.h
+++ b/testsuites/ada/mptests/mp06/node2/init.c
diff --git a/testsuites/ada/mptests/mp07/config_base.h b/testsuites/ada/mptests/mp07/config_base.h
index 7df48cd193..51fd613ffe 100644
--- a/testsuites/ada/mptests/mp07/config_base.h
+++ b/testsuites/ada/mptests/mp07/config_base.h
@@ -25,6 +25,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/mptests/mp07/node1/Makefile.am b/testsuites/ada/mptests/mp07/node1/Makefile.am
index d39a38d786..81bdb18de8 100644
--- a/testsuites/ada/mptests/mp07/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp07_ada_mp07_node1
 mp07_ada_mp07_node1_SOURCES = mp07_node1.adb ../mptest.adb config.h
 mp07_ada_mp07_node1_SOURCES += ../mptest.ads
-mp07_ada_mp07_node1_SOURCES += ../../../support/init.c
+mp07_ada_mp07_node1_SOURCES += init.c
 
 mp07_ada_mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp07/node1/config.h b/testsuites/ada/mptests/mp07/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp07/node1/config.h
+++ b/testsuites/ada/mptests/mp07/node1/init.c
diff --git a/testsuites/ada/mptests/mp07/node2/Makefile.am b/testsuites/ada/mptests/mp07/node2/Makefile.am
index acf5e4ac34..4ec3988c2d 100644
--- a/testsuites/ada/mptests/mp07/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp07_ada_mp07_node2
 mp07_ada_mp07_node2_SOURCES = mp07_node2.adb ../mptest.adb config.h
 mp07_ada_mp07_node2_SOURCES += ../mptest.ads
-mp07_ada_mp07_node2_SOURCES += ../../../support/init.c
+mp07_ada_mp07_node2_SOURCES += init.c
 
 mp07_ada_mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp07/node2/config.h b/testsuites/ada/mptests/mp07/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp07/node2/config.h
+++ b/testsuites/ada/mptests/mp07/node2/init.c
diff --git a/testsuites/ada/mptests/mp08/config_base.h b/testsuites/ada/mptests/mp08/config_base.h
index 74367e7406..f524a4c8d7 100644
--- a/testsuites/ada/mptests/mp08/config_base.h
+++ b/testsuites/ada/mptests/mp08/config_base.h
@@ -25,6 +25,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/mptests/mp08/node1/Makefile.am b/testsuites/ada/mptests/mp08/node1/Makefile.am
index 2885adbdb7..7ac4d2f394 100644
--- a/testsuites/ada/mptests/mp08/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp08_ada_mp08_node1
 mp08_ada_mp08_node1_SOURCES = mp08_node1.adb ../mptest.adb config.h
 mp08_ada_mp08_node1_SOURCES += ../mptest.ads
-mp08_ada_mp08_node1_SOURCES += ../../../support/init.c
+mp08_ada_mp08_node1_SOURCES += init.c
 
 mp08_ada_mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp08/node1/config.h b/testsuites/ada/mptests/mp08/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp08/node1/config.h
+++ b/testsuites/ada/mptests/mp08/node1/init.c
diff --git a/testsuites/ada/mptests/mp08/node2/Makefile.am b/testsuites/ada/mptests/mp08/node2/Makefile.am
index 4f174acea1..6f808f1bb8 100644
--- a/testsuites/ada/mptests/mp08/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp08_ada_mp08_node2
 mp08_ada_mp08_node2_SOURCES = mp08_node2.adb ../mptest.adb config.h
 mp08_ada_mp08_node2_SOURCES += ../mptest.ads
-mp08_ada_mp08_node2_SOURCES += ../../../support/init.c
+mp08_ada_mp08_node2_SOURCES += init.c
 
 mp08_ada_mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp08/node2/config.h b/testsuites/ada/mptests/mp08/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp08/node2/config.h
+++ b/testsuites/ada/mptests/mp08/node2/init.c
diff --git a/testsuites/ada/mptests/mp09/config_base.h b/testsuites/ada/mptests/mp09/config_base.h
index 8145297471..f84b739f14 100644
--- a/testsuites/ada/mptests/mp09/config_base.h
+++ b/testsuites/ada/mptests/mp09/config_base.h
@@ -25,6 +25,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/mptests/mp09/node1/Makefile.am b/testsuites/ada/mptests/mp09/node1/Makefile.am
index 6847835207..6e41e40c83 100644
--- a/testsuites/ada/mptests/mp09/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp09_ada_mp09_node1
 mp09_ada_mp09_node1_SOURCES = mp09_node1.adb ../mptest.adb config.h
 mp09_ada_mp09_node1_SOURCES += ../mptest.ads
-mp09_ada_mp09_node1_SOURCES += ../../../support/init.c
+mp09_ada_mp09_node1_SOURCES += init.c
 
 mp09_ada_mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp09/node1/config.h b/testsuites/ada/mptests/mp09/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp09/node1/config.h
+++ b/testsuites/ada/mptests/mp09/node1/init.c
diff --git a/testsuites/ada/mptests/mp09/node2/Makefile.am b/testsuites/ada/mptests/mp09/node2/Makefile.am
index 61fd3f3d20..d8e748d24e 100644
--- a/testsuites/ada/mptests/mp09/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp09_ada_mp09_node2
 mp09_ada_mp09_node2_SOURCES = mp09_node2.adb ../mptest.adb config.h
 mp09_ada_mp09_node2_SOURCES += ../mptest.ads
-mp09_ada_mp09_node2_SOURCES += ../../../support/init.c
+mp09_ada_mp09_node2_SOURCES += init.c
 
 mp09_ada_mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp09/node2/config.h b/testsuites/ada/mptests/mp09/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp09/node2/config.h
+++ b/testsuites/ada/mptests/mp09/node2/init.c
diff --git a/testsuites/ada/mptests/mp10/config_base.h b/testsuites/ada/mptests/mp10/config_base.h
index 72f5c759ba..6bf24a6f8f 100644
--- a/testsuites/ada/mptests/mp10/config_base.h
+++ b/testsuites/ada/mptests/mp10/config_base.h
@@ -25,6 +25,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/mptests/mp10/node1/Makefile.am b/testsuites/ada/mptests/mp10/node1/Makefile.am
index 029c77e2a5..93cba93762 100644
--- a/testsuites/ada/mptests/mp10/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp10_ada_mp10_node1
 mp10_ada_mp10_node1_SOURCES = mp10_node1.adb ../mptest.adb config.h 
 mp10_ada_mp10_node1_SOURCES += ../mptest.ads
-mp10_ada_mp10_node1_SOURCES += ../../../support/init.c
+mp10_ada_mp10_node1_SOURCES += init.c
 
 mp10_ada_mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp10/node1/config.h b/testsuites/ada/mptests/mp10/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp10/node1/config.h
+++ b/testsuites/ada/mptests/mp10/node1/init.c
diff --git a/testsuites/ada/mptests/mp10/node2/Makefile.am b/testsuites/ada/mptests/mp10/node2/Makefile.am
index 70d1740cfa..98907fa8a1 100644
--- a/testsuites/ada/mptests/mp10/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp10_ada_mp10_node2
 mp10_ada_mp10_node2_SOURCES = mp10_node2.adb ../mptest.adb config.h
 mp10_ada_mp10_node2_SOURCES += ../mptest.ads
-mp10_ada_mp10_node2_SOURCES += ../../../support/init.c
+mp10_ada_mp10_node2_SOURCES += init.c
 
 mp10_ada_mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp10/node2/config.h b/testsuites/ada/mptests/mp10/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp10/node2/config.h
+++ b/testsuites/ada/mptests/mp10/node2/init.c
diff --git a/testsuites/ada/mptests/mp11/config_base.h b/testsuites/ada/mptests/mp11/config_base.h
index c36c1bac3c..d0dd4061de 100644
--- a/testsuites/ada/mptests/mp11/config_base.h
+++ b/testsuites/ada/mptests/mp11/config_base.h
@@ -25,6 +25,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/mptests/mp11/node1/Makefile.am b/testsuites/ada/mptests/mp11/node1/Makefile.am
index ae6570e974..2bba219370 100644
--- a/testsuites/ada/mptests/mp11/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp11_ada_mp11_node1
 mp11_ada_mp11_node1_SOURCES = mp11_node1.adb ../mptest.adb config.h
 mp11_ada_mp11_node1_SOURCES += ../mptest.ads
-mp11_ada_mp11_node1_SOURCES += ../../../support/init.c
+mp11_ada_mp11_node1_SOURCES += init.c
 
 mp11_ada_mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp11/node1/config.h b/testsuites/ada/mptests/mp11/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp11/node1/config.h
+++ b/testsuites/ada/mptests/mp11/node1/init.c
diff --git a/testsuites/ada/mptests/mp11/node2/Makefile.am b/testsuites/ada/mptests/mp11/node2/Makefile.am
index ae4cc32441..5c78df4020 100644
--- a/testsuites/ada/mptests/mp11/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp11_ada_mp11_node2
 mp11_ada_mp11_node2_SOURCES = mp11_node2.adb ../mptest.adb config.h
 mp11_ada_mp11_node2_SOURCES += ../mptest.ads
-mp11_ada_mp11_node2_SOURCES += ../../../support/init.c
+mp11_ada_mp11_node2_SOURCES += init.c
 
 mp11_ada_mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp11/node2/config.h b/testsuites/ada/mptests/mp11/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp11/node2/config.h
+++ b/testsuites/ada/mptests/mp11/node2/init.c
diff --git a/testsuites/ada/mptests/mp12/config_base.h b/testsuites/ada/mptests/mp12/config_base.h
index 2d7952fe39..7ace8ca280 100644
--- a/testsuites/ada/mptests/mp12/config_base.h
+++ b/testsuites/ada/mptests/mp12/config_base.h
@@ -25,6 +25,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/mptests/mp12/node1/Makefile.am b/testsuites/ada/mptests/mp12/node1/Makefile.am
index a95c153c00..0717da924a 100644
--- a/testsuites/ada/mptests/mp12/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp12_ada_mp12_node1
 mp12_ada_mp12_node1_SOURCES = mp12_node1.adb ../mptest.adb config.h
 mp12_ada_mp12_node1_SOURCES += ../mptest.ads
-mp12_ada_mp12_node1_SOURCES += ../../../support/init.c
+mp12_ada_mp12_node1_SOURCES += init.c
 
 mp12_ada_mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp12/node1/config.h b/testsuites/ada/mptests/mp12/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp12/node1/config.h
+++ b/testsuites/ada/mptests/mp12/node1/init.c
diff --git a/testsuites/ada/mptests/mp12/node2/Makefile.am b/testsuites/ada/mptests/mp12/node2/Makefile.am
index eb35a18e6c..ae5e71bcf6 100644
--- a/testsuites/ada/mptests/mp12/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp12_ada_mp12_node2
 mp12_ada_mp12_node2_SOURCES = mp12_node2.adb ../mptest.adb config.h
 mp12_ada_mp12_node2_SOURCES += ../mptest.ads
-mp12_ada_mp12_node2_SOURCES += ../../../support/init.c
+mp12_ada_mp12_node2_SOURCES += init.c
 
 mp12_ada_mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp12/node2/config.h b/testsuites/ada/mptests/mp12/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp12/node2/config.h
+++ b/testsuites/ada/mptests/mp12/node2/init.c
diff --git a/testsuites/ada/mptests/mp13/config_base.h b/testsuites/ada/mptests/mp13/config_base.h
index 8799c9a86e..52e2d786eb 100644
--- a/testsuites/ada/mptests/mp13/config_base.h
+++ b/testsuites/ada/mptests/mp13/config_base.h
@@ -25,6 +25,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/mptests/mp13/node1/Makefile.am b/testsuites/ada/mptests/mp13/node1/Makefile.am
index 4020129ac8..ee1ec62d22 100644
--- a/testsuites/ada/mptests/mp13/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp13_ada_mp13_node1
 mp13_ada_mp13_node1_SOURCES = mp13_node1.adb ../mptest.adb config.h
 mp13_ada_mp13_node1_SOURCES += ../mptest.ads
-mp13_ada_mp13_node1_SOURCES += ../../../support/init.c
+mp13_ada_mp13_node1_SOURCES += init.c
 
 mp13_ada_mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp13/node1/config.h b/testsuites/ada/mptests/mp13/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp13/node1/config.h
+++ b/testsuites/ada/mptests/mp13/node1/init.c
diff --git a/testsuites/ada/mptests/mp13/node2/Makefile.am b/testsuites/ada/mptests/mp13/node2/Makefile.am
index 89ebc236ec..7137c7fc51 100644
--- a/testsuites/ada/mptests/mp13/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp13_ada_mp13_node2
 mp13_ada_mp13_node2_SOURCES = mp13_node2.adb ../mptest.adb config.h
 mp13_ada_mp13_node2_SOURCES += ../mptest.ads
-mp13_ada_mp13_node2_SOURCES += ../../../support/init.c
+mp13_ada_mp13_node2_SOURCES += init.c
 
 mp13_ada_mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp13/node2/config.h b/testsuites/ada/mptests/mp13/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp13/node2/config.h
+++ b/testsuites/ada/mptests/mp13/node2/init.c
diff --git a/testsuites/ada/mptests/mp14/config_base.h b/testsuites/ada/mptests/mp14/config_base.h
index 6d2b79dea5..c8369dcaad 100644
--- a/testsuites/ada/mptests/mp14/config_base.h
+++ b/testsuites/ada/mptests/mp14/config_base.h
@@ -25,6 +25,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/mptests/mp14/node1/Makefile.am b/testsuites/ada/mptests/mp14/node1/Makefile.am
index 373b8b2f70..e9e76b4140 100644
--- a/testsuites/ada/mptests/mp14/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp14_ada_mp14_node1
 mp14_ada_mp14_node1_SOURCES = mp14_node1.adb ../mptest.adb config.h
 mp14_ada_mp14_node1_SOURCES += ../mptest.ads
-mp14_ada_mp14_node1_SOURCES += ../../../support/init.c
+mp14_ada_mp14_node1_SOURCES += init.c
 
 mp14_ada_mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp14/node1/config.h b/testsuites/ada/mptests/mp14/node1/init.c
index 36c9d133e8..36c9d133e8 100644
--- a/testsuites/ada/mptests/mp14/node1/config.h
+++ b/testsuites/ada/mptests/mp14/node1/init.c
diff --git a/testsuites/ada/mptests/mp14/node2/Makefile.am b/testsuites/ada/mptests/mp14/node2/Makefile.am
index ceda2b7540..2e0e9a3678 100644
--- a/testsuites/ada/mptests/mp14/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp14_ada_mp14_node2
 mp14_ada_mp14_node2_SOURCES = mp14_node2.adb ../mptest.adb config.h
 mp14_ada_mp14_node2_SOURCES += ../mptest.ads
-mp14_ada_mp14_node2_SOURCES += ../../../support/init.c
+mp14_ada_mp14_node2_SOURCES += init.c
 
 mp14_ada_mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp14/node2/config.h b/testsuites/ada/mptests/mp14/node2/init.c
index 47edf66149..47edf66149 100644
--- a/testsuites/ada/mptests/mp14/node2/config.h
+++ b/testsuites/ada/mptests/mp14/node2/init.c