summaryrefslogtreecommitdiffstats
path: root/c/src/ada-tests
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-10-03 20:12:15 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-10-03 20:12:15 +0000
commit8da756e88927471b031469a28bf9afb4fe3b6e9f (patch)
tree9ea10e59453e8ca40c26682fe692ba828bc8a3ea /c/src/ada-tests
parent2007-10-02 Jukka Pietarinen <jukka.pietarinen@mrf.fi> (diff)
downloadrtems-8da756e88927471b031469a28bf9afb4fe3b6e9f.tar.bz2
2007-10-03 Joel Sherrill <joel.sherrill@oarcorp.com>
* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am, mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am, mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am, mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am, mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am, mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am, mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am, mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am, mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am, mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am, mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am, mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am, mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am, mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am: Basic build structure should now be correct. The remaining issues should be test specific. * mptests/mp01/config_base.h, mptests/mp01/node1/config.h, mptests/mp01/node1/mp01_node1.adb, mptests/mp01/node2/config.h, mptests/mp01/node2/mp01_node2.adb, mptests/mp02/config_base.h, mptests/mp02/node1/config.h, mptests/mp02/node1/mp02_node1.adb, mptests/mp02/node2/config.h, mptests/mp02/node2/mp02_node2.adb, mptests/mp03/config_base.h, mptests/mp03/node1/config.h, mptests/mp03/node1/mp03_node1.adb, mptests/mp03/node2/config.h, mptests/mp03/node2/mp03_node2.adb, mptests/mp04/config_base.h, mptests/mp04/node1/config.h, mptests/mp04/node1/mp04_node1.adb, mptests/mp04/node2/config.h, mptests/mp04/node2/mp04_node2.adb, mptests/mp05/config_base.h, mptests/mp05/node1/config.h, mptests/mp05/node1/mp05_node1.adb, mptests/mp05/node2/config.h, mptests/mp05/node2/mp05_node2.adb, mptests/mp06/config_base.h, mptests/mp06/node1/config.h, mptests/mp06/node1/mp06_node1.adb, mptests/mp06/node2/config.h, mptests/mp06/node2/mp06_node2.adb, mptests/mp07/config_base.h, mptests/mp07/node1/config.h, mptests/mp07/node1/mp07_node1.adb, mptests/mp07/node2/config.h, mptests/mp07/node2/mp07_node2.adb, mptests/mp08/config_base.h, mptests/mp08/node1/config.h, mptests/mp08/node1/mp08_node1.adb, mptests/mp08/node2/config.h, mptests/mp08/node2/mp08_node2.adb, mptests/mp09/config_base.h, mptests/mp09/node1/config.h, mptests/mp09/node1/mp09_node1.adb, mptests/mp09/node2/config.h, mptests/mp09/node2/mp09_node2.adb, mptests/mp10/config_base.h, mptests/mp10/node1/config.h, mptests/mp10/node1/mp10_node1.adb, mptests/mp10/node2/config.h, mptests/mp10/node2/mp10_node2.adb, mptests/mp11/config_base.h, mptests/mp11/node1/config.h, mptests/mp11/node1/mp11_node1.adb, mptests/mp11/node2/config.h, mptests/mp11/node2/mp11_node2.adb, mptests/mp12/config_base.h, mptests/mp12/node1/config.h, mptests/mp12/node1/mp12_node1.adb, mptests/mp12/node2/config.h, mptests/mp12/node2/mp12_node2.adb, mptests/mp13/config_base.h, mptests/mp13/node1/config.h, mptests/mp13/node1/mp13_node1.adb, mptests/mp13/node2/config.h, mptests/mp13/node2/mp13_node2.adb, mptests/mp14/config_base.h, mptests/mp14/node1/config.h, mptests/mp14/node1/mp14_node1.adb, mptests/mp14/node2/config.h, mptests/mp14/node2/mp14_node2.adb: New files. GNATMAKE is easier to operate if the filename of the main package matches the executable name. In this case, we needed one for each node's executable. * mptests/mp01/config.h: Removed.
Diffstat (limited to 'c/src/ada-tests')
-rw-r--r--c/src/ada-tests/ChangeLog58
-rw-r--r--c/src/ada-tests/mptests/mp01/config_base.h (renamed from c/src/ada-tests/mptests/mp01/config.h)12
-rw-r--r--c/src/ada-tests/mptests/mp01/node1/Makefile.am10
-rw-r--r--c/src/ada-tests/mptests/mp01/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp01/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp01/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp02/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp02/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp02/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp02/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp02/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp03/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp03/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp03/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp03/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp03/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp04/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp04/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp04/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp04/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp04/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp05/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp05/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp05/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp05/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp05/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp06/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp06/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp06/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp06/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp06/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp07/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp07/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp07/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp07/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp07/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp08/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp08/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp08/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp08/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp08/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp09/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp09/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp09/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp09/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp09/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp10/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp10/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp10/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp10/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp10/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp11/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp11/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp11/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp11/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp11/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp12/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp12/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp12/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp12/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp12/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp13/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp13/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp13/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp13/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp13/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb56
-rw-r--r--c/src/ada-tests/mptests/mp14/config_base.h32
-rw-r--r--c/src/ada-tests/mptests/mp14/node1/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp14/node1/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb56
-rw-r--r--c/src/ada-tests/mptests/mp14/node2/Makefile.am12
-rw-r--r--c/src/ada-tests/mptests/mp14/node2/config.h23
-rw-r--r--c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb56
99 files changed, 2832 insertions, 200 deletions
diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog
index 76f2cae420..4ccf938ea8 100644
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,3 +1,61 @@
+2007-10-03 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
+ mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
+ mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
+ mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
+ mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
+ mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
+ mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
+ mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
+ mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
+ mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
+ mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
+ mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
+ mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
+ mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am: Basic
+ build structure should now be correct. The remaining issues should be
+ test specific.
+ * mptests/mp01/config_base.h, mptests/mp01/node1/config.h,
+ mptests/mp01/node1/mp01_node1.adb, mptests/mp01/node2/config.h,
+ mptests/mp01/node2/mp01_node2.adb, mptests/mp02/config_base.h,
+ mptests/mp02/node1/config.h, mptests/mp02/node1/mp02_node1.adb,
+ mptests/mp02/node2/config.h, mptests/mp02/node2/mp02_node2.adb,
+ mptests/mp03/config_base.h, mptests/mp03/node1/config.h,
+ mptests/mp03/node1/mp03_node1.adb, mptests/mp03/node2/config.h,
+ mptests/mp03/node2/mp03_node2.adb, mptests/mp04/config_base.h,
+ mptests/mp04/node1/config.h, mptests/mp04/node1/mp04_node1.adb,
+ mptests/mp04/node2/config.h, mptests/mp04/node2/mp04_node2.adb,
+ mptests/mp05/config_base.h, mptests/mp05/node1/config.h,
+ mptests/mp05/node1/mp05_node1.adb, mptests/mp05/node2/config.h,
+ mptests/mp05/node2/mp05_node2.adb, mptests/mp06/config_base.h,
+ mptests/mp06/node1/config.h, mptests/mp06/node1/mp06_node1.adb,
+ mptests/mp06/node2/config.h, mptests/mp06/node2/mp06_node2.adb,
+ mptests/mp07/config_base.h, mptests/mp07/node1/config.h,
+ mptests/mp07/node1/mp07_node1.adb, mptests/mp07/node2/config.h,
+ mptests/mp07/node2/mp07_node2.adb, mptests/mp08/config_base.h,
+ mptests/mp08/node1/config.h, mptests/mp08/node1/mp08_node1.adb,
+ mptests/mp08/node2/config.h, mptests/mp08/node2/mp08_node2.adb,
+ mptests/mp09/config_base.h, mptests/mp09/node1/config.h,
+ mptests/mp09/node1/mp09_node1.adb, mptests/mp09/node2/config.h,
+ mptests/mp09/node2/mp09_node2.adb, mptests/mp10/config_base.h,
+ mptests/mp10/node1/config.h, mptests/mp10/node1/mp10_node1.adb,
+ mptests/mp10/node2/config.h, mptests/mp10/node2/mp10_node2.adb,
+ mptests/mp11/config_base.h, mptests/mp11/node1/config.h,
+ mptests/mp11/node1/mp11_node1.adb, mptests/mp11/node2/config.h,
+ mptests/mp11/node2/mp11_node2.adb, mptests/mp12/config_base.h,
+ mptests/mp12/node1/config.h, mptests/mp12/node1/mp12_node1.adb,
+ mptests/mp12/node2/config.h, mptests/mp12/node2/mp12_node2.adb,
+ mptests/mp13/config_base.h, mptests/mp13/node1/config.h,
+ mptests/mp13/node1/mp13_node1.adb, mptests/mp13/node2/config.h,
+ mptests/mp13/node2/mp13_node2.adb, mptests/mp14/config_base.h,
+ mptests/mp14/node1/config.h, mptests/mp14/node1/mp14_node1.adb,
+ mptests/mp14/node2/config.h, mptests/mp14/node2/mp14_node2.adb:
+ New files. GNATMAKE is easier to operate if the filename of the
+ main package matches the executable name. In this case, we needed
+ one for each node's executable.
+ * mptests/mp01/config.h: Removed.
+
2007-10-01 Joel Sherrill <joel.sherrill@OARcorp.com>
* mptests/mp01/mptest.adb, mptests/mp01/mptest.ads,
diff --git a/c/src/ada-tests/mptests/mp01/config.h b/c/src/ada-tests/mptests/mp01/config_base.h
index bcf36df5b8..799343addd 100644
--- a/c/src/ada-tests/mptests/mp01/config.h
+++ b/c/src/ada-tests/mptests/mp01/config_base.h
@@ -1,8 +1,9 @@
-/* config.h
+/* config_base.h
*
- * This include file defines the Configuration Table for this test.
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
*
- * COPYRIGHT (c) 1989-1997.
+ * COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may in
@@ -13,15 +14,14 @@
*/
-/* configuration information */
-
-#define CONFIGURE_MPTEST
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+#define CONFIGURE_MAXIMUM_TASKS 2
+
#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
index 6e12ed0e6f..ebb7e2de78 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
@@ -7,12 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
+noinst_PROGRAMS = mp01_node1
+mp01_node1_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
+mp01_node1_SOURCES += ../../../support/init.c
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp01-node1.scn
diff --git a/c/src/ada-tests/mptests/mp01/node1/config.h b/c/src/ada-tests/mptests/mp01/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp01/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb b/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb
new file mode 100644
index 0000000000..3e804e2d97
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP01_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP01_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP01_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp01/node2/Makefile.am b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
index d3c322b989..b4e01fc33d 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp01_node2
+mp01_node2_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
+mp01_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp01-node2.scn
diff --git a/c/src/ada-tests/mptests/mp01/node2/config.h b/c/src/ada-tests/mptests/mp01/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp01/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb b/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb
new file mode 100644
index 0000000000..00d7653d35
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP01_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP01_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP01_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp02/config_base.h b/c/src/ada-tests/mptests/mp02/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp02/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp02/node1/Makefile.am b/c/src/ada-tests/mptests/mp02/node1/Makefile.am
index 9dbaadfe5b..594b07a7e3 100644
--- a/c/src/ada-tests/mptests/mp02/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp02_node1
+mp02_node1_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
+mp02_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp02_node1$(EXEEXT): mp02_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp02-node1.scn
diff --git a/c/src/ada-tests/mptests/mp02/node1/config.h b/c/src/ada-tests/mptests/mp02/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp02/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb b/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb
new file mode 100644
index 0000000000..dd2caf6497
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP02_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP02_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP02_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp02/node2/Makefile.am b/c/src/ada-tests/mptests/mp02/node2/Makefile.am
index d2456aba17..b4ddec3acc 100644
--- a/c/src/ada-tests/mptests/mp02/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp02_node2
+mp02_node2_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
+mp02_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp02_node2$(EXEEXT): mp02_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp02-node2.scn
diff --git a/c/src/ada-tests/mptests/mp02/node2/config.h b/c/src/ada-tests/mptests/mp02/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp02/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb b/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb
new file mode 100644
index 0000000000..a7231479a6
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP02_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP02_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP02_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp03/config_base.h b/c/src/ada-tests/mptests/mp03/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp03/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp03/node1/Makefile.am b/c/src/ada-tests/mptests/mp03/node1/Makefile.am
index d387e49b6d..016b50fdd9 100644
--- a/c/src/ada-tests/mptests/mp03/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp03_node1
+mp03_node1_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
+mp03_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp03-node1.scn
diff --git a/c/src/ada-tests/mptests/mp03/node1/config.h b/c/src/ada-tests/mptests/mp03/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp03/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb b/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb
new file mode 100644
index 0000000000..9658d75fb0
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP03_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP03_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP03_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp03/node2/Makefile.am b/c/src/ada-tests/mptests/mp03/node2/Makefile.am
index 7fd2a47ad1..e0217a751d 100644
--- a/c/src/ada-tests/mptests/mp03/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp03_node2
+mp03_node2_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
+mp03_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp03-node2.scn
diff --git a/c/src/ada-tests/mptests/mp03/node2/config.h b/c/src/ada-tests/mptests/mp03/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp03/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb b/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb
new file mode 100644
index 0000000000..473540f0e5
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP03_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP03_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP03_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp04/config_base.h b/c/src/ada-tests/mptests/mp04/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp04/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp04/node1/Makefile.am b/c/src/ada-tests/mptests/mp04/node1/Makefile.am
index dd266afc95..463430620a 100644
--- a/c/src/ada-tests/mptests/mp04/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp04_node1
+mp04_node1_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
+mp04_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp04-node1.scn
diff --git a/c/src/ada-tests/mptests/mp04/node1/config.h b/c/src/ada-tests/mptests/mp04/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp04/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb b/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb
new file mode 100644
index 0000000000..b6bafae38f
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP04_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP04_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP04_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp04/node2/Makefile.am b/c/src/ada-tests/mptests/mp04/node2/Makefile.am
index abc3a98fe9..4be92574ff 100644
--- a/c/src/ada-tests/mptests/mp04/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp04_node2
+mp04_node2_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
+mp04_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp04-node2.scn
diff --git a/c/src/ada-tests/mptests/mp04/node2/config.h b/c/src/ada-tests/mptests/mp04/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp04/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb b/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb
new file mode 100644
index 0000000000..fb6ce9343b
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP04_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP04_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP04_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp05/config_base.h b/c/src/ada-tests/mptests/mp05/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp05/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp05/node1/Makefile.am b/c/src/ada-tests/mptests/mp05/node1/Makefile.am
index 06268096de..99f27be6d0 100644
--- a/c/src/ada-tests/mptests/mp05/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp05_node1
+mp05_node1_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
+mp05_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp05-node1.scn
diff --git a/c/src/ada-tests/mptests/mp05/node1/config.h b/c/src/ada-tests/mptests/mp05/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp05/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb b/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb
new file mode 100644
index 0000000000..1a43e33df6
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP05_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP05_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP05_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp05/node2/Makefile.am b/c/src/ada-tests/mptests/mp05/node2/Makefile.am
index 35670ebfdc..032932fc07 100644
--- a/c/src/ada-tests/mptests/mp05/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp05_node2
+mp05_node2_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
+mp05_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp05-node2.scn
diff --git a/c/src/ada-tests/mptests/mp05/node2/config.h b/c/src/ada-tests/mptests/mp05/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp05/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb b/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb
new file mode 100644
index 0000000000..0a16c11c79
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP05_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP05_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP05_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp06/config_base.h b/c/src/ada-tests/mptests/mp06/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp06/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp06/node1/Makefile.am b/c/src/ada-tests/mptests/mp06/node1/Makefile.am
index 1dabb1d16a..8b9dfd160d 100644
--- a/c/src/ada-tests/mptests/mp06/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp06_node1
+mp06_node1_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
+mp06_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp06-node1.scn
diff --git a/c/src/ada-tests/mptests/mp06/node1/config.h b/c/src/ada-tests/mptests/mp06/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp06/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb b/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb
new file mode 100644
index 0000000000..7100e6385e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP06_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP06_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP06_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp06/node2/Makefile.am b/c/src/ada-tests/mptests/mp06/node2/Makefile.am
index ea974fba13..8f59995bcf 100644
--- a/c/src/ada-tests/mptests/mp06/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp06_node2
+mp06_node2_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
+mp06_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp06-node2.scn
diff --git a/c/src/ada-tests/mptests/mp06/node2/config.h b/c/src/ada-tests/mptests/mp06/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp06/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb b/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb
new file mode 100644
index 0000000000..1255348e4b
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP06_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP06_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP06_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp07/config_base.h b/c/src/ada-tests/mptests/mp07/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp07/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp07/node1/Makefile.am b/c/src/ada-tests/mptests/mp07/node1/Makefile.am
index eb786f7234..9be7992ed7 100644
--- a/c/src/ada-tests/mptests/mp07/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp07_node1
+mp07_node1_SOURCES = mp07_node1.adb ../mptest.adb config.h ../mptest.ads
+mp07_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp07-node1.scn
diff --git a/c/src/ada-tests/mptests/mp07/node1/config.h b/c/src/ada-tests/mptests/mp07/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp07/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb b/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
new file mode 100644
index 0000000000..ec9bb2f8b9
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP07_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP07_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP07_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp07/node2/Makefile.am b/c/src/ada-tests/mptests/mp07/node2/Makefile.am
index da75e05e07..da151bcfbe 100644
--- a/c/src/ada-tests/mptests/mp07/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp07_node2
+mp07_node2_SOURCES = mp07_node2.adb ../mptest.adb config.h ../mptest.ads
+mp07_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp07-node2.scn
diff --git a/c/src/ada-tests/mptests/mp07/node2/config.h b/c/src/ada-tests/mptests/mp07/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp07/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb b/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
new file mode 100644
index 0000000000..a1075b3368
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP07_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP07_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP07_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp08/config_base.h b/c/src/ada-tests/mptests/mp08/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp08/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp08/node1/Makefile.am b/c/src/ada-tests/mptests/mp08/node1/Makefile.am
index fd6ba53d1b..1a11403eaa 100644
--- a/c/src/ada-tests/mptests/mp08/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp08_node1
+mp08_node1_SOURCES = mp08_node1.adb ../mptest.adb config.h ../mptest.ads
+mp08_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp08-node1.scn
diff --git a/c/src/ada-tests/mptests/mp08/node1/config.h b/c/src/ada-tests/mptests/mp08/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp08/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb b/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb
new file mode 100644
index 0000000000..bee8c1526a
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP08_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP08_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP08_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp08/node2/Makefile.am b/c/src/ada-tests/mptests/mp08/node2/Makefile.am
index 32f5d96d84..9e5e70197c 100644
--- a/c/src/ada-tests/mptests/mp08/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp08_node2
+mp08_node2_SOURCES = mp08_node2.adb ../mptest.adb config.h ../mptest.ads
+mp08_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp08-node2.scn
diff --git a/c/src/ada-tests/mptests/mp08/node2/config.h b/c/src/ada-tests/mptests/mp08/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp08/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb b/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb
new file mode 100644
index 0000000000..8d88aabac8
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP08_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP08_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP08_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp09/config_base.h b/c/src/ada-tests/mptests/mp09/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp09/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp09/node1/Makefile.am b/c/src/ada-tests/mptests/mp09/node1/Makefile.am
index 3c4b553957..51228758a7 100644
--- a/c/src/ada-tests/mptests/mp09/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp09_node1
+mp09_node1_SOURCES = mp09_node1.adb ../mptest.adb config.h ../mptest.ads
+mp09_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp09-node1.scn
diff --git a/c/src/ada-tests/mptests/mp09/node1/config.h b/c/src/ada-tests/mptests/mp09/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp09/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb b/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb
new file mode 100644
index 0000000000..1282eeb10a
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP09_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP09_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP09_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp09/node2/Makefile.am b/c/src/ada-tests/mptests/mp09/node2/Makefile.am
index d80e539732..df15fabe78 100644
--- a/c/src/ada-tests/mptests/mp09/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp09_node2
+mp09_node2_SOURCES = mp09_node2.adb ../mptest.adb config.h ../mptest.ads
+mp09_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp09-node2.scn
diff --git a/c/src/ada-tests/mptests/mp09/node2/config.h b/c/src/ada-tests/mptests/mp09/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp09/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb b/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb
new file mode 100644
index 0000000000..a270b51a3e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP09_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP09_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP09_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp10/config_base.h b/c/src/ada-tests/mptests/mp10/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp10/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp10/node1/Makefile.am b/c/src/ada-tests/mptests/mp10/node1/Makefile.am
index e41954a2a8..8211201a22 100644
--- a/c/src/ada-tests/mptests/mp10/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp10_node1
+mp10_node1_SOURCES = mp10_node1.adb ../mptest.adb config.h ../mptest.ads
+mp10_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp10-node1.scn
diff --git a/c/src/ada-tests/mptests/mp10/node1/config.h b/c/src/ada-tests/mptests/mp10/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp10/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb b/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb
new file mode 100644
index 0000000000..984070e32c
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP10_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP10_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP10_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp10/node2/Makefile.am b/c/src/ada-tests/mptests/mp10/node2/Makefile.am
index 5c48be0274..8399b9eb30 100644
--- a/c/src/ada-tests/mptests/mp10/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp10_node2
+mp10_node2_SOURCES = mp10_node2.adb ../mptest.adb config.h ../mptest.ads
+mp10_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp10-node2.scn
diff --git a/c/src/ada-tests/mptests/mp10/node2/config.h b/c/src/ada-tests/mptests/mp10/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp10/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb b/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb
new file mode 100644
index 0000000000..ab95182331
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP10_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP10_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP10_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp11/config_base.h b/c/src/ada-tests/mptests/mp11/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp11/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp11/node1/Makefile.am b/c/src/ada-tests/mptests/mp11/node1/Makefile.am
index 46e3020988..84c3b69b4b 100644
--- a/c/src/ada-tests/mptests/mp11/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp11_node1
+mp11_node1_SOURCES = mp11_node1.adb ../mptest.adb config.h ../mptest.ads
+mp11_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp11-node1.scn
diff --git a/c/src/ada-tests/mptests/mp11/node1/config.h b/c/src/ada-tests/mptests/mp11/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp11/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb b/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb
new file mode 100644
index 0000000000..0c66565710
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP11_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP11_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP11_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp11/node2/Makefile.am b/c/src/ada-tests/mptests/mp11/node2/Makefile.am
index 4f7c39d453..c2651d384e 100644
--- a/c/src/ada-tests/mptests/mp11/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp11_node2
+mp11_node2_SOURCES = mp11_node2.adb ../mptest.adb config.h ../mptest.ads
+mp11_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp11-node2.scn
diff --git a/c/src/ada-tests/mptests/mp11/node2/config.h b/c/src/ada-tests/mptests/mp11/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp11/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb b/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb
new file mode 100644
index 0000000000..3e44feaaa6
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP11_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP11_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP11_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp12/config_base.h b/c/src/ada-tests/mptests/mp12/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp12/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp12/node1/Makefile.am b/c/src/ada-tests/mptests/mp12/node1/Makefile.am
index c02e6ccb2e..ab996d28ee 100644
--- a/c/src/ada-tests/mptests/mp12/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp12_node1
+mp12_node1_SOURCES = mp12_node1.adb ../mptest.adb config.h ../mptest.ads
+mp12_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp12-node1.scn
diff --git a/c/src/ada-tests/mptests/mp12/node1/config.h b/c/src/ada-tests/mptests/mp12/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp12/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb b/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb
new file mode 100644
index 0000000000..75f8545734
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP12_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP12_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP12_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp12/node2/Makefile.am b/c/src/ada-tests/mptests/mp12/node2/Makefile.am
index b4d406eafb..cc5e06f7b4 100644
--- a/c/src/ada-tests/mptests/mp12/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp12_node2
+mp12_node2_SOURCES = mp12_node2.adb ../mptest.adb config.h ../mptest.ads
+mp12_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp12-node2.scn
diff --git a/c/src/ada-tests/mptests/mp12/node2/config.h b/c/src/ada-tests/mptests/mp12/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp12/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb b/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb
new file mode 100644
index 0000000000..bf690249a1
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP12_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP12_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP12_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp13/config_base.h b/c/src/ada-tests/mptests/mp13/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp13/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp13/node1/Makefile.am b/c/src/ada-tests/mptests/mp13/node1/Makefile.am
index a902d412da..75ec9a4d72 100644
--- a/c/src/ada-tests/mptests/mp13/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp13_node1
+mp13_node1_SOURCES = mp13_node1.adb ../mptest.adb config.h ../mptest.ads
+mp13_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp13-node1.scn
diff --git a/c/src/ada-tests/mptests/mp13/node1/config.h b/c/src/ada-tests/mptests/mp13/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp13/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb b/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb
new file mode 100644
index 0000000000..a548cc8945
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP13_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP13_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP13_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp13/node2/Makefile.am b/c/src/ada-tests/mptests/mp13/node2/Makefile.am
index f6fe50b396..f91d5d20e1 100644
--- a/c/src/ada-tests/mptests/mp13/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp13_node2
+mp13_node2_SOURCES = mp13_node2.adb ../mptest.adb config.h ../mptest.ads
+mp13_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp13-node2.scn
diff --git a/c/src/ada-tests/mptests/mp13/node2/config.h b/c/src/ada-tests/mptests/mp13/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp13/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb b/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb
new file mode 100644
index 0000000000..e70cd83f6b
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP13_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP13_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP13_NODE2;
+
diff --git a/c/src/ada-tests/mptests/mp14/config_base.h b/c/src/ada-tests/mptests/mp14/config_base.h
new file mode 100644
index 0000000000..799343addd
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp14/config_base.h
@@ -0,0 +1,32 @@
+/* config_base.h
+ *
+ * This include file defines all of the Configuration Table for this test
+ * EXCEPT the NODE NUMBER.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
+
+#include <rtems/confdefs.h>
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp14/node1/Makefile.am b/c/src/ada-tests/mptests/mp14/node1/Makefile.am
index 03bf65ed43..dd72c9c346 100644
--- a/c/src/ada-tests/mptests/mp14/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node1/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node1
-endif
+noinst_PROGRAMS = mp14_node1
+mp14_node1_SOURCES = mp14_node1.adb ../mptest.adb config.h ../mptest.ads
+mp14_node1_SOURCES += ../../../support/init.c
-node1_SOURCES = mptest-per_node_configuration.adb
+mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp14-node1.scn
diff --git a/c/src/ada-tests/mptests/mp14/node1/config.h b/c/src/ada-tests/mptests/mp14/node1/config.h
new file mode 100644
index 0000000000..cd2699b38e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp14/node1/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 1
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb b/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb
new file mode 100644
index 0000000000..891893da2e
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP14_NODE1 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP14_NODE1 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP14_NODE1;
+
diff --git a/c/src/ada-tests/mptests/mp14/node2/Makefile.am b/c/src/ada-tests/mptests/mp14/node2/Makefile.am
index 45c7f64cd2..bc709024a6 100644
--- a/c/src/ada-tests/mptests/mp14/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node2/Makefile.am
@@ -7,14 +7,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
- $(GNATCOMPILE) -margs -a $< -o $@
-
-if EXPADA
-noinst_PROGRAMS = node2
-endif
+noinst_PROGRAMS = mp14_node2
+mp14_node2_SOURCES = mp14_node2.adb ../mptest.adb config.h ../mptest.ads
+mp14_node2_SOURCES += ../../../support/init.c
-node2_SOURCES = mptest-per_node_configuration.adb
+mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
+ $(GNATCOMPILE) -margs -a $< -o $@
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = mp14-node2.scn
diff --git a/c/src/ada-tests/mptests/mp14/node2/config.h b/c/src/ada-tests/mptests/mp14/node2/config.h
new file mode 100644
index 0000000000..409e7d691d
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp14/node2/config.h
@@ -0,0 +1,23 @@
+/* config.h
+ *
+ * This include file defines the Configuration Table for this test.
+ *
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+
+/* configuration information */
+
+#define CONFIGURE_MP_APPLICATION
+#define CONFIGURE_MP_NODE_NUMBER 2
+
+#include "../config_base.h"
+
+/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb b/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb
new file mode 100644
index 0000000000..adc6a12cc3
--- /dev/null
+++ b/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb
@@ -0,0 +1,56 @@
+--
+-- MAIN / BODY
+--
+-- DESCRIPTION:
+--
+-- This is the entry point for Test MP14_NODE2 of the Single Processor Test Suite.
+--
+-- DEPENDENCIES:
+--
+--
+--
+-- COPYRIGHT (c) 1989-2007.
+-- On-Line Applications Research Corporation (OAR).
+--
+-- The license and distribution terms for this file may in
+-- the file LICENSE in this distribution or at
+-- http://www.rtems.com/license/LICENSE.
+--
+-- $Id$
+--
+
+with RTEMS;
+with MPTEST;
+with TEST_SUPPORT;
+
+procedure MP14_NODE2 is
+ INIT_ID : RTEMS.ID;
+ STATUS : RTEMS.STATUS_CODES;
+begin
+
+ RTEMS.TASK_CREATE(
+ RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
+ 1,
+ RTEMS.MINIMUM_STACK_SIZE,
+ RTEMS.NO_PREEMPT,
+ RTEMS.DEFAULT_ATTRIBUTES,
+ INIT_ID,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
+
+
+ RTEMS.TASK_START(
+ INIT_ID,
+ MPTEST.INIT'ACCESS,
+ 0,
+ STATUS
+ );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
+
+ loop
+ delay 120.0;
+ end loop;
+
+end MP14_NODE2;
+