diff options
Diffstat (limited to 'testsuites')
21 files changed, 316 insertions, 19 deletions
diff --git a/testsuites/fstests/Makefile.am b/testsuites/fstests/Makefile.am index 404966cb24..6b01b20184 100644 --- a/testsuites/fstests/Makefile.am +++ b/testsuites/fstests/Makefile.am @@ -1,6 +1,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal _SUBDIRS = +_SUBDIRS += fsimfsconfig02 +_SUBDIRS += fsimfsconfig01 _SUBDIRS += fsdosfsname01 _SUBDIRS += fsdosfswrite01 _SUBDIRS += fsdosfsformat01 diff --git a/testsuites/fstests/configure.ac b/testsuites/fstests/configure.ac index fca2fdfa84..87b8961746 100644 --- a/testsuites/fstests/configure.ac +++ b/testsuites/fstests/configure.ac @@ -77,6 +77,8 @@ AC_CHECK_SIZEOF([blkcnt_t]) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile +fsimfsconfig02/Makefile +fsimfsconfig01/Makefile fsdosfsname01/Makefile fsdosfswrite01/Makefile fsdosfsformat01/Makefile diff --git a/testsuites/fstests/fsimfsconfig01/Makefile.am b/testsuites/fstests/fsimfsconfig01/Makefile.am new file mode 100644 index 0000000000..0787dbe8d8 --- /dev/null +++ b/testsuites/fstests/fsimfsconfig01/Makefile.am @@ -0,0 +1,19 @@ +rtems_tests_PROGRAMS = fsimfsconfig01 +fsimfsconfig01_SOURCES = init.c + +dist_rtems_tests_DATA = fsimfsconfig01.scn fsimfsconfig01.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(fsimfsconfig01_OBJECTS) +LINK_LIBS = $(fsimfsconfig01_LDLIBS) + +fsimfsconfig01$(EXEEXT): $(fsimfsconfig01_OBJECTS) $(fsimfsconfig01_DEPENDENCIES) + @rm -f fsimfsconfig01$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/fstests/fsimfsconfig01/fsimfsconfig01.doc b/testsuites/fstests/fsimfsconfig01/fsimfsconfig01.doc new file mode 100644 index 0000000000..d243512e12 --- /dev/null +++ b/testsuites/fstests/fsimfsconfig01/fsimfsconfig01.doc @@ -0,0 +1,11 @@ +This file describes the directives and concepts tested by this test set. + +test set name: fsimfsconfig01 + +directives: + + TBD + +concepts: + + - Ensure that the IMFS configuration defines work. diff --git a/testsuites/fstests/fsimfsconfig01/fsimfsconfig01.scn b/testsuites/fstests/fsimfsconfig01/fsimfsconfig01.scn new file mode 100644 index 0000000000..145048bf40 --- /dev/null +++ b/testsuites/fstests/fsimfsconfig01/fsimfsconfig01.scn @@ -0,0 +1,2 @@ +*** BEGIN OF TEST FSIMFSCONFIG 1 *** +*** END OF TEST FSIMFSCONFIG 1 *** diff --git a/testsuites/fstests/fsimfsconfig01/init.c b/testsuites/fstests/fsimfsconfig01/init.c new file mode 100644 index 0000000000..3f842c0451 --- /dev/null +++ b/testsuites/fstests/fsimfsconfig01/init.c @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2015 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * <rtems@embedded-brains.de> + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +#include "tmacros.h" + +#include <sys/stat.h> +#include <errno.h> +#include <stdio.h> +#include <unistd.h> +#include <utime.h> + +#include <rtems/imfs.h> +#include <rtems/libio.h> + +const char rtems_test_name[] = "FSIMFSCONFIG 1"; + +static const IMFS_node_control node_control = IMFS_GENERIC_INITIALIZER( + &rtems_filesystem_handlers_default, + IMFS_node_initialize_generic, + IMFS_node_destroy_default +); + +static void Init(rtems_task_argument arg) +{ + struct utimbuf times; + const char *generic = "generic"; + const char *mnt = "mnt"; + int rv; + + TEST_BEGIN(); + + rv = IMFS_make_generic_node( + generic, + S_IFCHR | S_IRWXU | S_IRWXG | S_IRWXO, + &node_control, + NULL + ); + rtems_test_assert(rv == 0); + + errno = 0; + rv = chown(generic, 0, 0); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + errno = 0; + rv = chmod(generic, 0); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + errno = 0; + rv = link(generic, "link"); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + rv = mkdir(mnt, S_IRWXU); + rtems_test_assert(rv == 0); + + errno = 0; + rv = mount( + "", + mnt, + RTEMS_FILESYSTEM_TYPE_IMFS, + RTEMS_FILESYSTEM_READ_ONLY, + NULL + ); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + errno = 0; + rv = rename(generic, "new"); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + errno = 0; + rv = unlink(generic); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + errno = 0; + rv = symlink(generic, "link"); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + errno = 0; + rv = utime(generic, ×); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + TEST_END(); + rtems_test_exit(0); +} + +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_FILESYSTEM_IMFS + +#define CONFIGURE_IMFS_DISABLE_CHOWN +#define CONFIGURE_IMFS_DISABLE_FCHMOD +#define CONFIGURE_IMFS_DISABLE_LINK + +#if 0 +/* + * This would lead to a fatal error since rtems_filesystem_initialize() creates + * a "/dev" directory. + */ +#define CONFIGURE_IMFS_DISABLE_MKNOD +#endif + +#define CONFIGURE_IMFS_DISABLE_MOUNT +#define CONFIGURE_IMFS_DISABLE_RENAME +#define CONFIGURE_IMFS_DISABLE_RMNOD +#define CONFIGURE_IMFS_DISABLE_SYMLINK +#define CONFIGURE_IMFS_DISABLE_UTIME + +#define CONFIGURE_MAXIMUM_TASKS 1 + +#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT + +#include <rtems/confdefs.h> diff --git a/testsuites/fstests/fsimfsconfig02/Makefile.am b/testsuites/fstests/fsimfsconfig02/Makefile.am new file mode 100644 index 0000000000..9567eea8ec --- /dev/null +++ b/testsuites/fstests/fsimfsconfig02/Makefile.am @@ -0,0 +1,19 @@ +rtems_tests_PROGRAMS = fsimfsconfig02 +fsimfsconfig02_SOURCES = init.c + +dist_rtems_tests_DATA = fsimfsconfig02.scn fsimfsconfig02.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(fsimfsconfig02_OBJECTS) +LINK_LIBS = $(fsimfsconfig02_LDLIBS) + +fsimfsconfig02$(EXEEXT): $(fsimfsconfig02_OBJECTS) $(fsimfsconfig02_DEPENDENCIES) + @rm -f fsimfsconfig02$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/fstests/fsimfsconfig02/fsimfsconfig02.doc b/testsuites/fstests/fsimfsconfig02/fsimfsconfig02.doc new file mode 100644 index 0000000000..3693513eea --- /dev/null +++ b/testsuites/fstests/fsimfsconfig02/fsimfsconfig02.doc @@ -0,0 +1,11 @@ +This file describes the directives and concepts tested by this test set. + +test set name: fsimfsconfig02 + +directives: + + TBD + +concepts: + + - Ensure that the IMFS configuration defines work. diff --git a/testsuites/fstests/fsimfsconfig02/fsimfsconfig02.scn b/testsuites/fstests/fsimfsconfig02/fsimfsconfig02.scn new file mode 100644 index 0000000000..c89a4a219a --- /dev/null +++ b/testsuites/fstests/fsimfsconfig02/fsimfsconfig02.scn @@ -0,0 +1,2 @@ +*** BEGIN OF TEST FSIMFSCONFIG 2 *** +*** END OF TEST FSIMFSCONFIG 2 *** diff --git a/testsuites/fstests/fsimfsconfig02/init.c b/testsuites/fstests/fsimfsconfig02/init.c new file mode 100644 index 0000000000..35f9c83b58 --- /dev/null +++ b/testsuites/fstests/fsimfsconfig02/init.c @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2015 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * <rtems@embedded-brains.de> + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +#include "tmacros.h" + +#include <sys/stat.h> +#include <errno.h> +#include <unistd.h> + +#include <rtems/imfs.h> +#include <rtems/libio.h> + +const char rtems_test_name[] = "FSIMFSCONFIG 2"; + +static void Init(rtems_task_argument arg) +{ + const char *mnt = "mnt"; + const char *link = "link"; + char buf[1]; + int rv; + + TEST_BEGIN(); + + rv = mkdir(mnt, S_IRWXU); + rtems_test_assert(rv == 0); + + rv = mount( + "", + mnt, + RTEMS_FILESYSTEM_TYPE_IMFS, + RTEMS_FILESYSTEM_READ_ONLY, + NULL + ); + rtems_test_assert(rv == 0); + + errno = 0; + rv = unmount(mnt); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + rv = symlink(mnt, link); + rtems_test_assert(rv == 0); + + errno = 0; + rv = readlink(link, &buf[0], sizeof(buf)); + rtems_test_assert(rv == -1); + rtems_test_assert(errno == ENOTSUP); + + TEST_END(); + rtems_test_exit(0); +} + +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_FILESYSTEM_IMFS + +#define CONFIGURE_IMFS_DISABLE_READLINK +#define CONFIGURE_IMFS_DISABLE_UNMOUNT + +#define CONFIGURE_MAXIMUM_TASKS 1 + +#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT + +#include <rtems/confdefs.h> diff --git a/testsuites/fstests/fsimfsgeneric01/init.c b/testsuites/fstests/fsimfsgeneric01/init.c index 44d75c5fad..6cc6c15436 100644 --- a/testsuites/fstests/fsimfsgeneric01/init.c +++ b/testsuites/fstests/fsimfsgeneric01/init.c @@ -396,6 +396,13 @@ static const IMFS_node_control node_initialization_error_control = { .node_destroy = node_destroy_inhibited }; +static const rtems_filesystem_operations_table *imfs_ops; + +static int other_clone(rtems_filesystem_location_info_t *loc) +{ + return (*imfs_ops->clonenod_h)(loc); +} + static void test_imfs_make_generic_node_errors(void) { int rv = 0; @@ -403,7 +410,7 @@ static void test_imfs_make_generic_node_errors(void) rtems_chain_control *chain = &rtems_filesystem_mount_table; rtems_filesystem_mount_table_entry_t *mt_entry = (rtems_filesystem_mount_table_entry_t *) rtems_chain_first(chain); - const char *type = mt_entry->type; + rtems_filesystem_operations_table other_ops; void *opaque = NULL; rtems_resource_snapshot before; @@ -421,14 +428,17 @@ static void test_imfs_make_generic_node_errors(void) rtems_test_assert(rtems_resource_snapshot_check(&before)); errno = 0; - mt_entry->type = "XXX"; + imfs_ops = mt_entry->ops; + other_ops = *imfs_ops; + other_ops.clonenod_h = other_clone; + mt_entry->ops = &other_ops; rv = IMFS_make_generic_node( path, S_IFCHR | S_IRWXU | S_IRWXG | S_IRWXO, &node_control, NULL ); - mt_entry->type = type; + mt_entry->ops = imfs_ops; rtems_test_assert(rv == -1); rtems_test_assert(errno == ENOTSUP); rtems_test_assert(rtems_resource_snapshot_check(&before)); diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c index 849d856bea..29ccfd371c 100644 --- a/testsuites/fstests/mimfs_support/fs_support.c +++ b/testsuites/fstests/mimfs_support/fs_support.c @@ -64,5 +64,7 @@ test_shutdown_filesystem (void) #define CONFIGURE_INIT_TASK_STACK_SIZE (16 * 1024) #define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 1 +#define CONFIGURE_FILESYSTEM_IMFS + #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/libtests/tar03/init.c b/testsuites/libtests/tar03/init.c index 3e2b5d3e68..72e95ecd2f 100644 --- a/testsuites/libtests/tar03/init.c +++ b/testsuites/libtests/tar03/init.c @@ -34,13 +34,6 @@ void test_tarfs_error(void) printf ("error: untar failed returned %d\n", sc); rtems_test_exit(1); } - - puts("Loading tarfs image with miniIMFS as root filesystem - ERROR"); - sc = rtems_tarfs_load("/",(void *)rtems_task_create, 72); - if (sc != -1) { - printf ("error: untar failed returned %d\n", sc); - rtems_test_exit(1); - } } rtems_task Init( @@ -65,8 +58,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM - #define CONFIGURE_INIT #include <rtems/confdefs.h> /* end of file */ diff --git a/testsuites/psxtests/psxfile01/main.c b/testsuites/psxtests/psxfile01/main.c index a6ad029e05..554f8e96f8 100644 --- a/testsuites/psxtests/psxfile01/main.c +++ b/testsuites/psxtests/psxfile01/main.c @@ -35,6 +35,8 @@ rtems_task Init( #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6 +#define CONFIGURE_FILESYSTEM_IMFS + #define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_INIT_TASK_STACK_SIZE (2 * RTEMS_MINIMUM_STACK_SIZE) diff --git a/testsuites/psxtests/psximfs02/init.c b/testsuites/psxtests/psximfs02/init.c index 00a171fd99..d372a6f11b 100644 --- a/testsuites/psxtests/psximfs02/init.c +++ b/testsuites/psxtests/psximfs02/init.c @@ -208,6 +208,8 @@ rtems_task Init( #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_FILESYSTEM_IMFS + #define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK 15 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 diff --git a/testsuites/psxtests/psxmount/main.c b/testsuites/psxtests/psxmount/main.c index 2e32a291ff..a723b87d4a 100644 --- a/testsuites/psxtests/psxmount/main.c +++ b/testsuites/psxtests/psxmount/main.c @@ -33,6 +33,8 @@ rtems_task Init( #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10 +#define CONFIGURE_FILESYSTEM_IMFS + #define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 1 diff --git a/testsuites/psxtests/psxreaddir/main.c b/testsuites/psxtests/psxreaddir/main.c index 90880b0b6b..176d264978 100644 --- a/testsuites/psxtests/psxreaddir/main.c +++ b/testsuites/psxtests/psxreaddir/main.c @@ -31,6 +31,8 @@ rtems_task Init( #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10 +#define CONFIGURE_FILESYSTEM_IMFS + #define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION diff --git a/testsuites/psxtests/psxstat/main.c b/testsuites/psxtests/psxstat/main.c index 19ed8d47c8..07fde7f9b5 100644 --- a/testsuites/psxtests/psxstat/main.c +++ b/testsuites/psxtests/psxstat/main.c @@ -35,6 +35,8 @@ rtems_task Init( #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10 +#define CONFIGURE_FILESYSTEM_IMFS + #define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION diff --git a/testsuites/samples/iostream/system.h b/testsuites/samples/iostream/system.h index 7256f8fce7..62f7d535ec 100644 --- a/testsuites/samples/iostream/system.h +++ b/testsuites/samples/iostream/system.h @@ -31,9 +31,6 @@ #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) #define CONFIGURE_EXTRA_TASK_STACKS RTEMS_MINIMUM_STACK_SIZE -/* Only remove when this macro is removed from confdefs.h. It tests it. */ -#define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM - #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION #include <rtems/confdefs.h> diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c index 1a0d569e0b..5d28303f19 100644 --- a/testsuites/sptests/sp47/init.c +++ b/testsuites/sptests/sp47/init.c @@ -74,7 +74,5 @@ rtems_task Init(rtems_task_argument ignored) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c index 701aa17035..53d8245c23 100644 --- a/testsuites/sptests/sp48/init.c +++ b/testsuites/sptests/sp48/init.c @@ -102,7 +102,5 @@ rtems_task Init(rtems_task_argument ignored) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM - #define CONFIGURE_INIT #include <rtems/confdefs.h> |