diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-02 15:25:36 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-02 15:25:36 +0000 |
commit | 62e6e7cdadba035fb3ef1ef202117b0b38325e13 (patch) | |
tree | 2ac962d6ad469e0eae12a87dc6bcb31fd0fe36a8 /testsuites/sptests | |
parent | 2009-07-02 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-62e6e7cdadba035fb3ef1ef202117b0b38325e13.tar.bz2 |
2009-07-02 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, configure.ac: Add new test for user configured stack
allocator/deallocator. Test both pass and fail cases.
* spstkalloc/.cvsignore, spstkalloc/Makefile.am, spstkalloc/init.c,
spstkalloc/spstkalloc.doc, spstkalloc/spstkalloc.scn: New files.
Diffstat (limited to '')
-rw-r--r-- | testsuites/sptests/ChangeLog | 7 | ||||
-rw-r--r-- | testsuites/sptests/Makefile.am | 2 | ||||
-rw-r--r-- | testsuites/sptests/configure.ac | 1 | ||||
-rw-r--r-- | testsuites/sptests/spstkalloc/.cvsignore | 2 | ||||
-rw-r--r-- | testsuites/sptests/spstkalloc/Makefile.am | 29 | ||||
-rw-r--r-- | testsuites/sptests/spstkalloc/init.c | 90 | ||||
-rw-r--r-- | testsuites/sptests/spstkalloc/spstkalloc.doc | 24 | ||||
-rw-r--r-- | testsuites/sptests/spstkalloc/spstkalloc.scn | 0 |
8 files changed, 154 insertions, 1 deletions
diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index bbcffc6f4b..55438b6c6d 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,5 +1,12 @@ 2009-07-02 Joel Sherrill <joel.sherrill@OARcorp.com> + * Makefile.am, configure.ac: Add new test for user configured stack + allocator/deallocator. Test both pass and fail cases. + * spstkalloc/.cvsignore, spstkalloc/Makefile.am, spstkalloc/init.c, + spstkalloc/spstkalloc.doc, spstkalloc/spstkalloc.scn: New files. + +2009-07-02 Joel Sherrill <joel.sherrill@OARcorp.com> + * spchain/init.c, spchain/spchain.scn: Clean up test. 2009-07-01 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 5319559f42..6f981673a2 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \ sp45 sp46 sp47 sp48 sp49 sp50 sp51 sp52 sp53 sp54 \ spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 spfatal06 spfatal07 \ spfatal08 spfatal09 spfatal10 spfatal11 spchain spobjgetnext spprintk \ - spsize spwatchdog spwkspace + spsize spstkalloc spwatchdog spwkspace DIST_SUBDIRS = $(SUBDIRS) spfatal spfatal_support EXTRA_DIST = spfatal_support/init.c spfatal_support/system.h diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index f975572621..98e6b39fff 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -95,6 +95,7 @@ spfatal11/Makefile spobjgetnext/Makefile spprintk/Makefile spsize/Makefile +spstkalloc/Makefile spwatchdog/Makefile spwkspace/Makefile ]) diff --git a/testsuites/sptests/spstkalloc/.cvsignore b/testsuites/sptests/spstkalloc/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/spstkalloc/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/spstkalloc/Makefile.am b/testsuites/sptests/spstkalloc/Makefile.am new file mode 100644 index 0000000000..bf4addcbd4 --- /dev/null +++ b/testsuites/sptests/spstkalloc/Makefile.am @@ -0,0 +1,29 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = spstkalloc +spstkalloc_SOURCES = init.c + +dist_rtems_tests_DATA = spstkalloc.scn +dist_rtems_tests_DATA += spstkalloc.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +spstkalloc_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include +AM_CPPFLAGS += -DUSE_TIMER_SERVER + +LINK_OBJS = $(spstkalloc_OBJECTS) $(spstkalloc_LDADD) +LINK_LIBS = $(spstkalloc_LDLIBS) + +spstkalloc$(EXEEXT): $(spstkalloc_OBJECTS) $(spstkalloc_DEPENDENCIES) + @rm -f spstkalloc$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c new file mode 100644 index 0000000000..131a803525 --- /dev/null +++ b/testsuites/sptests/spstkalloc/init.c @@ -0,0 +1,90 @@ +/* + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#include <tmacros.h> + +#define MAXIMUM_STACKS 3 + +typedef struct { + uint8_t Space[CPU_STACK_MINIMUM_SIZE]; +} StackMemory_t; + +int stackToAlloc = 0; +StackMemory_t Stacks[3]; +void *StackDeallocated = NULL; + +void *StackAllocator(uint32_t size) +{ + if (stackToAlloc < MAXIMUM_STACKS) + return &Stacks[stackToAlloc++]; + return NULL; +} + +void StackDeallocator(void *stack) +{ + StackDeallocated = stack; +} + +rtems_task Init( + rtems_task_argument ignored +) +{ + rtems_status_code rc; + rtems_id taskId; + rtems_id taskId1; + + puts( "\n\n*** TEST OF STACK ALLOCATOR PLUGIN ***" ); + + puts( "Init - create task TA1 to use custom stack allocator - OK" ); + rc = rtems_task_create( + rtems_build_name( 'T', 'A', '1', ' ' ), + 1, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &taskId + ); + directive_failed( rc, "rtems_task_create of TA1" ); + + puts( "Init - create task TA1 to have custom stack allocator fail" ); + rc = rtems_task_create( + rtems_build_name( 'F', 'A', 'I', 'L' ), + 1, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &taskId1 + ); + fatal_directive_status( rc, RTEMS_UNSATISFIED, "rtems_task_create of FAIL" ); + + puts( "Init - delete task TA1 to use custom stack deallocator - OK" ); + rc = rtems_task_delete( taskId ); + directive_failed( rc, "rtems_task_delete of TA1" ); + + puts( "*** END OF OF STACK ALLOCATOR PLUGIN TEST ***" ); + rtems_test_exit(0); +} + +/* configuration information */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER + +#define CONFIGURE_TASK_STACK_ALLOCATOR StackAllocator +#define CONFIGURE_TASK_STACK_DEALLOCATOR StackDeallocator + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 3 + +#define CONFIGURE_INIT +#include <rtems/confdefs.h> + +/* global variables */ diff --git a/testsuites/sptests/spstkalloc/spstkalloc.doc b/testsuites/sptests/spstkalloc/spstkalloc.doc new file mode 100644 index 0000000000..67c370a6d9 --- /dev/null +++ b/testsuites/sptests/spstkalloc/spstkalloc.doc @@ -0,0 +1,24 @@ +# +# $Id$ +# +# COPYRIGHT (c) 1989-2009. +# On-Line Applications Research Corporation (OAR). +# +# The license and distribution terms for this file may be +# found in the file LICENSE in this distribution or at +# http://www.rtems.com/license/LICENSE. +# + +This file describes the directives and concepts tested by this test set. + +test set name: spstkalloc + +directives: + + rtems_task_creat + rtems_task_delete + + +concepts: + ++ Ensure that the custom stack allocation plugins work as documented. diff --git a/testsuites/sptests/spstkalloc/spstkalloc.scn b/testsuites/sptests/spstkalloc/spstkalloc.scn new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/testsuites/sptests/spstkalloc/spstkalloc.scn |