diff options
| author | Chris Johns <chrisj@rtems.org> | 2009-05-18 23:50:10 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2009-05-18 23:50:10 +0000 |
| commit | 9c22907122581564091d16c325afb6efbb871ca0 (patch) | |
| tree | 9f7ad12fa87e6abd1eeb04b1e29625f8fdd2fb3c /testsuites/libtests | |
| parent | 2009-05-19 Chris Johns <chrisj@rtems.org> (diff) | |
| download | rtems-9c22907122581564091d16c325afb6efbb871ca0.tar.bz2 | |
2009-05-19 Chris Johns <chrisj@rtems.org>
* cpuuse/tswitch.c: Lower sample count for small memory targets.
* cpuuse/system.h: Smaller stack size for small memory targets.
* monitor02/init.c: Cannot run on small memory targets.
Diffstat (limited to 'testsuites/libtests')
| -rw-r--r-- | testsuites/libtests/ChangeLog | 6 | ||||
| -rw-r--r-- | testsuites/libtests/cpuuse/system.h | 6 | ||||
| -rw-r--r-- | testsuites/libtests/cpuuse/tswitch.c | 5 | ||||
| -rw-r--r-- | testsuites/libtests/monitor02/init.c | 6 |
4 files changed, 20 insertions, 3 deletions
diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 93b726f56b..9e218c40bf 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,9 @@ +2009-05-19 Chris Johns <chrisj@rtems.org> + + * cpuuse/tswitch.c: Lower sample count for small memory targets. + * cpuuse/system.h: Smaller stack size for small memory targets. + * monitor02/init.c: Cannot run on small memory targets. + 2009-05-17 Joel Sherrill <joel.sherrill@oarcorp.com> * rtmonuse/init.c: Do not use Task_name array before initialized. diff --git a/testsuites/libtests/cpuuse/system.h b/testsuites/libtests/cpuuse/system.h index 8e7b206e33..a996fd4df4 100644 --- a/testsuites/libtests/cpuuse/system.h +++ b/testsuites/libtests/cpuuse/system.h @@ -13,6 +13,7 @@ * $Id$ */ +#include <bsp.h> #include <tmacros.h> /* functions */ @@ -46,11 +47,12 @@ void Task_switch( #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1 #define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_TICKS_PER_TIMESLICE 100 +#if !BSP_SMALL_MEMORY +#define CONFIGURE_EXTRA_TASK_STACKS (6 * RTEMS_MINIMUM_STACK_SIZE) +#endif #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_EXTRA_TASK_STACKS (6 * RTEMS_MINIMUM_STACK_SIZE) - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/libtests/cpuuse/tswitch.c b/testsuites/libtests/cpuuse/tswitch.c index e84c878b0c..3e0b09741e 100644 --- a/testsuites/libtests/cpuuse/tswitch.c +++ b/testsuites/libtests/cpuuse/tswitch.c @@ -22,7 +22,11 @@ #include "system.h" +#if BSP_SMALL_MEMORY +struct taskSwitchLog taskSwitchLog[100]; +#else struct taskSwitchLog taskSwitchLog[1000]; +#endif int taskSwitchLogIndex; volatile int testsFinished;; @@ -63,3 +67,4 @@ rtems_extension Task_switch( break; } } + diff --git a/testsuites/libtests/monitor02/init.c b/testsuites/libtests/monitor02/init.c index 025f8b6686..510840f414 100644 --- a/testsuites/libtests/monitor02/init.c +++ b/testsuites/libtests/monitor02/init.c @@ -14,6 +14,7 @@ */ #define CONFIGURE_INIT +#include "bsp.h" #include "system.h" #include <rtems/shell.h> @@ -29,6 +30,7 @@ rtems_task Init( rtems_task_argument argument ) { +#if !BSP_SMALL_MEMORY uint32_t index; rtems_status_code status; int i; @@ -45,7 +47,9 @@ rtems_task Init( rtems_shell_main_monitor(argc, argv); } } - puts( "\n*** END OF MONITOR02 ***\n"); +#else + puts( "TARGET MEMORY TOO SMALL TO RUN\n\n"); +#endif rtems_test_exit(0); } |