12 files changed, 115 insertions, 73 deletions
diff --git a/testsuites/samples/base_mp/init.c b/testsuites/samples/base_mp/init.c
index a844d9032b..26c37ec849 100644
--- a/testsuites/samples/base_mp/init.c
+++ b/testsuites/samples/base_mp/init.c
@@ -21,12 +21,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "shm.h"
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_task Init(
   rtems_task_argument argument
@@ -41,6 +37,10 @@ rtems_task Init(
   task_name = rtems_build_name( 'T', 'A', '1', ' ' );
   status = rtems_task_create( task_name, 1, 1024,
              RTEMS_INTERRUPT_LEVEL(0), RTEMS_DEFAULT_ATTRIBUTES, &tid );
-  status = rtems_task_start( tid, Application_task, Mp_conf_addr.node );
+  status = rtems_task_start(
+    tid,
+    Application_task,
+    Multiprocessing_configuration.node
+  );
   status = rtems_task_delete( RTEMS_SELF );
 }
diff --git a/testsuites/samples/base_mp/system.h b/testsuites/samples/base_mp/system.h
index 38b20afb5c..ec07193b72 100644
--- a/testsuites/samples/base_mp/system.h
+++ b/testsuites/samples/base_mp/system.h
@@ -14,19 +14,33 @@
  *  $Id$
  */
 
-#include <rtems.h>
-#include <bsp.h>
-#include <stdio.h>
-#include <libcsupport.h>
+#include <tmacros.h>
 
-/* Miscellaneous */
+/* functions */
 
-#define EXTERN  extern             /* external definition */
+rtems_task Init(
+  rtems_task_argument argument
+);
 
-/* macros */
+rtems_task Application_task(
+  rtems_task_argument argument
+);
 
-/* structures */
+/* configuration information */
+ 
+#define CONFIGURE_MPTEST
+ 
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+ 
+/*
+ *  Put the overrides of default configuration parameters here.
+ */
+
+#include <confdefs.h>
 
-#include "gvar.h"
+/* variables */
 
+TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
+ 
 /* end of include file */
diff --git a/testsuites/samples/base_sp/init.c b/testsuites/samples/base_sp/init.c
index 8c5a533074..d26787260c 100644
--- a/testsuites/samples/base_sp/init.c
+++ b/testsuites/samples/base_sp/init.c
@@ -21,11 +21,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 #define ARGUMENT 0
 
diff --git a/testsuites/samples/base_sp/system.h b/testsuites/samples/base_sp/system.h
index 50d23b1476..172ced543d 100644
--- a/testsuites/samples/base_sp/system.h
+++ b/testsuites/samples/base_sp/system.h
@@ -11,21 +11,32 @@
  *  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.
  *
- *  system.h,v 1.2 1995/05/31 17:05:38 joel Exp
+ *  $Id$
  */
 
-#include <rtems.h>
-#include <bsp.h>
-#include <stdio.h>
+#include <tmacros.h>
 
-/* Miscellaneous */
+/* functions */
 
-#define EXTERN  extern             /* external definition */
+rtems_task Init(
+  rtems_task_argument argument
+);
 
-/* macros */
+rtems_task Application_task(
+  rtems_task_argument argument
+);
 
-/* structures */
+/* configuration information */
 
-#include "gvar.h"
+#define CONFIGURE_SPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#include <confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id Global_variable;    /* example global variable     */
 
 /* end of include file */
diff --git a/testsuites/samples/cdtest/init.c b/testsuites/samples/cdtest/init.c
index 00bdd647ba..6f3736550c 100644
--- a/testsuites/samples/cdtest/init.c
+++ b/testsuites/samples/cdtest/init.c
@@ -21,9 +21,6 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 #include <stdio.h>
diff --git a/testsuites/samples/cdtest/system.h b/testsuites/samples/cdtest/system.h
index 11e00f018a..2400478ed9 100644
--- a/testsuites/samples/cdtest/system.h
+++ b/testsuites/samples/cdtest/system.h
@@ -14,18 +14,28 @@
  *  $Id$
  */
 
-#include <rtems.h>
-#include <bsp.h>
-#include <stdio.h>
+#include <tmacros.h>
 
-/* Miscellaneous */
+/* functions */
 
-#define EXTERN  extern             /* external definition */
+rtems_task main_task(
+  rtems_task_argument argument
+);
 
-/* macros */
+/* configuration information */
 
-/* structures */
+#define CONFIGURE_SPTEST
 
-#include "gvar.h"
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INIT_TASK_ENTRY_POINT   main_task
+#define CONFIGURE_INIT_TASK_NAME          rtems_build_name( 'C', 'T', 'O', 'R' )
+
+#include <confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
+ 
 /* end of include file */
diff --git a/testsuites/samples/hello/init.c b/testsuites/samples/hello/init.c
index 9c56c4edda..c1c25bf045 100644
--- a/testsuites/samples/hello/init.c
+++ b/testsuites/samples/hello/init.c
@@ -21,11 +21,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 #include <stdio.h>
 
 rtems_task Init(
diff --git a/testsuites/samples/hello/system.h b/testsuites/samples/hello/system.h
index 49deb52d4a..8af4376e0f 100644
--- a/testsuites/samples/hello/system.h
+++ b/testsuites/samples/hello/system.h
@@ -14,19 +14,22 @@
  *  $Id$
  */
 
-#include <rtems.h>
-#include <bsp.h>
+#include <tmacros.h>
 
-#include <stdio.h>
+/* functions */
 
-/* Miscellaneous */
+rtems_task Init(
+  rtems_task_argument argument
+);
 
-#define EXTERN  extern             /* external definition */
+/* configuration information */
 
-/* macros */
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
 
-/* structures */
+#include <confdefs.h>
 
-#include "gvar.h"
+/* global variables */
+
+TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
 
 /* end of include file */
diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c
index 947fdfd28f..9c54e0d416 100644
--- a/testsuites/samples/paranoia/init.c
+++ b/testsuites/samples/paranoia/init.c
@@ -21,11 +21,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 extern int paranoia(int, char **);
 
diff --git a/testsuites/samples/paranoia/system.h b/testsuites/samples/paranoia/system.h
index 11e00f018a..5e1b2d2b88 100644
--- a/testsuites/samples/paranoia/system.h
+++ b/testsuites/samples/paranoia/system.h
@@ -14,18 +14,23 @@
  *  $Id$
  */
 
-#include <rtems.h>
-#include <bsp.h>
-#include <stdio.h>
+#include <tmacros.h>
 
-/* Miscellaneous */
+/* functions */
 
-#define EXTERN  extern             /* external definition */
+rtems_task Init(
+  rtems_task_argument argument
+);
 
-/* macros */
+/* configuration information */
 
-/* structures */
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
 
-#include "gvar.h"
+#include <confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
 
 /* end of include file */
diff --git a/testsuites/samples/ticker/init.c b/testsuites/samples/ticker/init.c
index 3caa16ecd7..c023a25801 100644
--- a/testsuites/samples/ticker/init.c
+++ b/testsuites/samples/ticker/init.c
@@ -21,11 +21,8 @@
  *  $Id$
  */
 
+#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/samples/ticker/system.h b/testsuites/samples/ticker/system.h
index 0bf193dad9..51a9c082df 100644
--- a/testsuites/samples/ticker/system.h
+++ b/testsuites/samples/ticker/system.h
@@ -16,14 +16,28 @@
 
 #include <tmacros.h>
 
-/* Miscellaneous */
+/* functions */
 
-#define EXTERN  extern             /* external definition */
+rtems_task Init(
+  rtems_task_argument argument
+);
 
-/* macros */
+rtems_task Test_task(
+  rtems_task_argument argument
+);
 
-/* structures */
+/* configuration information */
 
-#include "gvar.h"
+#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 */
 
 /* end of include file */