diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-05-05 09:47:30 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-05-06 18:31:00 -0500 |
commit | 3324383ce03f3d70a652f99291209e768d89c691 (patch) | |
tree | 152c8952e269ac8ac7bc5c90290fce9379a21e8a /testsuites/libtests | |
parent | multiple BSPs: Remove BSP_SMALL_MEMORY (diff) | |
download | rtems-3324383ce03f3d70a652f99291209e768d89c691.tar.bz2 |
testsuites: Remove BSP_SMALL_MEMORY
Diffstat (limited to 'testsuites/libtests')
-rw-r--r-- | testsuites/libtests/flashdisk01/init.c | 29 | ||||
-rw-r--r-- | testsuites/libtests/flashdisk01/test-file-system.c | 4 | ||||
-rw-r--r-- | testsuites/libtests/monitor02/init.c | 4 | ||||
-rw-r--r-- | testsuites/libtests/utf8proc01/init.c | 8 |
4 files changed, 3 insertions, 42 deletions
diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c index a5053d3ad4..f37f526feb 100644 --- a/testsuites/libtests/flashdisk01/init.c +++ b/testsuites/libtests/flashdisk01/init.c @@ -18,10 +18,6 @@ #include "tmacros.h" -const char rtems_test_name[] = "FLASHDISK 1"; - -#if !BSP_SMALL_MEMORY - #include <sys/stat.h> #include <errno.h> #include <string.h> @@ -36,6 +32,8 @@ const char rtems_test_name[] = "FLASHDISK 1"; #include "test-file-system.h" +const char rtems_test_name[] = "FLASHDISK 1"; + /* forward declarations to avoid warnings */ static rtems_task Init(rtems_task_argument argument); @@ -360,26 +358,3 @@ uint32_t rtems_flashdisk_configuration_size = FLASHDISK_CONFIG_COUNT; #define CONFIGURE_INIT #include <rtems/confdefs.h> - -#else /* BSP_SMALL_MEMORY */ - -static void Init(rtems_task_argument arg) -{ - TEST_BEGIN(); - puts("NOT ENOUGH MEMORY TO RUN TEST"); - - rtems_test_exit(0); -} - -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER - -#define CONFIGURE_MAXIMUM_TASKS 1 - -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE - -#define CONFIGURE_INIT - -#include <rtems/confdefs.h> - -#endif /* BSP_SMALL_MEMORY */ diff --git a/testsuites/libtests/flashdisk01/test-file-system.c b/testsuites/libtests/flashdisk01/test-file-system.c index 415927c1b0..206202008c 100644 --- a/testsuites/libtests/flashdisk01/test-file-system.c +++ b/testsuites/libtests/flashdisk01/test-file-system.c @@ -16,8 +16,6 @@ #include <bsp.h> -#if !BSP_SMALL_MEMORY - #include <sys/types.h> #include <sys/param.h> #include <sys/stat.h> @@ -835,5 +833,3 @@ void test_file_system_with_handler( free(fs); } - -#endif /* !BSP_SMALL_MEMORY */ diff --git a/testsuites/libtests/monitor02/init.c b/testsuites/libtests/monitor02/init.c index 9ea6207b1b..22818cc441 100644 --- a/testsuites/libtests/monitor02/init.c +++ b/testsuites/libtests/monitor02/init.c @@ -35,7 +35,6 @@ rtems_task Init( rtems_task_argument argument ) { -#if !BSP_SMALL_MEMORY int i; int argc; char *argv[MAX_ARGS]; @@ -51,8 +50,5 @@ rtems_task Init( } } TEST_END(); -#else - puts( "TARGET MEMORY TOO SMALL TO RUN\n\n"); -#endif rtems_test_exit(0); } diff --git a/testsuites/libtests/utf8proc01/init.c b/testsuites/libtests/utf8proc01/init.c index 06948fe44d..fd27451117 100644 --- a/testsuites/libtests/utf8proc01/init.c +++ b/testsuites/libtests/utf8proc01/init.c @@ -23,7 +23,6 @@ const char rtems_test_name[] = "UTF8PROC 1"; -#if !defined(BSP_SMALL_MEMORY) static void test_utf8proc_errmsg ( void ) { @@ -248,17 +247,12 @@ static void test ( void ) test_utf8proc_normalize ( utf8proc_NFKD ); test_utf8proc_normalize ( utf8proc_NFKC ); } -#endif static void Init ( rtems_task_argument arg ) { TEST_BEGIN(); -#if defined(BSP_SMALL_MEMORY) - puts( "Does not run on small memory targets" ); -#else - test(); -#endif + test ( ); TEST_END(); |