[rtems commit] sp09: Remove region test references

Joel Sherrill joel at rtems.org
Mon Dec 30 15:47:33 UTC 2013


Module:    rtems
Branch:    master
Commit:    19530271209ece63be553685dfc130ae6276775c
Changeset: http://git.rtems.org/rtems/commit/?id=19530271209ece63be553685dfc130ae6276775c

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Mon Dec 30 09:53:22 2013 -0600

sp09: Remove region test references

---

 testsuites/sptests/sp09/init.c     |    2 -
 testsuites/sptests/sp09/screen11.c |    4 ++-
 testsuites/sptests/sp09/sp09.doc   |   12 +++++-----
 testsuites/sptests/sp09/sp09.scn   |   39 +-----------------------------------
 testsuites/sptests/sp09/system.h   |    9 --------
 5 files changed, 10 insertions(+), 56 deletions(-)

diff --git a/testsuites/sptests/sp09/init.c b/testsuites/sptests/sp09/init.c
index 6adcac5..8af9baf 100644
--- a/testsuites/sptests/sp09/init.c
+++ b/testsuites/sptests/sp09/init.c
@@ -42,8 +42,6 @@ rtems_task Init(
 
   Partition_name[ 1 ]  =  rtems_build_name( 'P', 'T', '1', ' ' );
 
-  Region_name[ 1 ]     =  rtems_build_name( 'R', 'N', '1', ' ' );
-
   Port_name[ 1 ]       =  rtems_build_name( 'D', 'P', '1', ' ' );
 
   Period_name[ 1 ]     =  rtems_build_name( 'T', 'M', '1', ' ' );
diff --git a/testsuites/sptests/sp09/screen11.c b/testsuites/sptests/sp09/screen11.c
index 05f18d3..29309ee 100644
--- a/testsuites/sptests/sp09/screen11.c
+++ b/testsuites/sptests/sp09/screen11.c
@@ -20,6 +20,8 @@
 
 #include "system.h"
 
+uint32_t Other_Memory;
+
 void Screen11()
 {
   void              *buffer_address_1;
@@ -296,7 +298,7 @@ void Screen11()
 
   status = rtems_partition_return_buffer(
     Partition_id[ 1 ],
-    Region_good_area                  /* NOTE: Region Memory */
+    &Other_Memory
   );
   fatal_directive_status(
     status,
diff --git a/testsuites/sptests/sp09/sp09.doc b/testsuites/sptests/sp09/sp09.doc
index 7b6903e..31e7620 100644
--- a/testsuites/sptests/sp09/sp09.doc
+++ b/testsuites/sptests/sp09/sp09.doc
@@ -12,12 +12,12 @@ This file describes the directives and concepts tested by this test set.
 test set name:  test9
 
 directives:
-  ex_init, ex_start, tm_tick, i_return, t_resume, t_setpri, t_setreg, t_start,
-  t_suspend, tm_wkafter, tm_wkwhen, ev_receive, ev_send, sm_create, sm_delete,
-  sm_ident, sm_p, sm_v, q_broadcast, q_create, q_delete, q_ident, q_receive,
-  q_send, q_urgent, as_catch, as_send, as_return, rn_create, rn_delete,
-  rn_getseg, rn_ident, rn_retseg, pt_create, pt_delete, pt_getbug, pt_ident,
-  pt_retbuf, de_close, de_cntrl, de_init, de_open, de_read, de_write
+  tm_tick, t_resume, t_setpri, t_setreg, t_start, t_suspend, tm_wkafter,
+  tm_wkwhen, ev_receive, ev_send, sm_create, sm_delete, sm_ident,
+  sm_p, sm_v, q_broadcast, q_create, q_delete, q_ident, q_receive,
+  q_send, q_urgent, as_catch, as_send, as_return, pt_create, pt_delete,
+  pt_getbug, pt_ident, pt_retbuf, de_close, de_cntrl, de_init, de_open,
+  de_read, de_write
 
 concepts:
 
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index c489357..ce1512c 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -59,7 +59,7 @@ TA1 - rtems_task_wake_when - 08:30:51   01/05/1988 - RTEMS_INVALID_CLOCK
 <pause - screen 3>
 TA1 - rtems_task_create - RTEMS_INVALID_NAME
 TA1 - rtems_task_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED
+TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED  -- SKIPPED
 TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL
 TA1 - rtems_task_suspend - suspend TA2 - RTEMS_SUCCESSFUL
 TA1 - rtems_task_suspend - suspend TA2 - RTEMS_ALREADY_SUSPENDED
@@ -242,41 +242,4 @@ TA1 - rtems_partition_get_buffer - RTEMS_UNSATISFIED
 TA1 - rtems_partition_delete - RTEMS_RESOURCE_IN_USE
 TA1 - rtems_partition_return_buffer - RTEMS_INVALID_ADDRESS - out of range
 TA1 - rtems_partition_return_buffer - RTEMS_INVALID_ADDRESS - not on boundary
-<pause - screen 12>
-TA1 - rtems_region_create - RTEMS_INVALID_NAME
-TA1 - rtems_region_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_create - RTEMS_INVALID_SIZE
-TA1 - rtems_region_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_create - RTEMS_SUCCESSFUL
-TA1 - rtems_region_extend - NULL address - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_extend - address within - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_create - RTEMS_TOO_MANY
-TA1 - rtems_region_delete - unknown RTEMS_INVALID_ID
-TA1 - rtems_region_delete - local RTEMS_INVALID_ID
-TA1 - rtems_region_ident - RTEMS_INVALID_NAME
-TA1 - rtems_region_get_information - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_get_information - unknown RTEMS_INVALID_ID
-TA1 - rtems_region_get_free_information - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_get_free_information - unknown RTEMS_INVALID_ID
-TA1 - rtems_region_get_segment - RTEMS_INVALID_ID
-TA1 - rtems_region_get_segment - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_get_segment - 0 size - RTEMS_INVALID_SIZE
-TA1 - rtems_region_get_segment - too big - RTEMS_INVALID_SIZE
-TA1 - rtems_region_get_segment - RTEMS_SUCCESSFUL
-TA1 - rtems_region_get_segment - RTEMS_UNSATISFIED
-TA1 - rtems_region_get_segment - timeout in 3 seconds
-TA1 - rtems_region_get_segment - woke up with RTEMS_TIMEOUT
-TA1 - rtems_region_get_segment_size - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_get_segment_size - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_get_segment_size - unknown RTEMS_INVALID_ID
-TA1 - rtems_region_delete - RTEMS_RESOURCE_IN_USE
-TA1 - rtems_region_resize_segment - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_resize_segment - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_resize_segment - RTEMS_INVALID_ID
-TA1 - rtems_region_return_segment - RTEMS_INVALID_ID
-TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS
-TA1 - rtems_debug_disable - RTEMS_DEBUG_REGION
-TA1 - rtems_debug_enable - RTEMS_DEBUG_REGION
-TA1 - rtems_region_extend - RTEMS_INVALID_ID
-TA1 - rtems_region_extend - within heap - RTEMS_INVALID_ADDRESS
 *** END OF TEST 9 ***
diff --git a/testsuites/sptests/sp09/system.h b/testsuites/sptests/sp09/system.h
index aed0ca9..7bbc19a 100644
--- a/testsuites/sptests/sp09/system.h
+++ b/testsuites/sptests/sp09/system.h
@@ -82,7 +82,6 @@ void Screen11( void );
 #define CONFIGURE_MAXIMUM_SEMAPHORES          2
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
 #define CONFIGURE_MAXIMUM_PARTITIONS          1
-#define CONFIGURE_MAXIMUM_REGIONS             1
 #define CONFIGURE_MAXIMUM_PERIODS             1
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
@@ -107,9 +106,6 @@ TEST_EXTERN rtems_id   Queue_id[ 3 ];       /* array of queue ids */
 TEST_EXTERN rtems_name Partition_name[ 2 ]; /* array of partition names */
 TEST_EXTERN rtems_id   Partition_id[ 2 ];   /* array of partition ids */
 
-TEST_EXTERN rtems_name Region_name[ 2 ];    /* array of region names */
-TEST_EXTERN rtems_id   Region_id[ 2 ];      /* array of region ids */
-
 TEST_EXTERN rtems_name Port_name[ 2 ];      /* array of port names */
 TEST_EXTERN rtems_id   Port_id[ 2 ];        /* array of port ids */
 
@@ -124,9 +120,4 @@ TEST_EXTERN rtems_id   Junk_id;             /* id used to return errors */
 TEST_EXTERN uint8_t   Partition_good_area[256] CPU_STRUCTURE_ALIGNMENT;
 #define Partition_bad_area (void *) 0x00000005
 
-TEST_EXTERN uint32_t   Region_good_area[4096] CPU_STRUCTURE_ALIGNMENT;
-#define Region_bad_area    (void *) 0x00000005
-#define REGION_START_OFFSET 1024
-#define REGION_LENGTH       512
-
 /* end of include file */




More information about the vc mailing list