The word "RTEMS" almost completely removed from the core.

Configuration Table Template file added and all tests
modified to use this.  All gvar.h and conftbl.h files
removed from test directories.

Configuration parameter maximum_devices added.

Core semaphore and mutex handlers added and RTEMS API Semaphore
Manager updated to reflect this.

Initialization sequence changed to invoke API specific initialization
routines.  Initialization tasks table now owned by RTEMS Tasks Manager.

Added user extension for post-switch.

Utilized user extensions to implement API specific functionality
like signal dispatching.

Added extensions to the System Initialization Thread so that an
API can register a function to be invoked while the system
is being initialized.  These are largely equivalent to the
pre-driver and post-driver hooks.

Added the Modules file oar-go32_p5, modified oar-go32, and modified
the file make/custom/go32.cfg to look at an environment varable which
determines what CPU model is being used.

All BSPs updated to reflect named devices and clock driver's IOCTL
used by the Shared Memory Driver.  Also merged clock isr into
main file and removed ckisr.c where possible.

Updated spsize to reflect new and moved variables.

Makefiles for the executive source and include files updated to show
break down of files into Core, RTEMS API, and Neither.

Header and inline files installed into subdirectory based on whether
logically in the Core or a part of the RTEMS API.

63 files changed, 847 insertions, 173 deletions

diff --git a/testsuites/tmtests/include/timesys.h b/testsuites/tmtests/include/timesys.h
index 3b61d7b42d..22034a2797 100644
--- a/testsuites/tmtests/include/timesys.h
+++ b/testsuites/tmtests/include/timesys.h
@@ -1,7 +1,7 @@
-/*  timesystem.h
+/*  timesys.h
  *
- *  This include file contains information that is included in every
- *  function in the Time Suite.
+ *  This header file contains the global variables for the Time
+ *  suite.
  *
  *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994.
  *  On-Line Applications Research Corporation (OAR).
@@ -14,17 +14,45 @@
  *  $Id$
  */
 
+#include <tmacros.h>
 
-/* constants */
-
+/*
+ *   How many times a particular operation is performed while timed.
+ */
+ 
 #define OPERATION_COUNT 100
-#define IT_COUNT 100
+#define IT_COUNT        100
+
+/* functions */
+
+#define put_time( _message, _total_time, \
+                  _iterations, _loop_overhead, _overhead ) \
+    printf( \
+      "%s %d\n", \
+      (_message), \
+      (((_total_time) - (_loop_overhead)) / (_iterations)) - (_overhead) \
+    )
+
+#if  defined(STACK_CHECKER_ON) || defined(RTEMS_DEBUG)
+#define Print_Warning() \
+  do { \
+    puts( \
+      "\n" \
+      "THE TIMES REPORTED BY THIS TEST INCLUDE DEBUG CODE!\n" \
+      "\n" \
+    ); \
+  } while (0)
+
+#else
+#define Print_Warning()
+#endif
 
-/* Miscellaneous */
+/* variables */
 
-#define FOREVER 1                  /* infinite loop */
-#define EXTERN  extern             /* external definition */
+TEST_EXTERN volatile rtems_unsigned32 end_time;   /* ending time variable */
+TEST_EXTERN volatile rtems_unsigned32 overhead;   /* loop overhead variable */
 
-/* structures */
+TEST_EXTERN rtems_id   Task_id[ OPERATION_COUNT+1 ];   /* array of task ids */
+TEST_EXTERN rtems_id   Task_name[ OPERATION_COUNT+1 ]; /* array of task names */
 
 /* end of include file */
diff --git a/testsuites/tmtests/tm01/system.h b/testsuites/tmtests/tm01/system.h
index 4444a53c4c..190361f77c 100644
--- a/testsuites/tmtests/tm01/system.h
+++ b/testsuites/tmtests/tm01/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              2
+#define CONFIGURE_MAXIMUM_SEMAPHORES         1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index c4e4e4bc0d..cc1cfca70f 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_task Test_task(
   rtems_task_argument argument
@@ -27,6 +24,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 1 ***" );
 
   Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
@@ -185,5 +184,6 @@ rtems_task Test_task(
     CALLING_OVERHEAD_SEMAPHORE_RELEASE
   );
 
