diff options
Diffstat (limited to 'c/src/ada-tests/sptests/sp16')
| -rw-r--r-- | c/src/ada-tests/sptests/sp16/config.h | 3 | ||||
| -rw-r--r-- | c/src/ada-tests/sptests/sp16/sp16.scn | 48 | ||||
| -rw-r--r-- | c/src/ada-tests/sptests/sp16/sptest.adb | 10 |
3 files changed, 31 insertions, 30 deletions
diff --git a/c/src/ada-tests/sptests/sp16/config.h b/c/src/ada-tests/sptests/sp16/config.h index 293e84b64e..c71a370201 100644 --- a/c/src/ada-tests/sptests/sp16/config.h +++ b/c/src/ada-tests/sptests/sp16/config.h @@ -2,7 +2,7 @@ * * This include file defines the Configuration Table for this test. * - * COPYRIGHT (c) 1989-1997. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may in @@ -20,6 +20,7 @@ #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_REGIONS 4 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/ada-tests/sptests/sp16/sp16.scn b/c/src/ada-tests/sptests/sp16/sp16.scn index 4706729d3d..3e3f314b67 100644 --- a/c/src/ada-tests/sptests/sp16/sp16.scn +++ b/c/src/ada-tests/sptests/sp16/sp16.scn @@ -1,48 +1,48 @@ *** TEST 16 *** -TA1 - region_ident - rnid => 16#10001# +TA1 - region_ident - rnid => 16#32010001# TA1 - region_get_segment - wait on 100 byte segment from region 2 -TA1 - got segment from region 2 - 16#F78# +TA1 - got segment from region 2 - 16#30# TA1 - region_get_segment - wait on 3K segment from region 3 -TA1 - got segment from region 3 - 16#3F8# +TA1 - got segment from region 3 - 16#30# TA1 - region_get_segment - get 3080 byte segment from region 1 - NO_WAIT -TA1 - got segment from region 1 - 16#378# +TA1 - got segment from region 1 - 16#20# TA1 - task_wake_after - yield processor TA2 - region_get_segment - wait on 2K segment from region 1 -TA3 - region_get_segment - wait on 3968 byte segment from region 2 -<pause> -TA1 - region_return_segment - return segment to region 1 - 16#378# +TA3 - region_get_segment - wait on 3950 byte segment from region 2 +<pause> +TA1 - region_return_segment - return segment to region 1 - 16#20# TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1 -TA2 - got segment from region 1 - 16#7F8# -TA2 - region_return_segment - return segment to region 1 - 16#7F8# +TA2 - got segment from region 1 - 16#20# +TA2 - region_return_segment - return segment to region 1 - 16#20# TA2 - task_set_priority - make self highest priority task -TA2 - region_get_segment - wait on 3968 byte segment from region 2 -TA1 - got segment from region 1 - 16#3F8# -TA1 - region_return_segment - return segment to region 2 - 16#F78# -TA2 - got segment from region 2 - 16#8# -TA2 - region_return_segment - return segment to region 2 - 16#8# +TA2 - region_get_segment - wait on 3950 byte segment from region 2 +TA1 - got segment from region 1 - 16#20# +TA1 - region_return_segment - return segment to region 2 - 16#30# +TA2 - got segment from region 2 - 16#30# +TA2 - region_return_segment - return segment to region 2 - 16#30# TA2 - task_delete - delete self TA1 - task_wake_after - yield processor -TA3 - got segment from region 2 - 16#8# +TA3 - got segment from region 2 - 16#30# TA3 - region_get_segment - wait on 2K segment from region 3 TA1 - task_delete - delete TA3 -<pause> +<pause> TA1 - task_wake_after - yield processor TA4 - region_get_segment - wait on 1.5K segment from region 1 TA5 - region_get_segment - wait on 1.5K segment from region 1 -TA1 - region_return_segment - return segment to region 1 - 16#3F8# +TA1 - region_return_segment - return segment to region 1 - 16#20# TA1 - task_wake_after - yield processor -TA4 - got and returned 16#9F8# -TA5 - got and returned 16#3F0# +TA4 - got and returned 16#20# +TA5 - got and returned 16#6A0# TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1 -TA1 - got segment from region 1 - 16#3F8# +TA1 - got segment from region 1 - 16#20# TA1 - task_wake_after - sleep 1 second -TA4 - region_get_segment - wait on 3K segment from region 1 TA5 - region_get_segment - wait on 3K segment from region 1 +TA4 - region_get_segment - wait on 3K segment from region 1 TA1 - task_delete - delete TA4 -TA1 - region_return_segment - return segment to region 1 - 16#3F8# +TA1 - region_return_segment - return segment to region 1 - 16#20# TA1 - task_wake_after - yield processor -TA5 - got segment from region 1 - 16#3F8# -TA5 - region_return_segment - return segment to region 1 - 16#3F8# +TA5 - got segment from region 1 - 16#20# +TA5 - region_return_segment - return segment to region 1 - 16#20# TA5 - task_delete - delete self TA1 - region_delete - delete region 1 *** END OF TEST 16 *** diff --git a/c/src/ada-tests/sptests/sp16/sptest.adb b/c/src/ada-tests/sptests/sp16/sptest.adb index 595d61bb05..95463e01ee 100644 --- a/c/src/ada-tests/sptests/sp16/sptest.adb +++ b/c/src/ada-tests/sptests/sp16/sptest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2007. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -483,12 +483,12 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); TEXT_IO.PUT( - "TA2 - region_get_segment - wait on 3968 byte segment " + "TA2 - region_get_segment - wait on 3950 byte segment " ); TEXT_IO.PUT_LINE( "from region 2" ); RTEMS.REGION_GET_SEGMENT( SPTEST.REGION_ID( 2 ), - 3968, + 3950, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, SEGMENT_ADDRESS_2, @@ -530,11 +530,11 @@ TEST_SUPPORT.PAUSE; STATUS : RTEMS.STATUS_CODES; begin - TEXT_IO.PUT( "TA3 - region_get_segment - wait on 3968 byte segment " ); + TEXT_IO.PUT( "TA3 - region_get_segment - wait on 3950 byte segment " ); TEXT_IO.PUT_LINE( "from region 2" ); RTEMS.REGION_GET_SEGMENT( SPTEST.REGION_ID( 2 ), - 3968, + 3950, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, SEGMENT_ADDRESS_1, |