Merged from 4.5.0-beta3a

43 files changed, 147 insertions, 128 deletions

diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index 36d8d0dfb4..fcddeccc68 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 0a80134c68..23a4b86a14 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp01/system.h b/testsuites/mptests/mp01/system.h
index c1ce67d249..c4f9ac18b2 100644
--- a/testsuites/mptests/mp01/system.h
+++ b/testsuites/mptests/mp01/system.h
@@ -27,13 +27,15 @@ rtems_task Test_task(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_MAXIMUM_TASKS           4
+
 #define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_GLOBAL
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <confdefs.h>
 
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 4f1f920303..0644447874 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index 9887d04d42..570db75ea2 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp02/system.h b/testsuites/mptests/mp02/system.h
index af065a5e67..c3a31ce812 100644
--- a/testsuites/mptests/mp02/system.h
+++ b/testsuites/mptests/mp02/system.h
@@ -27,10 +27,12 @@ rtems_task Test_task(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS               2
  
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 94e3c5d068..02ab109ef2 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index 08acad9391..9ec135eac0 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp03/system.h b/testsuites/mptests/mp03/system.h
index c2c27f3196..5d0636bd63 100644
--- a/testsuites/mptests/mp03/system.h
+++ b/testsuites/mptests/mp03/system.h
@@ -32,11 +32,12 @@ rtems_timer_service_routine Delayed_send_event(
  
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
+#define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_TIMERS              1
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index 20201ccb6a..f1c48a32dd 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index a3a537743a..601919f21f 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp04/system.h b/testsuites/mptests/mp04/system.h
index 0b343c86a3..ab91566559 100644
--- a/testsuites/mptests/mp04/system.h
+++ b/testsuites/mptests/mp04/system.h
@@ -27,11 +27,12 @@ rtems_task Test_task(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
+#define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_TIMERS              1
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 7de770e601..a53e9b2c06 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index 3bb698dd47..b27b2b81db 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp05/system.h b/testsuites/mptests/mp05/system.h
index a5ec04e368..e19f049fab 100644
--- a/testsuites/mptests/mp05/system.h
+++ b/testsuites/mptests/mp05/system.h
@@ -29,11 +29,12 @@ rtems_asr Process_asr( rtems_signal_set );
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
+#define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_TIMERS              1
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index ab7c67d1c1..c0394c36ca 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index 08ce32ea8b..dc2c865598 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp06/system.h b/testsuites/mptests/mp06/system.h
index 2062710560..7a38afcfcb 100644
--- a/testsuites/mptests/mp06/system.h
+++ b/testsuites/mptests/mp06/system.h
@@ -27,11 +27,12 @@ rtems_task Test_task(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
+#define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_TIMERS              1
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index c83109eedc..fd03da42a8 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index 2a6e01a60f..c6d4173459 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp07/system.h b/testsuites/mptests/mp07/system.h
index 2062710560..7a38afcfcb 100644
--- a/testsuites/mptests/mp07/system.h
+++ b/testsuites/mptests/mp07/system.h
@@ -27,11 +27,12 @@ rtems_task Test_task(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
+#define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_TIMERS              1
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index 1af1d8c753..34331f026e 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 10494437e2..dea01f6853 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp08/system.h b/testsuites/mptests/mp08/system.h
index 925a2e1ed8..1bfc0d1ae1 100644
--- a/testsuites/mptests/mp08/system.h
+++ b/testsuites/mptests/mp08/system.h
@@ -27,11 +27,12 @@ rtems_task Test_task(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
+#define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1
 
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 01998048c8..aaea270e37 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index ea8d3b2fc5..c9eccac036 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp09/system.h b/testsuites/mptests/mp09/system.h
index 66eed7f097..1b3d425325 100644
--- a/testsuites/mptests/mp09/system.h
+++ b/testsuites/mptests/mp09/system.h
@@ -31,11 +31,12 @@ void Send_messages( void );
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
+#define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
 
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 15c3130981..7281b77bcf 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 9631817320..8750e465dc 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp10/system.h b/testsuites/mptests/mp10/system.h
index d41dd4c8e4..e101987446 100644
--- a/testsuites/mptests/mp10/system.h
+++ b/testsuites/mptests/mp10/system.h
@@ -35,14 +35,17 @@ rtems_task Test_task3(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
 #if ( NODE_NUMBER == 1 )
+#define CONFIGURE_MAXIMUM_TASKS               1
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
+#else
+#define CONFIGURE_MAXIMUM_TASKS               4
 #endif
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 903abd0c45..f86c54c1b7 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index c3f94096b4..35f2608e54 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp11/system.h b/testsuites/mptests/mp11/system.h
index db553e813f..68bbe83f3b 100644
--- a/testsuites/mptests/mp11/system.h
+++ b/testsuites/mptests/mp11/system.h
@@ -23,14 +23,15 @@ rtems_task Init(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     0
 #define CONFIGURE_MP_MAXIMUM_PROXIES            0
  
+#define CONFIGURE_MAXIMUM_TASKS               1
 #if ( NODE_NUMBER == 1 )
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index 4c634741b1..9e3e61c6a4 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index dfdabec2e1..e860040919 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp12/system.h b/testsuites/mptests/mp12/system.h
index b464f17f1c..a9f7f11dd8 100644
--- a/testsuites/mptests/mp12/system.h
+++ b/testsuites/mptests/mp12/system.h
@@ -25,14 +25,15 @@ rtems_task Init(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     1
 #define CONFIGURE_MP_MAXIMUM_PROXIES            0
  
+#define CONFIGURE_MAXIMUM_TASKS               1
 #if ( NODE_NUMBER == 1 )
 #define CONFIGURE_MAXIMUM_PARTITIONS          1
 #elif ( NODE_NUMBER == 2 )
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index fe34c6f673..cfd2fa1a46 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index d19b736e51..5be99378aa 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp13/system.h b/testsuites/mptests/mp13/system.h
index 08e0ef2152..0f917d5598 100644
--- a/testsuites/mptests/mp13/system.h
+++ b/testsuites/mptests/mp13/system.h
@@ -31,11 +31,12 @@ rtems_task Test_task2(
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_MAXIMUM_TASKS               2
 #if ( NODE_NUMBER == 1 )
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
diff --git a/testsuites/mptests/mp14/Makefile.am b/testsuites/mptests/mp14/Makefile.am
index db1ff08d1d..2a2950ef0e 100644
--- a/testsuites/mptests/mp14/Makefile.am
+++ b/testsuites/mptests/mp14/Makefile.am
@@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h delay.c evtask1.c evtmtask.c exit.c init.c msgtask1.c pttask1.c smtask1.c
+EXTRA_DIST = system.h delay.c evtask1.c evtmtask.c exit.c init.c msgtask1.c \
+    pttask1.c smtask1.c
 
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 1e79f51e25..e03c43c6ae 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 1
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 28e92736db..6b394e10d0 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -1,9 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
- 
+
 VPATH = @srcdir@:@srcdir@/..
 
 NODE = 2
diff --git a/testsuites/mptests/mp14/system.h b/testsuites/mptests/mp14/system.h
index 92cb9881f3..6eacde2662 100644
--- a/testsuites/mptests/mp14/system.h
+++ b/testsuites/mptests/mp14/system.h
@@ -50,14 +50,15 @@ void Exit_test( void );
 
 /* configuration information */
  
-#define CONFIGURE_MPTEST
+#define CONFIGURE_MP_APPLICATION
  
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  
 #define CONFIGURE_TICKS_PER_TIMESLICE   1
 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1)
 
+#define CONFIGURE_MAXIMUM_TASKS               5
 #if ( NODE_NUMBER == 1 )
 #define CONFIGURE_MAXIMUM_TIMERS              12
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1