maximum number of messages removed and include statement cleanup

author: Joel Sherrill <joel.sherrill@OARcorp.com> 1995-08-17 19:36:43 +0000
committer: Joel Sherrill <joel.sherrill@OARcorp.com> 1995-08-17 19:36:43 +0000
commit: 4b374f36e7172d59d6d8c252973c1ef65637ecbb (patch)
tree: d6be1084c310d24004e9b056eebdac6c286a4f25 /testsuites/sptests
parent: added tty driver to simhppa (diff)
download: rtems-4b374f36e7172d59d6d8c252973c1ef65637ecbb.tar.bz2
42 files changed, 1355 insertions, 182 deletions
diff --git a/testsuites/sptests/sp01/system.h b/testsuites/sptests/sp01/system.h
index aa2c6d17e4..de19ed92d5 100644
--- a/testsuites/sptests/sp01/system.h
+++ b/testsuites/sptests/sp01/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:06:37 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp02/system.h b/testsuites/sptests/sp02/system.h
index c9d89a1e8b..1cb0c72f71 100644
--- a/testsuites/sptests/sp02/system.h
+++ b/testsuites/sptests/sp02/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:06:54 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp03/system.h b/testsuites/sptests/sp03/system.h
index aa2c6d17e4..1325ac0671 100644
--- a/testsuites/sptests/sp03/system.h
+++ b/testsuites/sptests/sp03/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:07:10 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp04/system.h b/testsuites/sptests/sp04/system.h
index aa2c6d17e4..3f300b8e74 100644
--- a/testsuites/sptests/sp04/system.h
+++ b/testsuites/sptests/sp04/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:07:24 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp04/task1.c b/testsuites/sptests/sp04/task1.c
index 8d0a620ec3..a200dc6f4e 100644
--- a/testsuites/sptests/sp04/task1.c
+++ b/testsuites/sptests/sp04/task1.c
@@ -16,11 +16,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  task1.c,v 1.2 1995/05/31 17:07:26 joel Exp
  */
 
 #include "system.h"
-#include "clockdrv.h"
 
 rtems_task Task_1(
   rtems_task_argument argument
diff --git a/testsuites/sptests/sp05/system.h b/testsuites/sptests/sp05/system.h
index aa2c6d17e4..93593fb521 100644
--- a/testsuites/sptests/sp05/system.h
+++ b/testsuites/sptests/sp05/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:07:40 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp06/system.h b/testsuites/sptests/sp06/system.h
index aa2c6d17e4..f3342fb23c 100644
--- a/testsuites/sptests/sp06/system.h
+++ b/testsuites/sptests/sp06/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:07:56 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h
index 01a3e7f765..0f2ec35aa4 100644
--- a/testsuites/sptests/sp07/system.h
+++ b/testsuites/sptests/sp07/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:08:12 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* constants */
 
diff --git a/testsuites/sptests/sp08/system.h b/testsuites/sptests/sp08/system.h
index dec5151b46..17b39f6214 100644
--- a/testsuites/sptests/sp08/system.h
+++ b/testsuites/sptests/sp08/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:08:40 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/sp09/screen05.c
index 9b091a407a..b036468562 100644
--- a/testsuites/sptests/sp09/screen05.c
+++ b/testsuites/sptests/sp09/screen05.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen05.c,v 1.2 1995/05/31 17:08:59 joel Exp
  */
 
 #include "system.h"
@@ -49,12 +49,14 @@ void Screen5()
   directive_failed( status, "rtems_semaphore_create" );
   puts( "TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_semaphore_create(
-     Semaphore_name[ 3 ],
-     1,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Junk_id
-  );
+  do {
+      status = rtems_semaphore_create(
+          Semaphore_name[ 3 ],
+          1,
+          RTEMS_DEFAULT_ATTRIBUTES,
+          &Junk_id);
+  } while (status == RTEMS_SUCCESSFUL);
+
   fatal_directive_status(
     status,
     RTEMS_TOO_MANY,
diff --git a/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c
index fd808f833d..0fa8b5c27b 100644
--- a/testsuites/sptests/sp09/screen07.c
+++ b/testsuites/sptests/sp09/screen07.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen07.c,v 1.2 1995/05/31 17:09:03 joel Exp
  */
 
 #include "system.h"
@@ -22,10 +22,11 @@
 void Screen7()
 {
   long              buffer[ 4 ];
+  rtems_unsigned32  size;
   rtems_unsigned32  count;
   rtems_status_code status;
 
-  status = rtems_message_queue_broadcast( 100, (long (*)[4]) buffer, &count );
+  status = rtems_message_queue_broadcast( 100, (long (*)[4]) buffer, 16, &count );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -36,6 +37,7 @@ void Screen7()
   status = rtems_message_queue_create(
     0,
     3,
+    16,
     RTEMS_DEFAULT_ATTRIBUTES,
     &Junk_id
   );
@@ -49,6 +51,7 @@ void Screen7()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     1,
+    16,
     RTEMS_GLOBAL,
     &Junk_id
   );
@@ -62,17 +65,19 @@ void Screen7()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     2,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL"
   );
 
   status = rtems_message_queue_create(
     Queue_name[ 2 ],
     1,
+    16,
     RTEMS_DEFAULT_ATTRIBUTES,
     &Junk_id
   );
@@ -118,6 +123,7 @@ void Screen7()
   status = rtems_message_queue_receive(
     100,
     (long (*)[4]) buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     0
   );
@@ -131,6 +137,7 @@ void Screen7()
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4]) buffer,
+    &size,
     RTEMS_NO_WAIT,
     RTEMS_NO_TIMEOUT
   );
@@ -145,6 +152,7 @@ void Screen7()
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4]) buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     3 * TICKS_PER_SECOND
   );
@@ -158,7 +166,7 @@ void Screen7()
     "TA1 - rtems_message_queue_receive - Q 1 - woke up with RTEMS_TIMEOUT"
   );
 
-  status = rtems_message_queue_send( 100, (long (*)[4]) buffer );
+  status = rtems_message_queue_send( 100, (long (*)[4]) buffer, 16 );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -166,15 +174,15 @@ void Screen7()
   );
   puts( "TA1 - rtems_message_queue_send - RTEMS_INVALID_ID" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
   fatal_directive_status(
     status,
     RTEMS_TOO_MANY,
diff --git a/testsuites/sptests/sp09/screen08.c b/testsuites/sptests/sp09/screen08.c
index 18c9b8d2d8..2431dbbd0e 100644
--- a/testsuites/sptests/sp09/screen08.c
+++ b/testsuites/sptests/sp09/screen08.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen08.c,v 1.2 1995/05/31 17:09:05 joel Exp
  */
 
 #include "system.h"
@@ -31,23 +31,24 @@ void Screen8()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     2,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL"
   );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   fatal_directive_status(
     status,
     RTEMS_TOO_MANY,
@@ -62,30 +63,35 @@ void Screen8()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     3,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL"
   );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
+  directive_failed( status, "rtems_message_queue_send successful" );
+  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL" );
+
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   fatal_directive_status(
     status,
-    RTEMS_UNSATISFIED,
+    RTEMS_TOO_MANY,
     "rtems_message_queue_send too many to limited queue"
   );
   puts(
-    "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_UNSATISFIED"
+    "TA1 - rtems_message_queue_send - BUFFER 4 TO Q 1 - RTEMS_TOO_MANY"
   );
 
   status = rtems_message_queue_delete( Queue_id[ 1 ] );
@@ -95,12 +101,13 @@ void Screen8()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     3,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL"
   );
 
   puts( "TA1 - rtems_task_start - start TA3 - RTEMS_SUCCESSFUL" );
diff --git a/testsuites/sptests/sp09/screen09.c b/testsuites/sptests/sp09/screen09.c
index 5c6eece679..444ead79a2 100644
--- a/testsuites/sptests/sp09/screen09.c
+++ b/testsuites/sptests/sp09/screen09.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen09.c,v 1.2 1995/05/31 17:09:07 joel Exp
  */
 
 #include "system.h"
