Renamed the CONFIGURE_TEST_NEEDS configuration constants to

CONFIGURE_APPLICATION_NEEDS.
2000-05-04 20:49:22 +00:00
parent f74de9c028
commit af9b39e269
128 changed files with 278 additions and 255 deletions
--- a/c/src/exec/sapi/include/confdefs.h
+++ b/c/src/exec/sapi/include/confdefs.h
@@ -177,6 +177,29 @@ rtems_initialization_tasks_table Initialization_tasks[] = {

 #endif

+/*
+ *  Map obsolete names to current ones
+ *
+ *  NOTE: These should be obsoleted in a future release.
+ */
+
+#ifdef CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+#endif
+#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#endif 
+#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#endif 
+#ifdef CONFIGURE_TEST_NEEDS_RTC_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
+#endif 
+#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
+#endif
+
+
 /*
 *  Default Device Driver Table.  Each driver needed by the test is explicitly
 *  choosen by that test.  There is always a null driver entry.
@@ -185,11 +208,11 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define NULL_DRIVER_TABLE_ENTRY \
 { NULL, NULL, NULL, NULL, NULL, NULL }

-#ifdef CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
 #include <timerdrv.h>
 #endif

-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
 #include <stubdrv.h>
 #endif

@@ -197,13 +220,13 @@ rtems_initialization_tasks_table Initialization_tasks[] = {

 #ifdef CONFIGURE_INIT
 rtems_driver_address_table Device_drivers[] = {
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
  CONSOLE_DRIVER_TABLE_ENTRY,
 #endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  CLOCK_DRIVER_TABLE_ENTRY,
 #endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
  STUB_DRIVER_TABLE_ENTRY,
 #endif
  NULL_DRIVER_TABLE_ENTRY
--- a/c/src/exec/sapi/include/rtems/README
+++ b/c/src/exec/sapi/include/rtems/README
@@ -24,8 +24,8 @@ the Timing Test Suite:

   /* configuration information */
 
-   #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-   #define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+   #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+   #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
 
   #define CONFIGURE_MAXIMUM_TASKS              102
   #define CONFIGURE_MAXIMUM_TIMERS             100
@@ -58,13 +58,13 @@ template by default.
 { NULL, NULL, NULL, NULL, NULL, NULL }
 
 rtems_driver_address_table Device_drivers[] = {
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
  CONSOLE_DRIVER_TABLE_ENTRY,
 #endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  CLOCK_DRIVER_TABLE_ENTRY,
 #endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
  STUB_DRIVER_TABLE_ENTRY,
 #endif
  NULL_DRIVER_TABLE_ENTRY,
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c
@@ -67,8 +67,8 @@ void *POSIX_Init( void *argument )

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/system.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/system.h
@@ -23,7 +23,7 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c
@@ -71,8 +71,8 @@ void *POSIX_Init( void *argument )

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 /*
 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1)
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c
@@ -73,8 +73,8 @@ void *POSIX_Init( void *argument )

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 /*
 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1)
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c
@@ -67,8 +67,8 @@ void *POSIX_Init( void *argument )

 #define CONFIGURE_GNAT_RTEMS

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1)

--- a/c/src/tests/itrontests/itronhello/system.h
+++ b/c/src/tests/itrontests/itronhello/system.h
@@ -22,7 +22,7 @@ void ITRON_Init( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_ITRON_INIT_TASK_TABLE

--- a/c/src/tests/itrontests/itronmbf01/system.h
+++ b/c/src/tests/itrontests/itronmbf01/system.h
@@ -22,8 +22,8 @@ void ITRON_Init( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 #define CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS   10
--- a/c/src/tests/itrontests/itronmbox01/system.h
+++ b/c/src/tests/itrontests/itronmbox01/system.h
@@ -22,7 +22,7 @@ void ITRON_Init( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_ITRON_INIT_TASK_TABLE

--- a/c/src/tests/itrontests/itronsem01/system.h
+++ b/c/src/tests/itrontests/itronsem01/system.h
@@ -23,8 +23,8 @@ void ITRON_Init( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 #define CONFIGURE_MAXIMUM_ITRON_SEMAPHORES  10
--- a/c/src/tests/itrontests/itrontask01/system.h
+++ b/c/src/tests/itrontests/itrontask01/system.h
@@ -23,8 +23,8 @@ void Task_2_through_4();

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_ITRON_INIT_TASK_TABLE

--- a/c/src/tests/itrontests/itrontask02/system.h
+++ b/c/src/tests/itrontests/itrontask02/system.h
@@ -24,7 +24,7 @@ void Non_Dormant_task();

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_ITRON_INIT_TASK_TABLE

 #include <confdefs.h>
--- a/c/src/tests/itrontests/itrontask03/system.h
+++ b/c/src/tests/itrontests/itrontask03/system.h
@@ -26,8 +26,8 @@ void Task_3();

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_ITRON_INIT_TASK_TABLE

 #include <confdefs.h>
--- a/c/src/tests/itrontests/itrontask04/system.h
+++ b/c/src/tests/itrontests/itrontask04/system.h
@@ -26,8 +26,8 @@ void Task_3();

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_ITRON_INIT_TASK_TABLE

 #include <confdefs.h>
--- a/c/src/tests/itrontests/itrontime01/system.h
+++ b/c/src/tests/itrontests/itrontime01/system.h
@@ -22,7 +22,7 @@ void ITRON_Init( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_ITRON_INIT_TASK_TABLE

--- a/c/src/tests/libtests/cpuuse/system.h
+++ b/c/src/tests/libtests/cpuuse/system.h
@@ -40,8 +40,8 @@ void Task_switch(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/libtests/malloctest/system.h
+++ b/c/src/tests/libtests/malloctest/system.h
@@ -31,8 +31,8 @@ void blow_stack( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3)

--- a/c/src/tests/libtests/monitor/system.h
+++ b/c/src/tests/libtests/monitor/system.h
@@ -35,8 +35,8 @@ void Get_all_counters( void );
 
 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_INIT_TASK_PRIORITY          10
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
--- a/c/src/tests/libtests/putenvtest/init.c
+++ b/c/src/tests/libtests/putenvtest/init.c
@@ -35,8 +35,8 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3)

--- a/c/src/tests/libtests/rtems++/System.h
+++ b/c/src/tests/libtests/rtems++/System.h
@@ -112,8 +112,8 @@ class Io_during_interrupt

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_MAXIMUM_SEMAPHORES          2
--- a/c/src/tests/libtests/rtmonuse/system.h
+++ b/c/src/tests/libtests/rtmonuse/system.h
@@ -35,8 +35,8 @@ void Get_all_counters( void );
 
 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_INIT_TASK_PRIORITY          10
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
--- a/c/src/tests/libtests/stackchk/system.h
+++ b/c/src/tests/libtests/stackchk/system.h
@@ -33,8 +33,8 @@ void blow_stack( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/libtests/termios/init.c
+++ b/c/src/tests/libtests/termios/init.c
@@ -24,8 +24,8 @@

 #include <bsp.h>

-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/mptests/mp01/system.h
+++ b/c/src/tests/mptests/mp01/system.h
@@ -29,8 +29,8 @@ rtems_task Test_task(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_GLOBAL
--- a/c/src/tests/mptests/mp02/system.h
+++ b/c/src/tests/mptests/mp02/system.h
@@ -29,8 +29,8 @@ rtems_task Test_task(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/mptests/mp03/system.h
+++ b/c/src/tests/mptests/mp03/system.h
@@ -34,8 +34,8 @@ rtems_timer_service_routine Delayed_send_event(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TIMERS              1

--- a/c/src/tests/mptests/mp04/system.h
+++ b/c/src/tests/mptests/mp04/system.h
@@ -29,8 +29,8 @@ rtems_task Test_task(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TIMERS              1

--- a/c/src/tests/mptests/mp05/system.h
+++ b/c/src/tests/mptests/mp05/system.h
@@ -31,8 +31,8 @@ rtems_asr Process_asr( rtems_signal_set );
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TIMERS              1

--- a/c/src/tests/mptests/mp06/system.h
+++ b/c/src/tests/mptests/mp06/system.h
@@ -29,8 +29,8 @@ rtems_task Test_task(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TIMERS              1

--- a/c/src/tests/mptests/mp07/system.h
+++ b/c/src/tests/mptests/mp07/system.h
@@ -29,8 +29,8 @@ rtems_task Test_task(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TIMERS              1

--- a/c/src/tests/mptests/mp08/system.h
+++ b/c/src/tests/mptests/mp08/system.h
@@ -29,8 +29,8 @@ rtems_task Test_task(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1
--- a/c/src/tests/mptests/mp09/system.h
+++ b/c/src/tests/mptests/mp09/system.h
@@ -33,8 +33,8 @@ void Send_messages( void );
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
--- a/c/src/tests/mptests/mp10/system.h
+++ b/c/src/tests/mptests/mp10/system.h
@@ -37,8 +37,8 @@ rtems_task Test_task3(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #if ( NODE_NUMBER == 1 )
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1
--- a/c/src/tests/mptests/mp11/system.h
+++ b/c/src/tests/mptests/mp11/system.h
@@ -25,8 +25,8 @@ rtems_task Init(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     0
 #define CONFIGURE_MP_MAXIMUM_PROXIES            0
--- a/c/src/tests/mptests/mp12/system.h
+++ b/c/src/tests/mptests/mp12/system.h
@@ -27,8 +27,8 @@ rtems_task Init(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     1
 #define CONFIGURE_MP_MAXIMUM_PROXIES            0
--- a/c/src/tests/mptests/mp13/system.h
+++ b/c/src/tests/mptests/mp13/system.h
@@ -33,8 +33,8 @@ rtems_task Test_task2(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #if ( NODE_NUMBER == 1 )
 #define CONFIGURE_MAXIMUM_SEMAPHORES          1
--- a/c/src/tests/mptests/mp14/system.h
+++ b/c/src/tests/mptests/mp14/system.h
@@ -52,8 +52,8 @@ void Exit_test( void );
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_TICKS_PER_TIMESLICE   1
 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1)
--- a/c/src/tests/psxtests/psx01/system.h
+++ b/c/src/tests/psxtests/psx01/system.h
@@ -30,8 +30,8 @@ void *Task_1_through_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx02/system.h
+++ b/c/src/tests/psxtests/psx02/system.h
@@ -28,8 +28,8 @@ void *Task_1_through_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx03/system.h
+++ b/c/src/tests/psxtests/psx03/system.h
@@ -31,8 +31,8 @@ void *Task_2(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx04/system.h
+++ b/c/src/tests/psxtests/psx04/system.h
@@ -35,8 +35,8 @@ void *Task_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 5

--- a/c/src/tests/psxtests/psx05/system.h
+++ b/c/src/tests/psxtests/psx05/system.h
@@ -35,8 +35,8 @@ void *Task_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx06/system.h
+++ b/c/src/tests/psxtests/psx06/system.h
@@ -31,8 +31,8 @@ void *Task_2(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx07/system.h
+++ b/c/src/tests/psxtests/psx07/system.h
@@ -27,8 +27,8 @@ void *Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx08/system.h
+++ b/c/src/tests/psxtests/psx08/system.h
@@ -35,8 +35,8 @@ void *Task_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx09/system.h
+++ b/c/src/tests/psxtests/psx09/system.h
@@ -31,8 +31,8 @@ void *Task_2(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx10/system.h
+++ b/c/src/tests/psxtests/psx10/system.h
@@ -37,8 +37,8 @@ void *Task_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx11/system.h
+++ b/c/src/tests/psxtests/psx11/system.h
@@ -27,8 +27,8 @@ void *Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx12/system.h
+++ b/c/src/tests/psxtests/psx12/system.h
@@ -27,8 +27,8 @@ void *Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psx13/main.c
+++ b/c/src/tests/psxtests/psx13/main.c
@@ -27,8 +27,8 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/psxtests/psxcancel/system.h
+++ b/c/src/tests/psxtests/psxcancel/system.h
@@ -30,8 +30,8 @@ void *Task_1_through_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psxfile01/main.c
+++ b/c/src/tests/psxtests/psxfile01/main.c
@@ -27,8 +27,8 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/psxtests/psxmount/main.c
+++ b/c/src/tests/psxtests/psxmount/main.c
@@ -20,7 +20,7 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/psxtests/psxmsgq01/system.h
+++ b/c/src/tests/psxtests/psxmsgq01/system.h
@@ -31,8 +31,8 @@ void *Task_1_through_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psxreaddir/main.c
+++ b/c/src/tests/psxtests/psxreaddir/main.c
@@ -18,7 +18,7 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/psxtests/psxsem01/system.h
+++ b/c/src/tests/psxtests/psxsem01/system.h
@@ -32,8 +32,8 @@ void *Task_1_through_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/psxtests/psxstat/main.c
+++ b/c/src/tests/psxtests/psxstat/main.c
@@ -27,8 +27,8 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
--- a/c/src/tests/psxtests/psxtime/main.c
+++ b/c/src/tests/psxtests/psxtime/main.c
@@ -27,8 +27,8 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/psxtests/psxtimer/system.h
+++ b/c/src/tests/psxtests/psxtimer/system.h
@@ -36,8 +36,8 @@ void *task_c(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_POSIX_INIT_THREAD_TABLE

--- a/c/src/tests/samples/base_mp/system.h
+++ b/c/src/tests/samples/base_mp/system.h
@@ -29,8 +29,8 @@ rtems_task Application_task(
 
 #define CONFIGURE_MP_APPLICATION
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/samples/base_sp/system.h
+++ b/c/src/tests/samples/base_sp/system.h
@@ -27,8 +27,8 @@ rtems_task Application_task(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/samples/cdtest/system.h
+++ b/c/src/tests/samples/cdtest/system.h
@@ -23,8 +23,8 @@ rtems_task main_task(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_ENTRY_POINT   main_task
--- a/c/src/tests/samples/hello/system.h
+++ b/c/src/tests/samples/hello/system.h
@@ -23,7 +23,7 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/samples/paranoia/system.h
+++ b/c/src/tests/samples/paranoia/system.h
@@ -23,8 +23,8 @@ rtems_task Init(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_FLOATING_POINT
--- a/c/src/tests/samples/ticker/system.h
+++ b/c/src/tests/samples/ticker/system.h
@@ -27,8 +27,8 @@ rtems_task Test_task(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/samples/unlimited/system.h
+++ b/c/src/tests/samples/unlimited/system.h
@@ -43,7 +43,7 @@ void test3();

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/sptests/sp01/system.h
+++ b/c/src/tests/sptests/sp01/system.h
@@ -27,8 +27,8 @@ rtems_task Task_1_through_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/sptests/sp02/system.h
+++ b/c/src/tests/sptests/sp02/system.h
@@ -39,8 +39,8 @@ rtems_task Task_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/sptests/sp03/system.h
+++ b/c/src/tests/sptests/sp03/system.h
@@ -31,8 +31,8 @@ rtems_task Task_2(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/sptests/sp04/system.h
+++ b/c/src/tests/sptests/sp04/system.h
@@ -40,8 +40,8 @@ void Task_switch(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/sptests/sp05/system.h
+++ b/c/src/tests/sptests/sp05/system.h
@@ -35,8 +35,8 @@ rtems_task Task_3(
 
 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_TICKS_PER_TIMESLICE       100

--- a/c/src/tests/sptests/sp06/system.h
+++ b/c/src/tests/sptests/sp06/system.h
@@ -35,8 +35,8 @@ rtems_task Task_3(
 
 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_TICKS_PER_TIMESLICE       100

--- a/c/src/tests/sptests/sp07/system.h
+++ b/c/src/tests/sptests/sp07/system.h
@@ -63,8 +63,8 @@ rtems_extension Task_exit_extension(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/sptests/sp08/system.h
+++ b/c/src/tests/sptests/sp08/system.h
@@ -30,8 +30,8 @@ rtems_task Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_TICKS_PER_TIMESLICE       100

--- a/c/src/tests/sptests/sp09/system.h
+++ b/c/src/tests/sptests/sp09/system.h
@@ -80,8 +80,8 @@ void Screen14( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_MAXIMUM_SEMAPHORES          2
--- a/c/src/tests/sptests/sp11/system.h
+++ b/c/src/tests/sptests/sp11/system.h
@@ -66,8 +66,8 @@ rtems_timer_service_routine TA2_send_10_to_self(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_TIMERS              6
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/sptests/sp12/system.h
+++ b/c/src/tests/sptests/sp12/system.h
@@ -51,8 +51,8 @@ rtems_task Task5(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_INIT_TASK_STACK_SIZE      (RTEMS_MINIMUM_STACK_SIZE * 2)
 #define CONFIGURE_MAXIMUM_SEMAPHORES         10
--- a/c/src/tests/sptests/sp13/system.h
+++ b/c/src/tests/sptests/sp13/system.h
@@ -44,8 +44,8 @@ rtems_task Task_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     10
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/sptests/sp14/system.h
+++ b/c/src/tests/sptests/sp14/system.h
@@ -40,8 +40,8 @@ rtems_task Task_2(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/sptests/sp15/system.h
+++ b/c/src/tests/sptests/sp15/system.h
@@ -27,8 +27,8 @@ rtems_task Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_PARTITIONS          2
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/sptests/sp16/system.h
+++ b/c/src/tests/sptests/sp16/system.h
@@ -43,8 +43,8 @@ rtems_task Task5(
 
 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_REGIONS             4
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
--- a/c/src/tests/sptests/sp17/system.h
+++ b/c/src/tests/sptests/sp17/system.h
@@ -35,8 +35,8 @@ rtems_task Task_2(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MICROSECONDS_PER_TICK   RTEMS_MILLISECONDS_TO_MICROSECONDS(25)
 #define CONFIGURE_TICKS_PER_TIMESLICE     1000
--- a/c/src/tests/sptests/sp19/system.h
+++ b/c/src/tests/sptests/sp19/system.h
@@ -37,8 +37,8 @@ rtems_task Task_1(

 #define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_FLOATING_POINT 

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/sptests/sp20/system.h
+++ b/c/src/tests/sptests/sp20/system.h
@@ -35,8 +35,8 @@ void Get_all_counters( void );
 
 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_INIT_TASK_PRIORITY          10
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
--- a/c/src/tests/sptests/sp21/system.h
+++ b/c/src/tests/sptests/sp21/system.h
@@ -27,9 +27,9 @@ rtems_task Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_TEST_NEEDS_STUB_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/sptests/sp22/system.h
+++ b/c/src/tests/sptests/sp22/system.h
@@ -34,8 +34,8 @@ rtems_task Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_TIMERS          2
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
--- a/c/src/tests/sptests/sp23/system.h
+++ b/c/src/tests/sptests/sp23/system.h
@@ -27,8 +27,8 @@ rtems_task Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_PORTS               1
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
--- a/c/src/tests/sptests/sp24/system.h
+++ b/c/src/tests/sptests/sp24/system.h
@@ -32,8 +32,8 @@ rtems_task Task_1_through_3(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_TIMERS              3

--- a/c/src/tests/sptests/sp25/system.h
+++ b/c/src/tests/sptests/sp25/system.h
@@ -27,8 +27,8 @@ rtems_task Task_1(

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_REGIONS             1

--- a/c/src/tests/sptests/sp26/system.h
+++ b/c/src/tests/sptests/sp26/system.h
@@ -25,8 +25,8 @@ void task1(void);

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MAXIMUM_REGIONS             1

--- a/c/src/tests/sptests/sp27/init.c
+++ b/c/src/tests/sptests/sp27/init.c
@@ -10,8 +10,8 @@ rtems_task Init (rtems_task_argument argument);

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MICROSECONDS_PER_TICK       52429

--- a/c/src/tests/sptests/sp28/init.c
+++ b/c/src/tests/sptests/sp28/init.c
@@ -7,8 +7,8 @@

 rtems_task Init(rtems_task_argument argument);

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS    2

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
--- a/c/src/tests/sptests/sp29/init.c
+++ b/c/src/tests/sptests/sp29/init.c
@@ -10,8 +10,8 @@ rtems_task Init (rtems_task_argument argument);

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_INIT

--- a/c/src/tests/sptests/spfatal/system.h
+++ b/c/src/tests/sptests/spfatal/system.h
@@ -52,8 +52,8 @@ extern rtems_extensions_table initial_extensions;
    Fatal_extension          /* fatal   */ \
  }

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(0)
 #define CONFIGURE_TICKS_PER_TIMESLICE   0
--- a/c/src/tests/sptests/spsize/system.h
+++ b/c/src/tests/sptests/spsize/system.h
@@ -29,8 +29,8 @@ int getint( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

--- a/c/src/tests/tmitrontests/tmitronsem01/system.h
+++ b/c/src/tests/tmitrontests/tmitronsem01/system.h
@@ -23,8 +23,8 @@ void ITRON_Init( void );

 /* configuration information */

-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 #define CONFIGURE_MAXIMUM_ITRON_SEMAPHORES  100
--- a/c/src/tests/tmtests/tm01/system.h
+++ b/c/src/tests/tmtests/tm01/system.h
@@ -26,8 +26,8 @@ rtems_task Init(

 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER

 #define CONFIGURE_MAXIMUM_TASKS              2
 #define CONFIGURE_MAXIMUM_SEMAPHORES         1
--- a/c/src/tests/tmtests/tm02/system.h
+++ b/c/src/tests/tmtests/tm02/system.h
@@ -26,8 +26,8 @@ rtems_task Init(

 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER

 #define CONFIGURE_MAXIMUM_TASKS              111
 #define CONFIGURE_MAXIMUM_TIMERS             110
--- a/c/src/tests/tmtests/tm03/system.h
+++ b/c/src/tests/tmtests/tm03/system.h
@@ -26,8 +26,8 @@ rtems_task Init(

 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER

 #define CONFIGURE_MAXIMUM_TASKS              111
 #define CONFIGURE_MAXIMUM_TIMERS             110
--- a/Show More
+++ b/Show More