2 files changed, 25 insertions, 5 deletions
diff --git a/c/src/tests/tmtests/tm16/system.h b/c/src/tests/tmtests/tm16/system.h
index 4444a53c4c..99de69201e 100644
--- a/c/src/tests/tmtests/tm16/system.h
+++ b/c/src/tests/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/c/src/tests/tmtests/tm16/task1.c b/c/src/tests/tmtests/tm16/task1.c
index a837c72014..996cbecb5f 100644
--- a/c/src/tests/tmtests/tm16/task1.c
+++ b/c/src/tests/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 );
 }