+  puts( "*** END OF TEST 1 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm02/system.h b/testsuites/tmtests/tm02/system.h
index 4444a53c4c..994d733f4a 100644
--- a/testsuites/tmtests/tm02/system.h
+++ b/testsuites/tmtests/tm02/system.h
@@ -17,5 +17,26 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_TIMERS             110
+#define CONFIGURE_MAXIMUM_SEMAPHORES         101
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index 46f947b405..a657b37c78 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id High_id;
 rtems_id Low_id;
@@ -42,6 +39,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 2 ***" );
 
   test_init();
@@ -153,5 +152,7 @@ rtems_task Low_task(
     0,
     CALLING_OVERHEAD_SEMAPHORE_OBTAIN
   );
+
+  puts( "*** END OF TEST 2 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm03/system.h b/testsuites/tmtests/tm03/system.h
index 4444a53c4c..994d733f4a 100644
--- a/testsuites/tmtests/tm03/system.h
+++ b/testsuites/tmtests/tm03/system.h
@@ -17,5 +17,26 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_TIMERS             110
+#define CONFIGURE_MAXIMUM_SEMAPHORES         101
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index 5c14f5b6e4..59f9289d10 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Semaphore_id;
 rtems_task test_init(
@@ -38,6 +35,8 @@ rtems_task Init(
   rtems_status_code status;
   rtems_id          task_id;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 3 ***" );
   status = rtems_task_create(
     rtems_build_name( 'T', 'A', '1', ' ' ),
@@ -146,5 +145,7 @@ rtems_task High_task(
     0,
     CALLING_OVERHEAD_SEMAPHORE_RELEASE
   );
+
+  puts( "*** END OF TEST 3 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h
index 4444a53c4c..74eb108e3e 100644
--- a/testsuites/tmtests/tm04/system.h
+++ b/testsuites/tmtests/tm04/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_SEMAPHORES         1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 371f250282..8156a17daa 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id         Semaphore_id;
 rtems_id         Task_id[OPERATION_COUNT+1];
@@ -42,6 +39,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 4 ***" );
 
   test_init();
@@ -328,6 +327,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TASK_DELETE
   );
 
+  puts( "*** END OF TEST 4 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm05/system.h b/testsuites/tmtests/tm05/system.h
index 4444a53c4c..994d733f4a 100644
--- a/testsuites/tmtests/tm05/system.h
+++ b/testsuites/tmtests/tm05/system.h
@@ -17,5 +17,26 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_TIMERS             110
+#define CONFIGURE_MAXIMUM_SEMAPHORES         101
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index 86e0c14eab..3f1f44a54a 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id         Task_id[OPERATION_COUNT+1];
 rtems_unsigned32 Task_index;
@@ -40,6 +37,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 5 ***" );
 
   test_init();
@@ -98,6 +97,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TASK_RESUME
   );
 
+  puts( "*** END OF TEST 5 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm06/system.h b/testsuites/tmtests/tm06/system.h
index 4444a53c4c..994d733f4a 100644
--- a/testsuites/tmtests/tm06/system.h
+++ b/testsuites/tmtests/tm06/system.h
@@ -17,5 +17,26 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_TIMERS             110
+#define CONFIGURE_MAXIMUM_SEMAPHORES         101
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index c6a6af6c63..2863cc8684 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Task_id[ OPERATION_COUNT + 1 ];
 
@@ -37,6 +34,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 6 ***" );
 
   test_init();
@@ -150,6 +149,7 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_RESUME
   );
 
+  puts( "*** END OF TEST 6 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm07/system.h b/testsuites/tmtests/tm07/system.h
index 4444a53c4c..994d733f4a 100644
--- a/testsuites/tmtests/tm07/system.h
+++ b/testsuites/tmtests/tm07/system.h
@@ -17,5 +17,26 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_TIMERS             110
+#define CONFIGURE_MAXIMUM_SEMAPHORES         101
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index fcd545bbc4..bd7aad8744 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Task_id[OPERATION_COUNT+1], task_index;
 
@@ -39,6 +36,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 7 ***" );
 
   test_init();
@@ -94,6 +93,7 @@ rtems_task High_task(
   } else
     (void) rtems_task_suspend( RTEMS_SELF );
 
+  puts( "*** END OF TEST 7 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h
index 4444a53c4c..994d733f4a 100644
--- a/testsuites/tmtests/tm08/system.h
+++ b/testsuites/tmtests/tm08/system.h
@@ -17,5 +17,26 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_TIMERS             110
+#define CONFIGURE_MAXIMUM_SEMAPHORES         101
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index 36312ff4b7..99958e4197 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Test_task_id;
 
@@ -33,6 +30,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 8 ***" );
 
   test_init();
@@ -234,6 +233,7 @@ rtems_task test_task(
     CALLING_OVERHEAD_CLOCK_GET
   );
 
+  puts( "*** END OF TEST 8 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm09/system.h b/testsuites/tmtests/tm09/system.h
index 4444a53c4c..992484e777 100644
--- a/testsuites/tmtests/tm09/system.h
+++ b/testsuites/tmtests/tm09/system.h
@@ -17,5 +17,24 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index f1aab28241..882fc5e61c 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Queue_id;
 
@@ -30,6 +27,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 9 ***" );
 
   status = rtems_task_create(
@@ -85,6 +84,7 @@ rtems_task Test_task (
     CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE
   );
 
+  puts( "*** END OF TEST 9 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm10/system.h b/testsuites/tmtests/tm10/system.h
index 4444a53c4c..45ec4003bf 100644
--- a/testsuites/tmtests/tm10/system.h
+++ b/testsuites/tmtests/tm10/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              110
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index 3717022063..853974ee9c 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Queue_id;
 long Buffer[4];
@@ -40,6 +37,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 10 ***" );
 
   test_init();
@@ -161,5 +160,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
   );
 
+  puts( "*** END OF TEST 10 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm11/system.h b/testsuites/tmtests/tm11/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm11/system.h
+++ b/testsuites/tmtests/tm11/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index ade5d849dd..a68da12d5b 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Queue_id;
 
@@ -41,6 +38,8 @@ void Init(
   rtems_status_code status;
   rtems_id id;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 11 ***" );
 
   status = rtems_task_create(
@@ -151,5 +150,6 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
   );
 
+  puts( "*** END OF TEST 11 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm12/system.h b/testsuites/tmtests/tm12/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm12/system.h
+++ b/testsuites/tmtests/tm12/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index 6801ffb86a..16b918dd28 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Queue_id;
 
@@ -41,6 +38,8 @@ rtems_task Init(
   rtems_id          task_id;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 12 ***" );
 
   status = rtems_task_create(
@@ -127,6 +126,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
   );
 
+  puts( "*** END OF TEST 12 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm13/system.h b/testsuites/tmtests/tm13/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm13/system.h
+++ b/testsuites/tmtests/tm13/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index 45df61e2b1..2a66a38e33 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Queue_id;
 
@@ -40,6 +37,8 @@ void Init(
   rtems_status_code status;
   rtems_id id;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 13 ***" );
 
   status = rtems_task_create(
@@ -150,5 +149,6 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
   );
 
+  puts( "*** END OF TEST 13 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm14/system.h b/testsuites/tmtests/tm14/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm14/system.h
+++ b/testsuites/tmtests/tm14/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index be27545d31..d799f0963c 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Queue_id;
 
@@ -41,6 +38,8 @@ rtems_task Init(
   rtems_id          task_id;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 14 ***" );
 
   status = rtems_task_create(
@@ -127,6 +126,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
   );
 
+  puts( "*** END OF TEST 14 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm15/system.h
+++ b/testsuites/tmtests/tm15/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index 05fb29461b..86efae5cb2 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_unsigned32 time_set, eventout;
 
@@ -35,6 +32,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 15 ***" );
 
   test_init();
@@ -193,6 +192,7 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_SEND
   );
 
+  puts( "*** END OF TEST 15 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm16/system.h b/testsuites/tmtests/tm16/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm16/system.h
+++ b/testsuites/tmtests/tm16/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index a837c72014..996cbecb5f 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_unsigned32 Task_count;
 
@@ -38,6 +35,8 @@ rtems_task Init(
   rtems_id          id;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 16 ***" );
 
   status = rtems_task_create(
@@ -144,5 +143,6 @@ rtems_task High_task(
     CALLING_OVERHEAD_EVENT_SEND
   );
 
+  puts( "*** END OF TEST 16 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm17/system.h b/testsuites/tmtests/tm17/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm17/system.h
+++ b/testsuites/tmtests/tm17/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index fbf658799b..187f470231 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_unsigned32 Task_count;
 rtems_task_priority Task_priority;
@@ -40,6 +37,8 @@ rtems_task Init(
   rtems_unsigned32  index;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 17 ***" );
 
   Task_priority = 254;
@@ -123,5 +122,6 @@ rtems_task Last_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
+  puts( "*** END OF TEST 17 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm18/system.h b/testsuites/tmtests/tm18/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm18/system.h
+++ b/testsuites/tmtests/tm18/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index c5b529f988..e2b44dac31 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_unsigned32 taskcount;
 rtems_task_priority taskpri;
@@ -41,6 +38,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 18 ***" );
 
   test_init();
@@ -108,5 +107,6 @@ rtems_task Last_task(
     CALLING_OVERHEAD_TASK_DELETE
   );
 
+  puts( "*** END OF TEST 18 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm19/system.h b/testsuites/tmtests/tm19/system.h
index 4444a53c4c..99de69201e 100644
--- a/testsuites/tmtests/tm19/system.h
+++ b/testsuites/tmtests/tm19/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index 7c491b7572..a0c4b7159b 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_asr Process_asr_for_pass_1(
   rtems_signal_set signals
@@ -43,6 +40,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 19 ***" );
 
   status = rtems_task_create(
@@ -208,5 +207,6 @@ rtems_task Task_3(
     0
   );
 
+  puts( "*** END OF TEST 19 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm20/system.h b/testsuites/tmtests/tm20/system.h
index 4444a53c4c..f172828ad2 100644
--- a/testsuites/tmtests/tm20/system.h
+++ b/testsuites/tmtests/tm20/system.h
@@ -17,5 +17,26 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+#define CONFIGURE_TEST_NEEDS_STUB_DRIVER
+
+#define CONFIGURE_MAXIMUM_PARTITIONS         1
+#define CONFIGURE_MAXIMUM_REGIONS            1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index fdd44d510c..756a957b22 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -11,13 +11,10 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
-rtems_device_major_number _STUB_major = 0;
+rtems_device_major_number _STUB_major = 1;
 
 rtems_id         Region_id;
 rtems_name       Region_name;
@@ -50,6 +47,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 20 ***" );
 
   status = rtems_task_create(
@@ -425,6 +424,7 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_CONTROL
   );
 
+  puts( "*** END OF TEST 20 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm21/system.h b/testsuites/tmtests/tm21/system.h
index 4444a53c4c..f2831954e6 100644
--- a/testsuites/tmtests/tm21/system.h
+++ b/testsuites/tmtests/tm21/system.h
@@ -17,5 +17,32 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              102
+#define CONFIGURE_MAXIMUM_TIMERS             100
+#define CONFIGURE_MAXIMUM_SEMAPHORES         100
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     100
+#define CONFIGURE_MAXIMUM_PARTITIONS         100
+#define CONFIGURE_MAXIMUM_REGIONS            100
+#define CONFIGURE_MAXIMUM_PORTS              100
+#define CONFIGURE_MAXIMUM_PERIODS            100
+
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 3bd8dc61dc..8f3bbbd837 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_unsigned8 Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
 rtems_unsigned8 Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
@@ -31,6 +28,8 @@ rtems_task Init(
   rtems_id          id;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 21 ***" );
 
   status = rtems_task_create(
@@ -232,5 +231,6 @@ rtems_task Task_1(
     CALLING_OVERHEAD_RATE_MONOTONIC_IDENT
   );
 
+  puts( "*** END OF TEST 21 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h
index 4444a53c4c..a7d66a30cc 100644
--- a/testsuites/tmtests/tm22/system.h
+++ b/testsuites/tmtests/tm22/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              103
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index 21983d8818..63ae155978 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Queue_id;
 
@@ -40,6 +37,8 @@ rtems_task Init(
   rtems_id          id;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 22 ***" );
 
   status = rtems_message_queue_create(
@@ -179,6 +178,7 @@ rtems_task Low_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
   );
 
+  puts( "*** END OF TEST 22 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm23/system.h b/testsuites/tmtests/tm23/system.h
index 4444a53c4c..877649e397 100644
--- a/testsuites/tmtests/tm23/system.h
+++ b/testsuites/tmtests/tm23/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_TIMERS             110
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 8b3e6dbccc..4fa36a8a25 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id          Timer_id[ OPERATION_COUNT+1 ];
 
@@ -50,6 +47,8 @@ rtems_task Init(
   rtems_task_entry    task_entry;
   rtems_status_code   status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 23 ***" );
 
   Timer_initialize();
@@ -298,5 +297,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_TASK_WAKE_WHEN
   );
 
+  puts( "*** END OF TEST 23 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h
index 4444a53c4c..6b2f2c420b 100644
--- a/testsuites/tmtests/tm24/system.h
+++ b/testsuites/tmtests/tm24/system.h
@@ -17,5 +17,24 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 160116ca16..2cc0046bd0 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_unsigned32 Task_count;
 
@@ -35,6 +32,8 @@ rtems_task Init(
   rtems_unsigned32  index;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 24 ***" );
 
   status = rtems_task_create(
@@ -118,6 +117,7 @@ rtems_task Tasks(
       CALLING_OVERHEAD_TASK_WAKE_AFTER
     );
 
+  puts( "*** END OF TEST 24 ***" );
     exit( 0 );
   }
   (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
diff --git a/testsuites/tmtests/tm25/system.h b/testsuites/tmtests/tm25/system.h
index 4444a53c4c..74eb108e3e 100644
--- a/testsuites/tmtests/tm25/system.h
+++ b/testsuites/tmtests/tm25/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_SEMAPHORES         1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index 26eaa2a452..8e6fda4b68 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Semaphore_id;
 
@@ -35,6 +32,8 @@ rtems_task Init(
   rtems_unsigned32  index;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 25 ***" );
 
   status = rtems_semaphore_create(
@@ -105,5 +104,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_CLOCK_TICK
   );
 
+  puts( "*** END OF TEST 25 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm26/system.h b/testsuites/tmtests/tm26/system.h
index f76f6855b5..74eb108e3e 100644
--- a/testsuites/tmtests/tm26/system.h
+++ b/testsuites/tmtests/tm26/system.h
@@ -14,9 +14,28 @@
  */
 
 
-#include <bsp.h>
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_SEMAPHORES         1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 745e2682f1..ed94b3c8ae 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -11,6 +11,7 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include <rtems.h>
 #include "system.h"
 #include "fptest.h"
@@ -18,12 +19,6 @@
 #include <tmacros.h>
 #include <timesys.h>
 
-#undef EXTERN
-#define EXTERN
-#include "gvar.h"
-#include "conftbl.h"
-#undef EXTERN
-#define EXTERN extern
 
 /* TEST DATA */
 rtems_id Semaphore_id;
@@ -70,6 +65,8 @@ rtems_task Init(
   rtems_id          task_id;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 26 ***" );
 
   status = rtems_task_create(
@@ -545,6 +542,8 @@ void complete_test( void )
     0,
     0
   );
+
+  puts( "*** END OF TEST 26 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm27/system.h b/testsuites/tmtests/tm27/system.h
index 4444a53c4c..6b2f2c420b 100644
--- a/testsuites/tmtests/tm27/system.h
+++ b/testsuites/tmtests/tm27/system.h
@@ -17,5 +17,24 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index edd657b40c..b90ae4d65f 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 #include <bsp.h>
 
@@ -51,6 +48,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 27 ***" );
 
   status = rtems_task_create(
@@ -186,6 +185,7 @@ rtems_task Task_2(
     0
   );
 
+  puts( "*** END OF TEST 27 ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm28/system.h b/testsuites/tmtests/tm28/system.h
index 4444a53c4c..4fa010796f 100644
--- a/testsuites/tmtests/tm28/system.h
+++ b/testsuites/tmtests/tm28/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              2
+#define CONFIGURE_MAXIMUM_PORTS              1
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index c6af6fb03f..bd0682be19 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -11,16 +11,13 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_id Port_id;
 
-rtems_unsigned8 Internal_area[ 256 ];
-rtems_unsigned8 External_area[ 256 ];
+rtems_unsigned8 Internal_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
+rtems_unsigned8 External_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
 
 rtems_task Test_task(
   rtems_task_argument argument
@@ -32,6 +29,8 @@ rtems_task Init(
 {
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 28 ***" );
 
   status = rtems_task_create(
@@ -130,5 +129,6 @@ rtems_task Test_task (
     CALLING_OVERHEAD_PORT_DELETE
   );
 
+  puts( "*** END OF TEST 28 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tm29/system.h b/testsuites/tmtests/tm29/system.h
index 4444a53c4c..d2fa07c5f4 100644
--- a/testsuites/tmtests/tm29/system.h
+++ b/testsuites/tmtests/tm29/system.h
@@ -17,5 +17,25 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              111
+#define CONFIGURE_MAXIMUM_PERIODS            111
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index a38e9567c8..0958765c4c 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_name Period_name;
 
@@ -37,6 +34,8 @@ rtems_task Init(
   rtems_unsigned32  index;
   rtems_status_code status;
 
+  Print_Warning();
+
   puts( "\n\n*** TIME TEST 29 ***" );
 
   Period_name = rtems_build_name( 'P', 'R', 'D', ' ' );
@@ -203,5 +202,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
   );
 
+  puts( "*** END OF TEST 29 ***" );
   exit( 0 );
 }
diff --git a/testsuites/tmtests/tmck/system.h b/testsuites/tmtests/tmck/system.h
index 4444a53c4c..8b1c9b0ddd 100644
--- a/testsuites/tmtests/tmck/system.h
+++ b/testsuites/tmtests/tmck/system.h
@@ -17,5 +17,24 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              2111
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index 39f1490c00..34eb674f4d 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -12,11 +12,8 @@
  */
 
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 #define MAXIMUM_DISTRIBUTION 10000
 
@@ -44,6 +41,8 @@ rtems_task Init(
 
   Set_find_average_overhead( 1 );
 
+  Print_Warning();
+
   puts( "\n\n*** TIME CHECKER ***" );
 
   Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ),
@@ -137,6 +136,7 @@ pause();
     0
   );
 
+  puts( "*** END OF TIME CHECKER ***" );
   exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tmoverhd/system.h b/testsuites/tmtests/tmoverhd/system.h
index 4444a53c4c..9fbbf116dd 100644
--- a/testsuites/tmtests/tmoverhd/system.h
+++ b/testsuites/tmtests/tmoverhd/system.h
@@ -17,5 +17,42 @@
 #include <coverhd.h>
 #include <tmacros.h>
 
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
+rtems_timer_service_routine Timer_handler(
+  rtems_id argument
+);
+ 
+rtems_asr Isr_handler(
+  rtems_signal_set signals
+);
+ 
+rtems_asr Asr_handler(
+  rtems_signal_set signals
+);
+ 
+rtems_task task_func();
+ 
+void null_func();
+ 
+rtems_status_code Empty_directive();
+
 #include <timesys.h>
-#include <timegvar.h>
+
+/* configuration information */
+ 
+#define CONFIGURE_TMTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              2
+#define CONFIGURE_TICKS_PER_TIMESLICE        0
+ 
+#include <confdefs.h>
+
+/* end of include file */
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index 9daa1f0949..f5cac161bb 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -11,11 +11,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_unsigned8 Memory_area[ 2048 ];
 rtems_unsigned8 Internal_port_area[ 256 ];
@@ -33,7 +30,9 @@ rtems_task Init(
 
   Set_find_average_overhead( TRUE );
 
-  puts( "\n\n*** TIME TEST overhead ***" );
+  Print_Warning();
+
+  puts( "\n\n*** TIME TEST OVERHEAD ***" );
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'A', '1', ' ' ),
@@ -1274,7 +1273,7 @@ pause();
          0
       );
 
-  puts( "*** END OF TIME OVERHEAD ***\n" );
+  puts( "*** END OF TIME OVERHEAD ***" );
 
   exit( 0 );
 }