diff options
Diffstat (limited to 'testsuites/fstests')
-rw-r--r-- | testsuites/fstests/Makefile.am | 31 | ||||
-rw-r--r-- | testsuites/fstests/configure.ac | 26 | ||||
-rw-r--r-- | testsuites/fstests/fsrofs01/init.c | 4 |
3 files changed, 31 insertions, 30 deletions
diff --git a/testsuites/fstests/Makefile.am b/testsuites/fstests/Makefile.am index 514b60912c..1302fe009a 100644 --- a/testsuites/fstests/Makefile.am +++ b/testsuites/fstests/Makefile.am @@ -1,16 +1,21 @@ ACLOCAL_AMFLAGS = -I ../aclocal -_SUBDIRS = -_SUBDIRS += fsjffs2gc01 -_SUBDIRS += fsimfsconfig03 -_SUBDIRS += fsimfsconfig02 -_SUBDIRS += fsimfsconfig01 +_SUBDIRS = +_SUBDIRS += fsbdpart01 +_SUBDIRS += fsdosfsformat01 _SUBDIRS += fsdosfsname01 _SUBDIRS += fsdosfsname02 +_SUBDIRS += fsdosfssync01 _SUBDIRS += fsdosfswrite01 -_SUBDIRS += fsdosfsformat01 _SUBDIRS += fsfseeko01 -_SUBDIRS += fsdosfssync01 +_SUBDIRS += fsimfsconfig01 +_SUBDIRS += fsimfsconfig02 +_SUBDIRS += fsimfsconfig03 +_SUBDIRS += fsimfsgeneric01 +_SUBDIRS += fsjffs2gc01 +_SUBDIRS += fsnofs01 +_SUBDIRS += fsrfsbitmap01 +_SUBDIRS += fsrofs01 _SUBDIRS += imfs_fserror _SUBDIRS += imfs_fslink _SUBDIRS += imfs_fspatheval @@ -30,19 +35,20 @@ _SUBDIRS += jffs2_fstime _SUBDIRS += mdosfs_fserror _SUBDIRS += mdosfs_fspatheval _SUBDIRS += mdosfs_fsrdwr -_SUBDIRS += mdosfs_fsstatvfs _SUBDIRS += mdosfs_fsscandir01 +_SUBDIRS += mdosfs_fsstatvfs _SUBDIRS += mdosfs_fstime _SUBDIRS += mimfs_fserror _SUBDIRS += mimfs_fslink _SUBDIRS += mimfs_fspatheval _SUBDIRS += mimfs_fspermission _SUBDIRS += mimfs_fsrdwr +_SUBDIRS += mimfs_fsrename _SUBDIRS += mimfs_fsscandir01 _SUBDIRS += mimfs_fssymlink _SUBDIRS += mimfs_fstime -_SUBDIRS += mimfs_fsrename _SUBDIRS += mrfs_fserror +_SUBDIRS += mrfs_fsfpathconf _SUBDIRS += mrfs_fslink _SUBDIRS += mrfs_fspatheval _SUBDIRS += mrfs_fspermission @@ -50,11 +56,6 @@ _SUBDIRS += mrfs_fsrdwr _SUBDIRS += mrfs_fsscandir01 _SUBDIRS += mrfs_fssymlink _SUBDIRS += mrfs_fstime -_SUBDIRS += mrfs_fsfpathconf -_SUBDIRS += fsrfsbitmap01 -_SUBDIRS += fsnofs01 -_SUBDIRS += fsimfsgeneric01 -_SUBDIRS += fsbdpart01 EXTRA_DIST = EXTRA_DIST += support/ramdisk_support.c @@ -63,5 +64,5 @@ EXTRA_DIST += support/fstest_support.c EXTRA_DIST += support/fstest_support.h EXTRA_DIST += support/fstest.h -include $(top_srcdir)/../automake/test-subdirs.am +include $(top_srcdir)/../automake/subdirs.am include $(top_srcdir)/../automake/local.am diff --git a/testsuites/fstests/configure.ac b/testsuites/fstests/configure.ac index f9daa814e7..e5dc840ba8 100644 --- a/testsuites/fstests/configure.ac +++ b/testsuites/fstests/configure.ac @@ -77,16 +77,21 @@ AC_CHECK_SIZEOF([blkcnt_t]) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -fsjffs2gc01/Makefile -fsimfsconfig03/Makefile -fsimfsconfig02/Makefile -fsimfsconfig01/Makefile +fsbdpart01/Makefile +fsdosfsformat01/Makefile fsdosfsname01/Makefile fsdosfsname02/Makefile +fsdosfssync01/Makefile fsdosfswrite01/Makefile -fsdosfsformat01/Makefile fsfseeko01/Makefile -fsdosfssync01/Makefile +fsimfsconfig01/Makefile +fsimfsconfig02/Makefile +fsimfsconfig03/Makefile +fsimfsgeneric01/Makefile +fsjffs2gc01/Makefile +fsnofs01/Makefile +fsrfsbitmap01/Makefile +fsrofs01/Makefile imfs_fserror/Makefile imfs_fslink/Makefile imfs_fspatheval/Makefile @@ -114,11 +119,12 @@ mimfs_fslink/Makefile mimfs_fspatheval/Makefile mimfs_fspermission/Makefile mimfs_fsrdwr/Makefile +mimfs_fsrename/Makefile mimfs_fsscandir01/Makefile mimfs_fssymlink/Makefile mimfs_fstime/Makefile -mimfs_fsrename/Makefile mrfs_fserror/Makefile +mrfs_fsfpathconf/Makefile mrfs_fslink/Makefile mrfs_fspatheval/Makefile mrfs_fspermission/Makefile @@ -126,11 +132,5 @@ mrfs_fsrdwr/Makefile mrfs_fsscandir01/Makefile mrfs_fssymlink/Makefile mrfs_fstime/Makefile -mrfs_fsfpathconf/Makefile -fsrfsbitmap01/Makefile -fsnofs01/Makefile -fsimfsgeneric01/Makefile -fsbdpart01/Makefile - ]) AC_OUTPUT diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c index cd1dcc4a29..45aae88df9 100644 --- a/testsuites/fstests/fsrofs01/init.c +++ b/testsuites/fstests/fsrofs01/init.c @@ -153,12 +153,12 @@ static void test_rofs(void) static void Init(rtems_task_argument arg) { - TEST_BEGIN(): + TEST_BEGIN(); test_create_file_system(); test_rofs(); - TEST_END(): + TEST_END(); rtems_test_exit(0); } |