diff options
Diffstat (limited to 'testsuites/sptests/sp12')
-rw-r--r-- | testsuites/sptests/sp12/init.c | 5 | ||||
-rw-r--r-- | testsuites/sptests/sp12/sp12.scn | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp12/system.h | 60 |
3 files changed, 57 insertions, 10 deletions
diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c index 3bbd0ef1c6..159ef815da 100644 --- a/testsuites/sptests/sp12/init.c +++ b/testsuites/sptests/sp12/init.c @@ -22,11 +22,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/sptests/sp12/sp12.scn b/testsuites/sptests/sp12/sp12.scn index 3f1bd26b6d..ff120e7545 100644 --- a/testsuites/sptests/sp12/sp12.scn +++ b/testsuites/sptests/sp12/sp12.scn @@ -35,7 +35,7 @@ PRI5 - rtems_semaphore_release - nested PRI5 - rtems_semaphore_release - restore priority PRI5 - priority of PRI5 is 68 <pause> -TA1 - rtems_semaphore_ident - smid => 10010001 +TA1 - rtems_semaphore_ident - smid => 10010002 TA1 - rtems_semaphore_obtain - wait forever on SM2 TA1 - got SM2 TA1 - rtems_semaphore_obtain - wait forever on SM3 diff --git a/testsuites/sptests/sp12/system.h b/testsuites/sptests/sp12/system.h index 0bf193dad9..3c126963b6 100644 --- a/testsuites/sptests/sp12/system.h +++ b/testsuites/sptests/sp12/system.h @@ -16,14 +16,64 @@ #include <tmacros.h> -/* Miscellaneous */ +/* functions */ -#define EXTERN extern /* external definition */ +rtems_task Init( + rtems_task_argument argument +); + +void Priority_test_driver( + rtems_unsigned32 priority_base +); + +rtems_task Priority_task( + rtems_task_argument its_index +); + +rtems_task Task_1( + rtems_task_argument argument +); + +rtems_task Task_2( + rtems_task_argument argument +); + +rtems_task Task_3( + rtems_task_argument argument +); + +rtems_task Task_4( + rtems_task_argument argument +); + +rtems_task Task5( + 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_MAXIMUM_SEMAPHORES 10 +#define CONFIGURE_TICKS_PER_TIMESLICE 100 + +#include <confdefs.h> + +/* global variables */ + + +TEST_EXTERN rtems_id Task_id[ 6 ]; /* array of task ids */ +TEST_EXTERN rtems_name Task_name[ 6 ]; /* array of task names */ + +TEST_EXTERN rtems_id Priority_task_id[ 6 ]; /* array of task ids */ +TEST_EXTERN rtems_name Priority_task_name[ 6 ]; /* array of task names */ + +TEST_EXTERN rtems_task_priority Task_priority[ 6 ]; + +TEST_EXTERN rtems_id Semaphore_id[ 4 ]; /* array of semaphore ids */ +TEST_EXTERN rtems_name Semaphore_name[ 4 ]; /* array of semaphore names */ /* end of include file */ |