6 files changed, 39 insertions, 14 deletions
diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c
index b3ada92914..6571eb275a 100644
--- a/testsuites/sptests/sp02/init.c
+++ b/testsuites/sptests/sp02/init.c
@@ -19,14 +19,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$
+ *  init.c,v 1.2 1995/05/31 17:06:49 joel Exp
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_task Init(
   rtems_task_argument argument
diff --git a/testsuites/sptests/sp02/preempt.c b/testsuites/sptests/sp02/preempt.c
index 7e93f7af57..5856bdd0c0 100644
--- a/testsuites/sptests/sp02/preempt.c
+++ b/testsuites/sptests/sp02/preempt.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$
+ *  preempt.c,v 1.2 1995/05/31 17:06:51 joel Exp
  */
 
 #include "system.h"
diff --git a/testsuites/sptests/sp02/system.h b/testsuites/sptests/sp02/system.h
index 9bb3a13c81..95cae6c0e2 100644
--- a/testsuites/sptests/sp02/system.h
+++ b/testsuites/sptests/sp02/system.h
@@ -16,15 +16,43 @@
 
 #include <tmacros.h>
 
-/* Miscellaneous */
+/* functions */
 
-#define EXTERN  extern             /* external definition */
+rtems_task Init(
+  rtems_task_argument argument
+);
 
-/* macros */
+rtems_task Preempt_task(
+  rtems_task_argument argument
+);
 
+rtems_task Task_1(
+  rtems_task_argument argument
+);
 
-/* structures */
+rtems_task Task_2(
+  rtems_task_argument argument
+);
 
-#include "gvar.h"
+rtems_task Task_3(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_SPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#include <confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
+
+TEST_EXTERN rtems_id   Preempt_task_id;         /* preempt task id */
+TEST_EXTERN rtems_name Preempt_task_name;       /* preempt task name */
 
 /* end of include file */
diff --git a/testsuites/sptests/sp02/task1.c b/testsuites/sptests/sp02/task1.c
index 0f6152dbb2..ef83177b84 100644
--- a/testsuites/sptests/sp02/task1.c
+++ b/testsuites/sptests/sp02/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.2 1995/05/31 17:06:56 joel Exp
  */
 
 #include "system.h"
diff --git a/testsuites/sptests/sp02/task2.c b/testsuites/sptests/sp02/task2.c
index f39cc5b9fc..7486d6b737 100644
--- a/testsuites/sptests/sp02/task2.c
+++ b/testsuites/sptests/sp02/task2.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$
+ *  task2.c,v 1.2 1995/05/31 17:06:58 joel Exp
  */
 
 #include "system.h"
diff --git a/testsuites/sptests/sp02/task3.c b/testsuites/sptests/sp02/task3.c
index 89bda38b7c..ee67ab5705 100644
--- a/testsuites/sptests/sp02/task3.c
+++ b/testsuites/sptests/sp02/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:07:00 joel Exp
  */
 
 #include "system.h"