diff --git a/testsuites/sptests/sp09/screen13.c b/testsuites/sptests/sp09/screen13.c
index c96adeec40..6e09d7196c 100644
--- a/testsuites/sptests/sp09/screen13.c
+++ b/testsuites/sptests/sp09/screen13.c
@@ -14,53 +14,52 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen13.c,v 1.2 1995/05/31 17:09:14 joel Exp
  */
 
 #include "system.h"
 
 void Screen13()
 {
-  rtems_unsigned32  result;
   rtems_time_of_day time;
   rtems_status_code status;
 
-  status = rtems_io_close( 0xffff, 0x0000, NULL, &result );
+  status = rtems_io_close( 0xffff, 0x0000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_close with bad major number"
   );
   puts( "TA1 - rtems_io_close - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_control( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_control( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_close with bad major number"
   );
   puts( "TA1 - rtems_io_control - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_initialize( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_initialize( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_initialize with bad major number"
   );
   puts( "TA1 - rtems_io_initialize - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_open( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_open( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_open with bad major number"
   );
   puts( "TA1 - rtems_io_open - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_read( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_read( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_read with bad major number"
   );
   puts( "TA1 - rtems_io_read - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_write( 0xffff, 0x0ffff, NULL, &result );
+  status = rtems_io_write( 0xffff, 0x0ffff, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index 158593dcba..e1c59f6397 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -96,7 +96,7 @@ TA2 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_broadcast - RTEMS_INVALID_ID
 TA1 - rtems_message_queue_create - Q 1 - RTEMS_INVALID_NAME
 TA1 - rtems_message_queue_create - Q 1 - RTEMS_MP_NOT_CONFIGURED
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_create - Q 2 - RTEMS_TOO_MANY
 TA1 - rtems_message_queue_delete - unknown RTEMS_INVALID_ID
 TA1 - rtems_message_queue_delete - local RTEMS_INVALID_ID
@@ -112,17 +112,18 @@ TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY
 <pause - screen 8>
 TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY
 TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_UNSATISFIED
+TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_send - BUFFER 4 TO Q 1 - RTEMS_TOO_MANY
 TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_task_start - start TA3 - RTEMS_SUCCESSFUL
 TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
 TA3 - rtems_message_queue_receive - Q 1 - RTEMS_WAIT FOREVER
diff --git a/testsuites/sptests/sp09/system.h b/testsuites/sptests/sp09/system.h
index aa2c6d17e4..b46c6c992d 100644
--- a/testsuites/sptests/sp09/system.h
+++ b/testsuites/sptests/sp09/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:09:17 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp09/task3.c b/testsuites/sptests/sp09/task3.c
index 8420c51f4d..7a953e2e26 100644
--- a/testsuites/sptests/sp09/task3.c
+++ b/testsuites/sptests/sp09/task3.c
@@ -17,7 +17,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  task3.c,v 1.2 1995/05/31 17:09:22 joel Exp
  */
 
 #include "system.h"
@@ -28,11 +28,13 @@ rtems_task Task_3(
 {
   rtems_status_code status;
   long              buffer[ 4 ];
+  rtems_unsigned32  size;
 
   puts( "TA3 - rtems_message_queue_receive - Q 1 - RTEMS_WAIT FOREVER" );
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
diff --git a/testsuites/sptests/sp11/system.h b/testsuites/sptests/sp11/system.h
index aa2c6d17e4..64ee01f47b 100644
--- a/testsuites/sptests/sp11/system.h
+++ b/testsuites/sptests/sp11/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:09:35 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp12/system.h b/testsuites/sptests/sp12/system.h
index aa2c6d17e4..b73a2bea97 100644
--- a/testsuites/sptests/sp12/system.h
+++ b/testsuites/sptests/sp12/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:09:55 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c
index 0629cdff21..121a8c9f3a 100644
--- a/testsuites/sptests/sp13/init.c
+++ b/testsuites/sptests/sp13/init.c
@@ -19,7 +19,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  init.c,v 1.2 1995/05/31 17:10:13 joel Exp
  */
 
 #include "system.h"
@@ -78,14 +78,15 @@ rtems_task Init(
 
   status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
   directive_failed( status, "rtems_task_start of TA3" );
-
+  
   Queue_name[ 1 ] = rtems_build_name( 'Q', '1', ' ', ' ' );
   Queue_name[ 2 ] = rtems_build_name( 'Q', '2', ' ', ' ' );
   Queue_name[ 3 ] = rtems_build_name( 'Q', '3', ' ', ' ' );
 
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
-    0,
+    100,
+    16,
     RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
@@ -94,14 +95,16 @@ rtems_task Init(
   status = rtems_message_queue_create(
     Queue_name[ 2 ],
     10,
-    RTEMS_PRIORITY | RTEMS_LIMIT,
+    16,
+    RTEMS_PRIORITY,
     &Queue_id[ 2 ]
   );
   directive_failed( status, "rtems_message_queue_create of Q2" );
 
   status = rtems_message_queue_create(
     Queue_name[ 3 ],
-    0,
+    100,
+    16,
     RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 3 ]
   );
diff --git a/testsuites/sptests/sp13/putbuff.c b/testsuites/sptests/sp13/putbuff.c
index e0bbfa4d7f..8105c19167 100644
--- a/testsuites/sptests/sp13/putbuff.c
+++ b/testsuites/sptests/sp13/putbuff.c
@@ -16,13 +16,11 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  putbuff.c,v 1.2 1995/05/31 17:10:15 joel Exp
  */
 
 #include "system.h"
 
-#define BUFFER_LENGTH 16
-
 void Put_buffer(
   long *buffer
 )
diff --git a/testsuites/sptests/sp13/sp13.scn b/testsuites/sptests/sp13/sp13.scn
index bd3af7da48..108f835410 100644
--- a/testsuites/sptests/sp13/sp13.scn
+++ b/testsuites/sptests/sp13/sp13.scn
@@ -63,4 +63,1040 @@ TA1 - rtems_message_queue_send until all message buffers consumed
 TA1 - all message buffers consumed
 TA1 - rtems_message_queue_flush - Q 3
 TA1 - 100 messages were flushed from Q 3
+<pause> 
+TA1 - create message queue of 20 bytes on queue 1
+TA1 - rtems_message_queue_delete - delete queue 1
+<pause> 
+TA1 - rtems_message_queue_create - variable sizes 
+<pause> 
+TA1 - rtems_message_queue_create and send - variable sizes 
+TA1 - message queue size: 1
+TA1 - message queue size: 2
+TA1 - message queue size: 3
+TA1 - message queue size: 4
+TA1 - message queue size: 5
+TA1 - message queue size: 6
+TA1 - message queue size: 7
+TA1 - message queue size: 8
+TA1 - message queue size: 9
+TA1 - message queue size: 10
+TA1 - message queue size: 11
+TA1 - message queue size: 12
+TA1 - message queue size: 13
+TA1 - message queue size: 14
+TA1 - message queue size: 15
+TA1 - message queue size: 16
+TA1 - message queue size: 17
+TA1 - message queue size: 18
+TA1 - message queue size: 19
+TA1 - message queue size: 20
+TA1 - message queue size: 21
+TA1 - message queue size: 22
+TA1 - message queue size: 23
+TA1 - message queue size: 24
+TA1 - message queue size: 25
+TA1 - message queue size: 26
+TA1 - message queue size: 27
+TA1 - message queue size: 28
+TA1 - message queue size: 29
+TA1 - message queue size: 30
+TA1 - message queue size: 31
+TA1 - message queue size: 32
+TA1 - message queue size: 33
+TA1 - message queue size: 34
+TA1 - message queue size: 35
+TA1 - message queue size: 36
+TA1 - message queue size: 37
+TA1 - message queue size: 38
+TA1 - message queue size: 39
+TA1 - message queue size: 40
+TA1 - message queue size: 41
+TA1 - message queue size: 42
+TA1 - message queue size: 43
+TA1 - message queue size: 44
+TA1 - message queue size: 45
+TA1 - message queue size: 46
+TA1 - message queue size: 47
+TA1 - message queue size: 48
+TA1 - message queue size: 49
+TA1 - message queue size: 50
+TA1 - message queue size: 51
+TA1 - message queue size: 52
+TA1 - message queue size: 53
+TA1 - message queue size: 54
+TA1 - message queue size: 55
+TA1 - message queue size: 56
+TA1 - message queue size: 57
+TA1 - message queue size: 58
+TA1 - message queue size: 59
+TA1 - message queue size: 60
+TA1 - message queue size: 61
+TA1 - message queue size: 62
+TA1 - message queue size: 63
+TA1 - message queue size: 64
+TA1 - message queue size: 65
+TA1 - message queue size: 66
+TA1 - message queue size: 67
+TA1 - message queue size: 68
+TA1 - message queue size: 69
+TA1 - message queue size: 70
+TA1 - message queue size: 71
+TA1 - message queue size: 72
+TA1 - message queue size: 73
+TA1 - message queue size: 74
+TA1 - message queue size: 75
+TA1 - message queue size: 76
+TA1 - message queue size: 77
+TA1 - message queue size: 78
+TA1 - message queue size: 79
+TA1 - message queue size: 80
+TA1 - message queue size: 81
+TA1 - message queue size: 82
+TA1 - message queue size: 83
+TA1 - message queue size: 84
+TA1 - message queue size: 85
+TA1 - message queue size: 86
+TA1 - message queue size: 87
+TA1 - message queue size: 88
+TA1 - message queue size: 89
+TA1 - message queue size: 90
+TA1 - message queue size: 91
+TA1 - message queue size: 92
+TA1 - message queue size: 93
+TA1 - message queue size: 94
+TA1 - message queue size: 95
+TA1 - message queue size: 96
+TA1 - message queue size: 97
+TA1 - message queue size: 98
+TA1 - message queue size: 99
+TA1 - message queue size: 100
+TA1 - message queue size: 101
+TA1 - message queue size: 102
+TA1 - message queue size: 103
+TA1 - message queue size: 104
+TA1 - message queue size: 105
+TA1 - message queue size: 106
+TA1 - message queue size: 107
+TA1 - message queue size: 108
+TA1 - message queue size: 109
+TA1 - message queue size: 110
+TA1 - message queue size: 111
+TA1 - message queue size: 112
+TA1 - message queue size: 113
+TA1 - message queue size: 114
+TA1 - message queue size: 115
+TA1 - message queue size: 116
+TA1 - message queue size: 117
+TA1 - message queue size: 118
+TA1 - message queue size: 119
+TA1 - message queue size: 120
+TA1 - message queue size: 121
+TA1 - message queue size: 122
+TA1 - message queue size: 123
+TA1 - message queue size: 124
+TA1 - message queue size: 125
+TA1 - message queue size: 126
+TA1 - message queue size: 127
+TA1 - message queue size: 128
+TA1 - message queue size: 129
+TA1 - message queue size: 130
+TA1 - message queue size: 131
+TA1 - message queue size: 132
+TA1 - message queue size: 133
+TA1 - message queue size: 134
+TA1 - message queue size: 135
+TA1 - message queue size: 136
+TA1 - message queue size: 137
+TA1 - message queue size: 138
+TA1 - message queue size: 139
+TA1 - message queue size: 140
+TA1 - message queue size: 141
+TA1 - message queue size: 142
+TA1 - message queue size: 143
+TA1 - message queue size: 144
+TA1 - message queue size: 145
+TA1 - message queue size: 146
+TA1 - message queue size: 147
+TA1 - message queue size: 148
+TA1 - message queue size: 149
+TA1 - message queue size: 150
+TA1 - message queue size: 151
+TA1 - message queue size: 152
+TA1 - message queue size: 153
+TA1 - message queue size: 154
+TA1 - message queue size: 155
+TA1 - message queue size: 156
+TA1 - message queue size: 157
+TA1 - message queue size: 158
+TA1 - message queue size: 159
+TA1 - message queue size: 160
+TA1 - message queue size: 161
+TA1 - message queue size: 162
+TA1 - message queue size: 163
+TA1 - message queue size: 164
+TA1 - message queue size: 165
+TA1 - message queue size: 166
+TA1 - message queue size: 167
+TA1 - message queue size: 168
+TA1 - message queue size: 169
+TA1 - message queue size: 170
+TA1 - message queue size: 171
+TA1 - message queue size: 172
+TA1 - message queue size: 173
+TA1 - message queue size: 174
+TA1 - message queue size: 175
+TA1 - message queue size: 176
+TA1 - message queue size: 177
+TA1 - message queue size: 178
+TA1 - message queue size: 179
+TA1 - message queue size: 180
+TA1 - message queue size: 181
+TA1 - message queue size: 182
+TA1 - message queue size: 183
+TA1 - message queue size: 184
+TA1 - message queue size: 185
+TA1 - message queue size: 186
+TA1 - message queue size: 187
+TA1 - message queue size: 188
+TA1 - message queue size: 189
+TA1 - message queue size: 190
+TA1 - message queue size: 191
+TA1 - message queue size: 192
+TA1 - message queue size: 193
+TA1 - message queue size: 194
+TA1 - message queue size: 195
+TA1 - message queue size: 196
+TA1 - message queue size: 197
+TA1 - message queue size: 198
+TA1 - message queue size: 199
+TA1 - message queue size: 200
+TA1 - message queue size: 201
+TA1 - message queue size: 202
+TA1 - message queue size: 203
+TA1 - message queue size: 204
+TA1 - message queue size: 205
+TA1 - message queue size: 206
+TA1 - message queue size: 207
+TA1 - message queue size: 208
+TA1 - message queue size: 209
+TA1 - message queue size: 210
+TA1 - message queue size: 211
+TA1 - message queue size: 212
+TA1 - message queue size: 213
+TA1 - message queue size: 214
+TA1 - message queue size: 215
+TA1 - message queue size: 216
+TA1 - message queue size: 217
+TA1 - message queue size: 218
+TA1 - message queue size: 219
+TA1 - message queue size: 220
+TA1 - message queue size: 221
+TA1 - message queue size: 222
+TA1 - message queue size: 223
+TA1 - message queue size: 224
+TA1 - message queue size: 225
+TA1 - message queue size: 226
+TA1 - message queue size: 227
+TA1 - message queue size: 228
+TA1 - message queue size: 229
+TA1 - message queue size: 230
+TA1 - message queue size: 231
+TA1 - message queue size: 232
+TA1 - message queue size: 233
+TA1 - message queue size: 234
+TA1 - message queue size: 235
+TA1 - message queue size: 236
+TA1 - message queue size: 237
+TA1 - message queue size: 238
+TA1 - message queue size: 239
+TA1 - message queue size: 240
+TA1 - message queue size: 241
+TA1 - message queue size: 242
+TA1 - message queue size: 243
+TA1 - message queue size: 244
+TA1 - message queue size: 245
+TA1 - message queue size: 246
+TA1 - message queue size: 247
+TA1 - message queue size: 248
+TA1 - message queue size: 249
+TA1 - message queue size: 250
+TA1 - message queue size: 251
+TA1 - message queue size: 252
+TA1 - message queue size: 253
+TA1 - message queue size: 254
+TA1 - message queue size: 255
+TA1 - message queue size: 256
+TA1 - message queue size: 257
+TA1 - message queue size: 258
+TA1 - message queue size: 259
+TA1 - message queue size: 260
+TA1 - message queue size: 261
+TA1 - message queue size: 262
+TA1 - message queue size: 263
+TA1 - message queue size: 264
+TA1 - message queue size: 265
+TA1 - message queue size: 266
+TA1 - message queue size: 267
+TA1 - message queue size: 268
+TA1 - message queue size: 269
+TA1 - message queue size: 270
+TA1 - message queue size: 271
+TA1 - message queue size: 272
+TA1 - message queue size: 273
+TA1 - message queue size: 274
+TA1 - message queue size: 275
+TA1 - message queue size: 276
+TA1 - message queue size: 277
+TA1 - message queue size: 278
+TA1 - message queue size: 279
+TA1 - message queue size: 280
+TA1 - message queue size: 281
+TA1 - message queue size: 282
+TA1 - message queue size: 283
+TA1 - message queue size: 284
+TA1 - message queue size: 285
+TA1 - message queue size: 286
+TA1 - message queue size: 287
+TA1 - message queue size: 288
+TA1 - message queue size: 289
+TA1 - message queue size: 290
+TA1 - message queue size: 291
+TA1 - message queue size: 292
+TA1 - message queue size: 293
+TA1 - message queue size: 294
+TA1 - message queue size: 295
+TA1 - message queue size: 296
+TA1 - message queue size: 297
+TA1 - message queue size: 298
+TA1 - message queue size: 299
+TA1 - message queue size: 300
+TA1 - message queue size: 301
+TA1 - message queue size: 302
+TA1 - message queue size: 303
+TA1 - message queue size: 304
+TA1 - message queue size: 305
+TA1 - message queue size: 306
+TA1 - message queue size: 307
+TA1 - message queue size: 308
+TA1 - message queue size: 309
+TA1 - message queue size: 310
+TA1 - message queue size: 311
+TA1 - message queue size: 312
+TA1 - message queue size: 313
+TA1 - message queue size: 314
+TA1 - message queue size: 315
+TA1 - message queue size: 316
+TA1 - message queue size: 317
+TA1 - message queue size: 318
+TA1 - message queue size: 319
+TA1 - message queue size: 320
+TA1 - message queue size: 321
+TA1 - message queue size: 322
+TA1 - message queue size: 323
+TA1 - message queue size: 324
+TA1 - message queue size: 325
+TA1 - message queue size: 326
+TA1 - message queue size: 327
+TA1 - message queue size: 328
+TA1 - message queue size: 329
+TA1 - message queue size: 330
+TA1 - message queue size: 331
+TA1 - message queue size: 332
+TA1 - message queue size: 333
+TA1 - message queue size: 334
+TA1 - message queue size: 335
+TA1 - message queue size: 336
+TA1 - message queue size: 337
+TA1 - message queue size: 338
+TA1 - message queue size: 339
+TA1 - message queue size: 340
+TA1 - message queue size: 341
+TA1 - message queue size: 342
+TA1 - message queue size: 343
+TA1 - message queue size: 344
+TA1 - message queue size: 345
+TA1 - message queue size: 346
+TA1 - message queue size: 347
+TA1 - message queue size: 348
+TA1 - message queue size: 349
+TA1 - message queue size: 350
+TA1 - message queue size: 351
+TA1 - message queue size: 352
+TA1 - message queue size: 353
+TA1 - message queue size: 354
+TA1 - message queue size: 355
+TA1 - message queue size: 356
+TA1 - message queue size: 357
+TA1 - message queue size: 358
+TA1 - message queue size: 359
+TA1 - message queue size: 360
+TA1 - message queue size: 361
+TA1 - message queue size: 362
+TA1 - message queue size: 363
+TA1 - message queue size: 364
+TA1 - message queue size: 365
+TA1 - message queue size: 366
+TA1 - message queue size: 367
+TA1 - message queue size: 368
+TA1 - message queue size: 369
+TA1 - message queue size: 370
+TA1 - message queue size: 371
+TA1 - message queue size: 372
+TA1 - message queue size: 373
+TA1 - message queue size: 374
+TA1 - message queue size: 375
+TA1 - message queue size: 376
+TA1 - message queue size: 377
+TA1 - message queue size: 378
+TA1 - message queue size: 379
+TA1 - message queue size: 380
+TA1 - message queue size: 381
+TA1 - message queue size: 382
+TA1 - message queue size: 383
+TA1 - message queue size: 384
+TA1 - message queue size: 385
+TA1 - message queue size: 386
+TA1 - message queue size: 387
+TA1 - message queue size: 388
+TA1 - message queue size: 389
+TA1 - message queue size: 390
+TA1 - message queue size: 391
+TA1 - message queue size: 392
+TA1 - message queue size: 393
+TA1 - message queue size: 394
+TA1 - message queue size: 395
+TA1 - message queue size: 396
+TA1 - message queue size: 397
+TA1 - message queue size: 398
+TA1 - message queue size: 399
+TA1 - message queue size: 400
+TA1 - message queue size: 401
+TA1 - message queue size: 402
+TA1 - message queue size: 403
+TA1 - message queue size: 404
+TA1 - message queue size: 405
+TA1 - message queue size: 406
+TA1 - message queue size: 407
+TA1 - message queue size: 408
+TA1 - message queue size: 409
+TA1 - message queue size: 410
+TA1 - message queue size: 411
+TA1 - message queue size: 412
+TA1 - message queue size: 413
+TA1 - message queue size: 414
+TA1 - message queue size: 415
+TA1 - message queue size: 416
+TA1 - message queue size: 417
+TA1 - message queue size: 418
+TA1 - message queue size: 419
+TA1 - message queue size: 420
+TA1 - message queue size: 421
+TA1 - message queue size: 422
+TA1 - message queue size: 423
+TA1 - message queue size: 424
+TA1 - message queue size: 425
+TA1 - message queue size: 426
+TA1 - message queue size: 427
+TA1 - message queue size: 428
+TA1 - message queue size: 429
+TA1 - message queue size: 430
+TA1 - message queue size: 431
+TA1 - message queue size: 432
+TA1 - message queue size: 433
+TA1 - message queue size: 434
+TA1 - message queue size: 435
+TA1 - message queue size: 436
+TA1 - message queue size: 437
+TA1 - message queue size: 438
+TA1 - message queue size: 439
+TA1 - message queue size: 440
+TA1 - message queue size: 441
+TA1 - message queue size: 442
+TA1 - message queue size: 443
+TA1 - message queue size: 444
+TA1 - message queue size: 445
+TA1 - message queue size: 446
+TA1 - message queue size: 447
+TA1 - message queue size: 448
+TA1 - message queue size: 449
+TA1 - message queue size: 450
+TA1 - message queue size: 451
+TA1 - message queue size: 452
+TA1 - message queue size: 453
+TA1 - message queue size: 454
+TA1 - message queue size: 455
+TA1 - message queue size: 456
+TA1 - message queue size: 457
+TA1 - message queue size: 458
+TA1 - message queue size: 459
+TA1 - message queue size: 460
+TA1 - message queue size: 461
+TA1 - message queue size: 462
+TA1 - message queue size: 463
+TA1 - message queue size: 464
+TA1 - message queue size: 465
+TA1 - message queue size: 466
+TA1 - message queue size: 467
+TA1 - message queue size: 468
+TA1 - message queue size: 469
+TA1 - message queue size: 470
+TA1 - message queue size: 471
+TA1 - message queue size: 472
+TA1 - message queue size: 473
+TA1 - message queue size: 474
+TA1 - message queue size: 475
+TA1 - message queue size: 476
+TA1 - message queue size: 477
+TA1 - message queue size: 478
+TA1 - message queue size: 479
+TA1 - message queue size: 480
+TA1 - message queue size: 481
+TA1 - message queue size: 482
+TA1 - message queue size: 483
+TA1 - message queue size: 484
+TA1 - message queue size: 485
+TA1 - message queue size: 486
+TA1 - message queue size: 487
+TA1 - message queue size: 488
+TA1 - message queue size: 489
+TA1 - message queue size: 490
+TA1 - message queue size: 491
+TA1 - message queue size: 492
+TA1 - message queue size: 493
+TA1 - message queue size: 494
+TA1 - message queue size: 495
+TA1 - message queue size: 496
+TA1 - message queue size: 497
+TA1 - message queue size: 498
+TA1 - message queue size: 499
+TA1 - message queue size: 500
+TA1 - message queue size: 501
+TA1 - message queue size: 502
+TA1 - message queue size: 503
+TA1 - message queue size: 504
+TA1 - message queue size: 505
+TA1 - message queue size: 506
+TA1 - message queue size: 507
+TA1 - message queue size: 508
+TA1 - message queue size: 509
+TA1 - message queue size: 510
+TA1 - message queue size: 511
+TA1 - message queue size: 512
+TA1 - message queue size: 513
+TA1 - message queue size: 514
+TA1 - message queue size: 515
+TA1 - message queue size: 516
+TA1 - message queue size: 517
+TA1 - message queue size: 518
+TA1 - message queue size: 519
+TA1 - message queue size: 520
+TA1 - message queue size: 521
+TA1 - message queue size: 522
+TA1 - message queue size: 523
+TA1 - message queue size: 524
+TA1 - message queue size: 525
+TA1 - message queue size: 526
+TA1 - message queue size: 527
+TA1 - message queue size: 528
+TA1 - message queue size: 529
+TA1 - message queue size: 530
+TA1 - message queue size: 531
+TA1 - message queue size: 532
+TA1 - message queue size: 533
+TA1 - message queue size: 534
+TA1 - message queue size: 535
+TA1 - message queue size: 536
+TA1 - message queue size: 537
+TA1 - message queue size: 538
+TA1 - message queue size: 539
+TA1 - message queue size: 540
+TA1 - message queue size: 541
+TA1 - message queue size: 542
+TA1 - message queue size: 543
+TA1 - message queue size: 544
+TA1 - message queue size: 545
+TA1 - message queue size: 546
+TA1 - message queue size: 547
+TA1 - message queue size: 548
+TA1 - message queue size: 549
+TA1 - message queue size: 550
+TA1 - message queue size: 551
+TA1 - message queue size: 552
+TA1 - message queue size: 553
+TA1 - message queue size: 554
+TA1 - message queue size: 555
+TA1 - message queue size: 556
+TA1 - message queue size: 557
+TA1 - message queue size: 558
+TA1 - message queue size: 559
+TA1 - message queue size: 560
+TA1 - message queue size: 561
+TA1 - message queue size: 562
+TA1 - message queue size: 563
+TA1 - message queue size: 564
+TA1 - message queue size: 565
+TA1 - message queue size: 566
+TA1 - message queue size: 567
+TA1 - message queue size: 568
+TA1 - message queue size: 569
+TA1 - message queue size: 570
+TA1 - message queue size: 571
+TA1 - message queue size: 572
+TA1 - message queue size: 573
+TA1 - message queue size: 574
+TA1 - message queue size: 575
+TA1 - message queue size: 576
+TA1 - message queue size: 577
+TA1 - message queue size: 578
+TA1 - message queue size: 579
+TA1 - message queue size: 580
+TA1 - message queue size: 581
+TA1 - message queue size: 582
+TA1 - message queue size: 583
+TA1 - message queue size: 584
+TA1 - message queue size: 585
+TA1 - message queue size: 586
+TA1 - message queue size: 587
+TA1 - message queue size: 588
+TA1 - message queue size: 589
+TA1 - message queue size: 590
+TA1 - message queue size: 591
+TA1 - message queue size: 592
+TA1 - message queue size: 593
+TA1 - message queue size: 594
+TA1 - message queue size: 595
+TA1 - message queue size: 596
+TA1 - message queue size: 597
+TA1 - message queue size: 598
+TA1 - message queue size: 599
+TA1 - message queue size: 600
+TA1 - message queue size: 601
+TA1 - message queue size: 602
+TA1 - message queue size: 603
+TA1 - message queue size: 604
+TA1 - message queue size: 605
+TA1 - message queue size: 606
+TA1 - message queue size: 607
+TA1 - message queue size: 608
+TA1 - message queue size: 609
+TA1 - message queue size: 610
+TA1 - message queue size: 611
+TA1 - message queue size: 612
+TA1 - message queue size: 613
+TA1 - message queue size: 614
+TA1 - message queue size: 615
+TA1 - message queue size: 616
+TA1 - message queue size: 617
+TA1 - message queue size: 618
+TA1 - message queue size: 619
+TA1 - message queue size: 620
+TA1 - message queue size: 621
+TA1 - message queue size: 622
+TA1 - message queue size: 623
+TA1 - message queue size: 624
+TA1 - message queue size: 625
+TA1 - message queue size: 626
+TA1 - message queue size: 627
+TA1 - message queue size: 628
+TA1 - message queue size: 629
+TA1 - message queue size: 630
+TA1 - message queue size: 631
+TA1 - message queue size: 632
+TA1 - message queue size: 633
+TA1 - message queue size: 634
+TA1 - message queue size: 635
+TA1 - message queue size: 636
+TA1 - message queue size: 637
+TA1 - message queue size: 638
+TA1 - message queue size: 639
+TA1 - message queue size: 640
+TA1 - message queue size: 641
+TA1 - message queue size: 642
+TA1 - message queue size: 643
+TA1 - message queue size: 644
+TA1 - message queue size: 645
+TA1 - message queue size: 646
+TA1 - message queue size: 647
+TA1 - message queue size: 648
+TA1 - message queue size: 649
+TA1 - message queue size: 650
+TA1 - message queue size: 651
+TA1 - message queue size: 652
+TA1 - message queue size: 653
+TA1 - message queue size: 654
+TA1 - message queue size: 655
+TA1 - message queue size: 656
+TA1 - message queue size: 657
+TA1 - message queue size: 658
+TA1 - message queue size: 659
+TA1 - message queue size: 660
+TA1 - message queue size: 661
+TA1 - message queue size: 662
+TA1 - message queue size: 663
+TA1 - message queue size: 664
+TA1 - message queue size: 665
+TA1 - message queue size: 666
+TA1 - message queue size: 667
+TA1 - message queue size: 668
+TA1 - message queue size: 669
+TA1 - message queue size: 670
+TA1 - message queue size: 671
+TA1 - message queue size: 672
+TA1 - message queue size: 673
+TA1 - message queue size: 674
+TA1 - message queue size: 675
+TA1 - message queue size: 676
+TA1 - message queue size: 677
+TA1 - message queue size: 678
+TA1 - message queue size: 679
+TA1 - message queue size: 680
+TA1 - message queue size: 681
+TA1 - message queue size: 682
+TA1 - message queue size: 683
+TA1 - message queue size: 684
+TA1 - message queue size: 685
+TA1 - message queue size: 686
+TA1 - message queue size: 687
+TA1 - message queue size: 688
+TA1 - message queue size: 689
+TA1 - message queue size: 690
+TA1 - message queue size: 691
+TA1 - message queue size: 692
+TA1 - message queue size: 693
+TA1 - message queue size: 694
+TA1 - message queue size: 695
+TA1 - message queue size: 696
+TA1 - message queue size: 697
+TA1 - message queue size: 698
+TA1 - message queue size: 699
+TA1 - message queue size: 700
+TA1 - message queue size: 701
+TA1 - message queue size: 702
+TA1 - message queue size: 703
+TA1 - message queue size: 704
+TA1 - message queue size: 705
+TA1 - message queue size: 706
+TA1 - message queue size: 707
+TA1 - message queue size: 708
+TA1 - message queue size: 709
+TA1 - message queue size: 710
+TA1 - message queue size: 711
+TA1 - message queue size: 712
+TA1 - message queue size: 713
+TA1 - message queue size: 714
+TA1 - message queue size: 715
+TA1 - message queue size: 716
+TA1 - message queue size: 717
+TA1 - message queue size: 718
+TA1 - message queue size: 719
+TA1 - message queue size: 720
+TA1 - message queue size: 721
+TA1 - message queue size: 722
+TA1 - message queue size: 723
+TA1 - message queue size: 724
+TA1 - message queue size: 725
+TA1 - message queue size: 726
+TA1 - message queue size: 727
+TA1 - message queue size: 728
+TA1 - message queue size: 729
+TA1 - message queue size: 730
+TA1 - message queue size: 731
+TA1 - message queue size: 732
+TA1 - message queue size: 733
+TA1 - message queue size: 734
+TA1 - message queue size: 735
+TA1 - message queue size: 736
+TA1 - message queue size: 737
+TA1 - message queue size: 738
+TA1 - message queue size: 739
+TA1 - message queue size: 740
+TA1 - message queue size: 741
+TA1 - message queue size: 742
+TA1 - message queue size: 743
+TA1 - message queue size: 744
+TA1 - message queue size: 745
+TA1 - message queue size: 746
+TA1 - message queue size: 747
+TA1 - message queue size: 748
+TA1 - message queue size: 749
+TA1 - message queue size: 750
+TA1 - message queue size: 751
+TA1 - message queue size: 752
+TA1 - message queue size: 753
+TA1 - message queue size: 754
+TA1 - message queue size: 755
+TA1 - message queue size: 756
+TA1 - message queue size: 757
+TA1 - message queue size: 758
+TA1 - message queue size: 759
+TA1 - message queue size: 760
+TA1 - message queue size: 761
+TA1 - message queue size: 762
+TA1 - message queue size: 763
+TA1 - message queue size: 764
+TA1 - message queue size: 765
+TA1 - message queue size: 766
+TA1 - message queue size: 767
+TA1 - message queue size: 768
+TA1 - message queue size: 769
+TA1 - message queue size: 770
+TA1 - message queue size: 771
+TA1 - message queue size: 772
+TA1 - message queue size: 773
+TA1 - message queue size: 774
+TA1 - message queue size: 775
+TA1 - message queue size: 776
+TA1 - message queue size: 777
+TA1 - message queue size: 778
+TA1 - message queue size: 779
+TA1 - message queue size: 780
+TA1 - message queue size: 781
+TA1 - message queue size: 782
+TA1 - message queue size: 783
+TA1 - message queue size: 784
+TA1 - message queue size: 785
+TA1 - message queue size: 786
+TA1 - message queue size: 787
+TA1 - message queue size: 788
+TA1 - message queue size: 789
+TA1 - message queue size: 790
+TA1 - message queue size: 791
+TA1 - message queue size: 792
+TA1 - message queue size: 793
+TA1 - message queue size: 794
+TA1 - message queue size: 795
+TA1 - message queue size: 796
+TA1 - message queue size: 797
+TA1 - message queue size: 798
+TA1 - message queue size: 799
+TA1 - message queue size: 800
+TA1 - message queue size: 801
+TA1 - message queue size: 802
+TA1 - message queue size: 803
+TA1 - message queue size: 804
+TA1 - message queue size: 805
+TA1 - message queue size: 806
+TA1 - message queue size: 807
+TA1 - message queue size: 808
+TA1 - message queue size: 809
+TA1 - message queue size: 810
+TA1 - message queue size: 811
+TA1 - message queue size: 812
+TA1 - message queue size: 813
+TA1 - message queue size: 814
+TA1 - message queue size: 815
+TA1 - message queue size: 816
+TA1 - message queue size: 817
+TA1 - message queue size: 818
+TA1 - message queue size: 819
+TA1 - message queue size: 820
+TA1 - message queue size: 821
+TA1 - message queue size: 822
+TA1 - message queue size: 823
+TA1 - message queue size: 824
+TA1 - message queue size: 825
+TA1 - message queue size: 826
+TA1 - message queue size: 827
+TA1 - message queue size: 828
+TA1 - message queue size: 829
+TA1 - message queue size: 830
+TA1 - message queue size: 831
+TA1 - message queue size: 832
+TA1 - message queue size: 833
+TA1 - message queue size: 834
+TA1 - message queue size: 835
+TA1 - message queue size: 836
+TA1 - message queue size: 837
+TA1 - message queue size: 838
+TA1 - message queue size: 839
+TA1 - message queue size: 840
+TA1 - message queue size: 841
+TA1 - message queue size: 842
+TA1 - message queue size: 843
+TA1 - message queue size: 844
+TA1 - message queue size: 845
+TA1 - message queue size: 846
+TA1 - message queue size: 847
+TA1 - message queue size: 848
+TA1 - message queue size: 849
+TA1 - message queue size: 850
+TA1 - message queue size: 851
+TA1 - message queue size: 852
+TA1 - message queue size: 853
+TA1 - message queue size: 854
+TA1 - message queue size: 855
+TA1 - message queue size: 856
+TA1 - message queue size: 857
+TA1 - message queue size: 858
+TA1 - message queue size: 859
+TA1 - message queue size: 860
+TA1 - message queue size: 861
+TA1 - message queue size: 862
+TA1 - message queue size: 863
+TA1 - message queue size: 864
+TA1 - message queue size: 865
+TA1 - message queue size: 866
+TA1 - message queue size: 867
+TA1 - message queue size: 868
+TA1 - message queue size: 869
+TA1 - message queue size: 870
+TA1 - message queue size: 871
+TA1 - message queue size: 872
+TA1 - message queue size: 873
+TA1 - message queue size: 874
+TA1 - message queue size: 875
+TA1 - message queue size: 876
+TA1 - message queue size: 877
+TA1 - message queue size: 878
+TA1 - message queue size: 879
+TA1 - message queue size: 880
+TA1 - message queue size: 881
+TA1 - message queue size: 882
+TA1 - message queue size: 883
+TA1 - message queue size: 884
+TA1 - message queue size: 885
+TA1 - message queue size: 886
+TA1 - message queue size: 887
+TA1 - message queue size: 888
+TA1 - message queue size: 889
+TA1 - message queue size: 890
+TA1 - message queue size: 891
+TA1 - message queue size: 892
+TA1 - message queue size: 893
+TA1 - message queue size: 894
+TA1 - message queue size: 895
+TA1 - message queue size: 896
+TA1 - message queue size: 897
+TA1 - message queue size: 898
+TA1 - message queue size: 899
+TA1 - message queue size: 900
+TA1 - message queue size: 901
+TA1 - message queue size: 902
+TA1 - message queue size: 903
+TA1 - message queue size: 904
+TA1 - message queue size: 905
+TA1 - message queue size: 906
+TA1 - message queue size: 907
+TA1 - message queue size: 908
+TA1 - message queue size: 909
+TA1 - message queue size: 910
+TA1 - message queue size: 911
+TA1 - message queue size: 912
+TA1 - message queue size: 913
+TA1 - message queue size: 914
+TA1 - message queue size: 915
+TA1 - message queue size: 916
+TA1 - message queue size: 917
+TA1 - message queue size: 918
+TA1 - message queue size: 919
+TA1 - message queue size: 920
+TA1 - message queue size: 921
+TA1 - message queue size: 922
+TA1 - message queue size: 923
+TA1 - message queue size: 924
+TA1 - message queue size: 925
+TA1 - message queue size: 926
+TA1 - message queue size: 927
+TA1 - message queue size: 928
+TA1 - message queue size: 929
+TA1 - message queue size: 930
+TA1 - message queue size: 931
+TA1 - message queue size: 932
+TA1 - message queue size: 933
+TA1 - message queue size: 934
+TA1 - message queue size: 935
+TA1 - message queue size: 936
+TA1 - message queue size: 937
+TA1 - message queue size: 938
+TA1 - message queue size: 939
+TA1 - message queue size: 940
+TA1 - message queue size: 941
+TA1 - message queue size: 942
+TA1 - message queue size: 943
+TA1 - message queue size: 944
+TA1 - message queue size: 945
+TA1 - message queue size: 946
+TA1 - message queue size: 947
+TA1 - message queue size: 948
+TA1 - message queue size: 949
+TA1 - message queue size: 950
+TA1 - message queue size: 951
+TA1 - message queue size: 952
+TA1 - message queue size: 953
+TA1 - message queue size: 954
+TA1 - message queue size: 955
+TA1 - message queue size: 956
+TA1 - message queue size: 957
+TA1 - message queue size: 958
+TA1 - message queue size: 959
+TA1 - message queue size: 960
+TA1 - message queue size: 961
+TA1 - message queue size: 962
+TA1 - message queue size: 963
+TA1 - message queue size: 964
+TA1 - message queue size: 965
+TA1 - message queue size: 966
+TA1 - message queue size: 967
+TA1 - message queue size: 968
+TA1 - message queue size: 969
+TA1 - message queue size: 970
+TA1 - message queue size: 971
+TA1 - message queue size: 972
+TA1 - message queue size: 973
+TA1 - message queue size: 974
+TA1 - message queue size: 975
+TA1 - message queue size: 976
+TA1 - message queue size: 977
+TA1 - message queue size: 978
+TA1 - message queue size: 979
+TA1 - message queue size: 980
+TA1 - message queue size: 981
+TA1 - message queue size: 982
+TA1 - message queue size: 983
+TA1 - message queue size: 984
+TA1 - message queue size: 985
+TA1 - message queue size: 986
+TA1 - message queue size: 987
+TA1 - message queue size: 988
+TA1 - message queue size: 989
+TA1 - message queue size: 990
+TA1 - message queue size: 991
+TA1 - message queue size: 992
+TA1 - message queue size: 993
+TA1 - message queue size: 994
+TA1 - message queue size: 995
+TA1 - message queue size: 996
+TA1 - message queue size: 997
+TA1 - message queue size: 998
+TA1 - message queue size: 999
+TA1 - message queue size: 1000
+TA1 - message queue size: 1001
+TA1 - message queue size: 1002
+TA1 - message queue size: 1003
+TA1 - message queue size: 1004
+TA1 - message queue size: 1005
+TA1 - message queue size: 1006
+TA1 - message queue size: 1007
+TA1 - message queue size: 1008
+TA1 - message queue size: 1009
+TA1 - message queue size: 1010
+TA1 - message queue size: 1011
+TA1 - message queue size: 1012
+TA1 - message queue size: 1013
+TA1 - message queue size: 1014
+TA1 - message queue size: 1015
+TA1 - message queue size: 1016
+TA1 - message queue size: 1017
+TA1 - message queue size: 1018
+TA1 - message queue size: 1019
+TA1 - message queue size: 1020
+TA1 - message queue size: 1021
+TA1 - message queue size: 1022
+TA1 - message queue size: 1023
+TA1 - message queue size: 1024
+TA1 - message queue size: 1025
+TA1 - message queue size: 1026
+TA1 - message queue size: 1027
+TA1 - message queue size: 1028
+TA1 - message queue size: 1029
 *** END OF TEST 13 ***
diff --git a/testsuites/sptests/sp13/system.h b/testsuites/sptests/sp13/system.h
index aa2c6d17e4..c523829168 100644
--- a/testsuites/sptests/sp13/system.h
+++ b/testsuites/sptests/sp13/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:10:19 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
index 89c0619025..7ba54eabbf 100644
--- a/testsuites/sptests/sp13/task1.c
+++ b/testsuites/sptests/sp13/task1.c
@@ -15,23 +15,48 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  task1.c,v 1.2 1995/05/31 17:10:20 joel Exp
  */
 
 #include "system.h"
+#include <string.h>             /* for memcmp */
 
 extern rtems_configuration_table BSP_Configuration;
 
+char    big_send_buffer[2048];
+char    big_receive_buffer[2048];
+
+long    buffer[ 4 ];
+
+void dope_buffer(unsigned char *buff,
+                 int   buff_size,
+                 unsigned32 v)
+{
+    int i;
+    unsigned char ch;
+
+    ch = (' ' + (v % (0x7f - ' ')));
+    
+    for (i=0; i<buff_size; i++)
+    {
+        *buff++ = ch++;
+        if (ch >= 0x7f)
+            ch = ' ';
+    }
+}
+
 rtems_task Task_1(
   rtems_task_argument argument
 )
 {
   rtems_id          qid;
-  long              buffer[ 4 ];
   rtems_unsigned32  index;
   rtems_unsigned32  count;
   rtems_status_code status;
-
+  rtems_unsigned32  size;
+  rtems_unsigned32  queue_size;
+  char             *cp;
+  
   status = rtems_message_queue_ident(
     Queue_name[ 1 ],
     RTEMS_SEARCH_ALL_NODES,
@@ -42,12 +67,12 @@ rtems_task Task_1(
 
   Fill_buffer( "BUFFER 1 TO Q 1", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1" );
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   Fill_buffer( "BUFFER 2 TO Q 1", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1" );
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
@@ -56,7 +81,7 @@ rtems_task Task_1(
 
   Fill_buffer( "BUFFER 3 TO Q 1", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1" );
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
@@ -67,14 +92,15 @@ pause();
 
   Fill_buffer( "BUFFER 1 TO Q 2", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 2" );
-  status = rtems_message_queue_send( Queue_id[ 2 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 2 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   puts_nocr( "TA1 - rtems_message_queue_receive - receive from queue 1 - " );
   puts     ( "10 second timeout" );
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
-    (long (*)[4])buffer,
+    buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     10 * TICKS_PER_SECOND
   );
@@ -89,7 +115,7 @@ pause();
 
   Fill_buffer( "BUFFER 1 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
@@ -100,22 +126,22 @@ pause();
 
   Fill_buffer( "BUFFER 2 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   Fill_buffer( "BUFFER 3 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   Fill_buffer( "BUFFER 4 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 4 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   Fill_buffer( "BUFFER 5 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_urgent - BUFFER 5 TO Q 3" );
-  status = rtems_message_queue_urgent( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_urgent( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_urgent" );
 
   for ( index = 1 ; index <= 4 ; index++ ) {
@@ -125,7 +151,8 @@ pause();
     );
     status = rtems_message_queue_receive(
       Queue_id[ 3 ],
-      (long (*)[4])buffer,
+      buffer,
+      &size,
       RTEMS_DEFAULT_OPTIONS,
       RTEMS_NO_TIMEOUT
     );
@@ -137,7 +164,7 @@ pause();
 
   Fill_buffer( "BUFFER 3 TO Q 2", buffer );
   puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" );
-  status = rtems_message_queue_urgent( Queue_id[ 2 ], (long (*)[4])buffer );
+  status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_urgent" );
 
   puts(
@@ -146,7 +173,8 @@ pause();
   );
   status = rtems_message_queue_receive(
     Queue_id[ 2 ],
-    (long (*)[4])buffer,
+    buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
@@ -163,7 +191,7 @@ pause();
 
   Fill_buffer( "BUFFER 3 TO Q 2", buffer );
   puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" );
-  status = rtems_message_queue_urgent( Queue_id[ 2 ], (long (*)[4])buffer );
+  status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_urgent" );
 
   puts( "TA1 - rtems_message_queue_delete - delete queue 2" );
@@ -176,17 +204,17 @@ pause();
 
   Fill_buffer( "BUFFER 1 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   Fill_buffer( "BUFFER 2 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   Fill_buffer( "BUFFER 3 TO Q 3", buffer );
   puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   puts( "TA1 - rtems_message_queue_flush - Q 3" );
@@ -195,8 +223,8 @@ pause();
 
   puts( "TA1 - rtems_message_queue_send until all message buffers consumed" );
   while ( FOREVER ) {
-    status = rtems_message_queue_send( Queue_id[ 3 ], (long (*)[4])buffer );
-    if ( status == RTEMS_UNSATISFIED ) break;
+    status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
+    if ( status == RTEMS_TOO_MANY ) break;
     directive_failed( status, "rtems_message_queue_send loop" );
   }
 
@@ -205,9 +233,114 @@ pause();
   status = rtems_message_queue_flush( Queue_id[ 3 ], &count );
   printf( "TA1 - %d messages were flushed from Q 3\n", count );
 
-  if ( count != BSP_Configuration.maximum_messages )
-    printf( "TA1 - ERROR - %d messages flushed!!!", count );
+pause();
 
+  puts( "TA1 - create message queue of 20 bytes on queue 1" );
+  status = rtems_message_queue_create(
+    Queue_name[ 1 ],
+    100,
+    20,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Queue_id[ 1 ]
+  );
+  directive_failed( status, "rtems_message_queue_create of Q1; 20 bytes each" );
+  status = rtems_message_queue_send( Queue_id[ 3 ], big_send_buffer, 40 );
+  fatal_directive_status(status, RTEMS_INVALID_SIZE, "expected RTEMS_INVALID_SIZE");
+  
+  puts( "TA1 - rtems_message_queue_delete - delete queue 1" );
+  status = rtems_message_queue_delete( Queue_id[ 1 ] );
+  directive_failed( status, "rtems_message_queue_delete" );
+
+pause();
+  
+  puts( "TA1 - rtems_message_queue_create - variable sizes " );
+  for (queue_size = 1; queue_size < 1030; queue_size++)
+  {
+      status = rtems_message_queue_create(
+          Queue_name[ 1 ],
+          2,            /* just 2 msgs each */
+          queue_size,
+          RTEMS_DEFAULT_ATTRIBUTES,
+          &Queue_id[ 1 ]
+          );
+      if (status != RTEMS_SUCCESSFUL)
+      {
+          printf("TA1 - msq que size: %d\n", queue_size);
+          directive_failed( status, "rtems_message_queue_create of Q1" );
+      }
+
+      status = rtems_message_queue_delete( Queue_id[ 1 ] );
+      directive_failed( status, "rtems_message_queue_delete" );
+  }
+  
+pause();
+  
+  puts( "TA1 - rtems_message_queue_create and send - variable sizes " );
+  for (queue_size = 1; queue_size < 1030; queue_size++)
+  {
+      printf("TA1 - message queue size: %d\n", queue_size);
+
+      status = rtems_message_queue_create(
+          Queue_name[ 1 ],
+          2,            /* just 2 msgs each */
+          queue_size,
+          RTEMS_DEFAULT_ATTRIBUTES,
+          &Queue_id[ 1 ]
+          );
+
+      directive_failed( status, "rtems_message_queue_create of Q1" );
+
+      dope_buffer(big_send_buffer, sizeof(big_send_buffer), queue_size);
+      memset(big_receive_buffer, 'Z', sizeof(big_receive_buffer));
+
+      /* send a msg too big */
+      status = rtems_message_queue_send( Queue_id[ 1 ],
+                                         big_send_buffer,
+                                         queue_size + 1 );
+
+      fatal_directive_status(status,
+                             RTEMS_INVALID_SIZE,
+                             "rtems_message_queue_send too large");
+
+      /* send a msg that is just right */
+      status = rtems_message_queue_send(Queue_id[ 1 ],
+                                        big_send_buffer,
+                                        queue_size);
+      directive_failed(status, "rtems_message_queue_send exact size");
+
+      /* now read and verify the message just sent */
+      status = rtems_message_queue_receive(Queue_id[ 1 ],
+                                           big_receive_buffer,
+                                           &size,
+                                           RTEMS_DEFAULT_OPTIONS,
+                                           1 * TICKS_PER_SECOND);
+      directive_failed(status, "rtems_message_queue_receive exact size");
+      if (size != queue_size)
+      {
+          puts("TA1 - exact size size match failed");
+          exit(1);
+      }
+
+      if (memcmp(big_send_buffer, big_receive_buffer, size) != 0)
+      {
+          puts("TA1 - exact size data match failed");
+          exit(1);
+      }
+
+      for (cp = (big_receive_buffer + size);
+           cp < (big_receive_buffer + sizeof(big_receive_buffer));
+           cp++)
+          if (*cp != 'Z')
+          {
+              puts("TA1 - exact size overrun match failed");
+              exit(1);
+          }
+          
+      /* all done with this one; delete it */
+      status = rtems_message_queue_delete( Queue_id[ 1 ] );
+      directive_failed( status, "rtems_message_queue_delete" );
+  }
+  
   puts( "*** END OF TEST 13 ***" );
   exit( 0 );
 }
diff --git a/testsuites/sptests/sp13/task2.c b/testsuites/sptests/sp13/task2.c
index 7d6438312c..5be1f473cf 100644
--- a/testsuites/sptests/sp13/task2.c
+++ b/testsuites/sptests/sp13/task2.c
@@ -16,7 +16,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  task2.c,v 1.2 1995/05/31 17:10:22 joel Exp
  */
 
 #include "system.h"
@@ -26,6 +26,7 @@ rtems_task Task_2(
 )
 {
   long                buffer[ 4 ];
+  rtems_unsigned32    size;
   rtems_task_priority previous_priority;
   rtems_status_code   status;
 
@@ -35,6 +36,7 @@ rtems_task Task_2(
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_NO_WAIT,
     RTEMS_NO_TIMEOUT
   );
@@ -50,6 +52,7 @@ rtems_task Task_2(
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
@@ -65,6 +68,7 @@ rtems_task Task_2(
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
@@ -84,6 +88,7 @@ rtems_task Task_2(
   status = rtems_message_queue_receive(
     Queue_id[ 2 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
@@ -96,7 +101,7 @@ rtems_task Task_2(
   puts( "TA2 - rtems_message_queue_send - BUFFER 2 TO Q 2" );
   directive_failed( status, "rtems_message_queue_send" );
 
-  status = rtems_message_queue_send( Queue_id[ 2 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 2 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
 
   puts(
@@ -106,6 +111,7 @@ rtems_task Task_2(
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     10 * TICKS_PER_SECOND
   );
@@ -121,6 +127,7 @@ rtems_task Task_2(
   status = rtems_message_queue_receive(
     Queue_id[ 3 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
diff --git a/testsuites/sptests/sp13/task3.c b/testsuites/sptests/sp13/task3.c
index 3ba7b61728..85e17cad32 100644
--- a/testsuites/sptests/sp13/task3.c
+++ b/testsuites/sptests/sp13/task3.c
@@ -16,7 +16,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  task3.c,v 1.2 1995/05/31 17:10:24 joel Exp
  */
 
 #include "system.h"
@@ -26,6 +26,7 @@ rtems_task Task_3(
 )
 {
   long              buffer[ 4 ];
+  rtems_unsigned32  size;
   rtems_unsigned32  count;
   rtems_status_code status;
 
@@ -36,6 +37,7 @@ rtems_task Task_3(
   status = rtems_message_queue_receive(
     Queue_id[ 2 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
@@ -49,6 +51,7 @@ rtems_task Task_3(
   status = rtems_message_queue_broadcast(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
+    16,
     &count
   );
   printf( "TA3 - number of tasks awakened = %02d\n", count );
@@ -60,6 +63,7 @@ rtems_task Task_3(
   status = rtems_message_queue_receive(
     Queue_id[ 3 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );
diff --git a/testsuites/sptests/sp14/system.h b/testsuites/sptests/sp14/system.h
index aa2c6d17e4..2d4fe5d093 100644
--- a/testsuites/sptests/sp14/system.h
+++ b/testsuites/sptests/sp14/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:10:37 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp15/system.h b/testsuites/sptests/sp15/system.h
index aa2c6d17e4..101bc4d9a4 100644
--- a/testsuites/sptests/sp15/system.h
+++ b/testsuites/sptests/sp15/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:10:52 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp16/system.h b/testsuites/sptests/sp16/system.h
index 9e2b748a85..22bf9a18c8 100644
--- a/testsuites/sptests/sp16/system.h
+++ b/testsuites/sptests/sp16/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:11:05 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp17/system.h b/testsuites/sptests/sp17/system.h
index aa2c6d17e4..97cfc263da 100644
--- a/testsuites/sptests/sp17/system.h
+++ b/testsuites/sptests/sp17/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:11:26 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp19/fptest.h b/testsuites/sptests/sp19/fptest.h
index a8f3a925cb..dd45012e66 100644
--- a/testsuites/sptests/sp19/fptest.h
+++ b/testsuites/sptests/sp19/fptest.h
@@ -22,7 +22,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  fptest.h,v 1.2 1995/05/31 17:11:39 joel Exp
  */
 
 
diff --git a/testsuites/sptests/sp19/inttest.h b/testsuites/sptests/sp19/inttest.h
index 5dfb0af636..3b5fffee69 100644
--- a/testsuites/sptests/sp19/inttest.h
+++ b/testsuites/sptests/sp19/inttest.h
@@ -23,7 +23,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  inttest.h,v 1.2 1995/05/31 17:11:44 joel Exp
  */
 
 
diff --git a/testsuites/sptests/sp19/system.h b/testsuites/sptests/sp19/system.h
index aa2c6d17e4..d3368f5c7c 100644
--- a/testsuites/sptests/sp19/system.h
+++ b/testsuites/sptests/sp19/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:11:47 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp20/system.h b/testsuites/sptests/sp20/system.h
index 98d52a20cc..bdb09d6bfe 100644
--- a/testsuites/sptests/sp20/system.h
+++ b/testsuites/sptests/sp20/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:12:02 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp21/system.h b/testsuites/sptests/sp21/system.h
index aa2c6d17e4..0e1a3d02dd 100644
--- a/testsuites/sptests/sp21/system.h
+++ b/testsuites/sptests/sp21/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:12:14 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp21/task1.c b/testsuites/sptests/sp21/task1.c
index 24577b8ff9..d77ad7d501 100644
--- a/testsuites/sptests/sp21/task1.c
+++ b/testsuites/sptests/sp21/task1.c
@@ -15,7 +15,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  task1.c,v 1.3 1995/05/31 17:37:05 joel Exp
  */
 
 #include "system.h"
@@ -29,63 +29,62 @@ rtems_task Task_1(
 )
 {
   rtems_status_code status;
-  rtems_status_code return_value;
 
   puts( "-----  TESTING THE NULL DRIVER CHECKS  -----" );
 
-  status = rtems_io_initialize( NO_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_initialize( NO_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_initialize" );
   puts( "TA1 - rtems_io_initialize  - NULL DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_open( NO_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_open( NO_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_open" );
   puts( "TA1 - rtems_io_open        - NULL DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_close( NO_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_close( NO_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_close" );
   puts( "TA1 - rtems_io_close       - NULL DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_read( NO_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_read( NO_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_read" );
   puts( "TA1 - rtems_io_read        - NULL DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_write( NO_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_write( NO_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_write" );
   puts( "TA1 - rtems_io_write       - NULL DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_control( NO_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_control( NO_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_control" );
   puts( "TA1 - rtems_io_control     - NULL DRIVER RTEMS_SUCCESSFUL" );
 
   puts( "-----  TESTING THE I/O MANAGER DIRECTIVES  -----" );
 
-  status = rtems_io_initialize( STUB_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_initialize( STUB_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_initialize" );
   puts( "TA1 - rtems_io_initialize  - STUB DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_open( STUB_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_open( STUB_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_open" );
   puts( "TA1 - rtems_io_open        - STUB DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_close( STUB_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_close( STUB_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_close" );
   puts( "TA1 - rtems_io_close       - STUB DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_read( STUB_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_read( STUB_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_read" );
   puts( "TA1 - rtems_io_read        - STUB DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_write( STUB_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_write( STUB_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_write" );
   puts( "TA1 - rtems_io_write       - STUB DRIVER RTEMS_SUCCESSFUL" );
 
-  status = rtems_io_control( STUB_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_control( STUB_DRIVER_MAJOR, 0, NULL );
   directive_failed( status, "rtems_io_control" );
   puts( "TA1 - rtems_io_control     - STUB DRIVER RTEMS_SUCCESSFUL" );
 
   puts( "-----  RETURNING INVALID MAJOR NUMBER -----" );
 
-  status = rtems_io_initialize( INVALID_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_initialize( INVALID_DRIVER_MAJOR, 0, NULL );
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
@@ -93,7 +92,7 @@ rtems_task Task_1(
   );
   puts( "TA1 - rtems_io_initialize  - RTEMS_INVALID_NUMBER" );
 
-  status = rtems_io_open( INVALID_DRIVER_MAJOR, 0, NULL, &return_value );
+  status = rtems_io_open( INVALID_DRIVER_MAJOR, 0, NULL );
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
diff --git a/testsuites/sptests/sp22/system.h b/testsuites/sptests/sp22/system.h
index aa2c6d17e4..077b16d38e 100644
--- a/testsuites/sptests/sp22/system.h
+++ b/testsuites/sptests/sp22/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:12:31 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp23/system.h b/testsuites/sptests/sp23/system.h
index aa2c6d17e4..f940c951d6 100644
--- a/testsuites/sptests/sp23/system.h
+++ b/testsuites/sptests/sp23/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:12:45 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp24/system.h b/testsuites/sptests/sp24/system.h
index aa2c6d17e4..fc8b351107 100644
--- a/testsuites/sptests/sp24/system.h
+++ b/testsuites/sptests/sp24/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:13:00 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp25/system.h b/testsuites/sptests/sp25/system.h
index 9e2b748a85..828f99e934 100644
--- a/testsuites/sptests/sp25/system.h
+++ b/testsuites/sptests/sp25/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:13:11 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/spfatal/system.h b/testsuites/sptests/spfatal/system.h
index aa2c6d17e4..47da6eaf13 100644
--- a/testsuites/sptests/spfatal/system.h
+++ b/testsuites/sptests/spfatal/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:13:28 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c
index 54d70a5ab6..fb957e49ff 100644
--- a/testsuites/sptests/spsize/size.c
+++ b/testsuites/sptests/spsize/size.c
@@ -11,7 +11,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  size.c,v 1.4 1995/07/12 19:47:25 joel Exp
  */
 
 #include <rtems/system.h>
@@ -66,7 +66,7 @@
      (sizeof (Timer_Control) + NAME_PTR_SIZE)
 #define PER_MSGQ      \
      (sizeof (Message_queue_Control) + NAME_PTR_SIZE)
-#define PER_MSG       \
+#define PER_MSG_OVERHEAD       \
      (sizeof (Message_queue_Buffer_control))
 #define PER_REGN      \
      (sizeof (Region_Control) + NAME_PTR_SIZE)
@@ -240,8 +240,7 @@ uninitialized =
                 (sizeof _ISR_Vector_table)                +
                 (sizeof _ISR_Signals_to_thread_executing) +
 
-/*message.h*/   (sizeof _Message_queue_Inactive_messages) +
-                (sizeof _Message_queue_Information)       +
+/*message.h*/   (sizeof _Message_queue_Information)       +
 
 /*modes.h*/     0                                         +
 
@@ -422,7 +421,7 @@ int maximum_tasks, size_tasks;
 int maximum_sems, size_sems;
 int maximum_timers, size_timers;
 int maximum_msgqs, size_msgqs;
-int maximum_msgs, size_msgs;
+int maximum_msgs, size_msgs_overhead;
 int maximum_regns, size_regns;
 int maximum_parts, size_parts;
 int maximum_ports, size_ports;
@@ -457,8 +456,8 @@ total_size += size_msgqs;
 
 printf( "What is maximum_messages? " );
 maximum_msgs = getint();
-size_msgs = PER_MSG * maximum_msgs;
-total_size += size_msgs;
+size_msgs_overhead = PER_MSG_OVERHEAD * maximum_msgs;
+total_size += size_msgs_overhead;
 
 printf( "What is maximum_regions? " );
 maximum_regns = getint();
@@ -545,8 +544,8 @@ printf( " Timers               - %03d * %03d            =  %d\n",
           maximum_timers, PER_TIMER, size_timers );
 printf( " Msg Queues           - %03d * %03d            =  %d\n",
           maximum_msgqs, PER_MSGQ, size_msgqs );
-printf( " Messages             - %03d * %03d            =  %d\n",
-          maximum_msgs, PER_MSG, size_msgs );
+printf( " Messages Overhead    - %03d * %03d            =  %d\n",
+          maximum_msgs, PER_MSG_OVERHEAD, size_msgs_overhead );
 printf( " Regions              - %03d * %03d            =  %d\n",
           maximum_regns, PER_REGN, size_regns);
 printf( " Partitions           - %03d * %03d            =  %d\n",
@@ -586,7 +585,7 @@ printf( " Tasks                - maximum_tasks * %d\n",      PER_TASK );
 printf( " Timers               - maximum_timers * %d\n",     PER_TIMER );
 printf( " Semaphores           - maximum_semaphores * %d\n", PER_SEMAPHORE);
 printf( " Message Queues       - maximum_message_queues * %d\n", PER_MSGQ );
-printf( " Messages             - maximum_messages * %d\n",   PER_MSG );
+printf( " Messages             -\n");
 printf( " Regions              - maximum_regions * %d\n",    PER_REGN );
 printf( " Partitions           - maximum_partitions * %d\n", PER_PART );
 printf( " Ports                - maximum_ports * %d\n",      PER_PORT );
author	Joel Sherrill <joel.sherrill@OARcorp.com>	1995-08-17 19:36:43 +0000
committer	Joel Sherrill <joel.sherrill@OARcorp.com>	1995-08-17 19:36:43 +0000
commit	4b374f36e7172d59d6d8c252973c1ef65637ecbb (patch)
tree	d6be1084c310d24004e9b056eebdac6c286a4f25 /testsuites/sptests
parent	added tty driver to simhppa (diff)
download	rtems-4b374f36e7172d59d6d8c252973c1ef65637ecbb.tar.bz2