2 files changed, 26 insertions, 5 deletions
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 );
 }