[PATCH] testsuite: Merge all fstests into a single Makefile.am.

Thu Apr 5 03:13:16 UTC 2018

This change is part of refactoring the testsuite's build system to
remove nested make builds for every test.

Update #3382
---
 c/src/make/leaf.cfg                                |  15 +-
 testsuites/aclocal/rtems-test-check.m4             |  31 ++
 testsuites/fstests/Makefile.am                     | 476 ++++++++++++++++++---
 testsuites/fstests/configure.ac                    | 117 ++---
 .../{imfs_fserror => fserror}/imfs_fserror.scn     |   0
 .../{jffs2_fserror => fserror}/jffs2_fserror.scn   |   0
 .../{mdosfs_fserror => fserror}/mdosfs_fserror.scn |   0
 .../{mimfs_fserror => fserror}/mimfs_fserror.scn   |   0
 .../{mrfs_fserror => fserror}/mrfs_fserror.scn     |   0
 .../{imfs_fslink => fslink}/imfs_fslink.scn        |   0
 .../{jffs2_fslink => fslink}/jffs2_fslink.scn      |   0
 .../{mimfs_fslink => fslink}/mimfs_fslink.scn      |   0
 .../{mrfs_fslink => fslink}/mrfs_fslink.scn        |   0
 .../imfs_fspatheval.scn                            |   0
 .../jffs2_fspatheval.scn                           |   0
 .../mdosfs_fspatheval.scn                          |   0
 .../mimfs_fspatheval.scn                           |   0
 .../mrfs_fspatheval.scn                            |   0
 .../imfs_fspermission.scn                          |   0
 .../jffs2_fspermission.scn                         |   0
 .../mimfs_fspermission-interupted.scn              |   0
 .../mrfs_fspermission.scn                          |   0
 .../{imfs_fsrdwr => fsrdwr}/imfs_fsrdwr.scn        |   0
 .../{jffs2_fsrdwr => fsrdwr}/jffs2_fsrdwr.scn      |   0
 .../{mdosfs_fsrdwr => fsrdwr}/mdosfs_fsrdwr.scn    |   0
 .../{mimfs_fsrdwr => fsrdwr}/mimfs_fsrdwr.scn      |   0
 .../{mrfs_fsrdwr => fsrdwr}/mrfs_fsrdwr.scn        |   0
 .../mimfs_fsrename.scn                             |   0
 .../imfs_fsscandir01.scn                           |   0
 .../jffs2_fsscandir01.scn                          |   0
 .../mdosfs_fsscandir01.scn                         |   0
 .../mimfs_fsscandir01.scn                          |   0
 .../mrfs_fsscandir01.scn                           |   0
 .../mdosfs_fsstatvfs.scn                           |   0
 .../{imfs_fstime => fstime}/imfs_fstime.scn        |   0
 .../{jffs2_fstime => fstime}/jffs2_fstime.scn      |   0
 .../{mimfs_fstime => fstime}/mimfs_fstime.scn      |   0
 .../{mrfs_fstime => fstime}/mrfs_fstime.scn        |   0
 testsuites/fstests/imfs_fserror/Makefile.am        |  31 --
 testsuites/fstests/imfs_fslink/Makefile.am         |  31 --
 testsuites/fstests/imfs_fspatheval/Makefile.am     |  31 --
 testsuites/fstests/imfs_fspermission/Makefile.am   |  31 --
 testsuites/fstests/imfs_fsrdwr/Makefile.am         |  31 --
 testsuites/fstests/imfs_fsscandir01/Makefile.am    |  31 --
 testsuites/fstests/imfs_fssymlink/Makefile.am      |  31 --
 .../fstests/imfs_fssymlink/imfs_fssymlink.scn      |  37 --
 testsuites/fstests/imfs_fstime/Makefile.am         |  31 --
 testsuites/fstests/jffs2_fserror/Makefile.am       |  32 --
 testsuites/fstests/jffs2_fslink/Makefile.am        |  32 --
 testsuites/fstests/jffs2_fspatheval/Makefile.am    |  32 --
 testsuites/fstests/jffs2_fspermission/Makefile.am  |  32 --
 testsuites/fstests/jffs2_fsrdwr/Makefile.am        |  32 --
 testsuites/fstests/jffs2_fsscandir01/Makefile.am   |  32 --
 testsuites/fstests/jffs2_fssymlink/Makefile.am     |  32 --
 .../fstests/jffs2_fssymlink/jffs2_fssymlink.scn    |  37 --
 testsuites/fstests/jffs2_fstime/Makefile.am        |  32 --
 testsuites/fstests/mdosfs_fserror/Makefile.am      |  33 --
 testsuites/fstests/mdosfs_fspatheval/Makefile.am   |  33 --
 testsuites/fstests/mdosfs_fsrdwr/Makefile.am       |  33 --
 testsuites/fstests/mdosfs_fsscandir01/Makefile.am  |  33 --
 testsuites/fstests/mdosfs_fsstatvfs/Makefile.am    |  33 --
 testsuites/fstests/mdosfs_fstime/Makefile.am       |  33 --
 testsuites/fstests/mimfs_fserror/Makefile.am       |  31 --
 testsuites/fstests/mimfs_fslink/Makefile.am        |  31 --
 testsuites/fstests/mimfs_fspatheval/Makefile.am    |  31 --
 testsuites/fstests/mimfs_fspermission/Makefile.am  |  31 --
 testsuites/fstests/mimfs_fsrdwr/Makefile.am        |  31 --
 testsuites/fstests/mimfs_fsrename/Makefile.am      |  30 --
 testsuites/fstests/mimfs_fsscandir01/Makefile.am   |  31 --
 testsuites/fstests/mimfs_fssymlink/Makefile.am     |  31 --
 .../fstests/mimfs_fssymlink/mimfs_fssymlink.scn    |  31 --
 testsuites/fstests/mimfs_fstime/Makefile.am        |  31 --
 testsuites/fstests/mrfs_fserror/Makefile.am        |  33 --
 testsuites/fstests/mrfs_fsfpathconf/Makefile.am    |  33 --
 .../fstests/mrfs_fsfpathconf/mrfs_fsfpathconf.scn  |  30 --
 testsuites/fstests/mrfs_fslink/Makefile.am         |  33 --
 testsuites/fstests/mrfs_fspatheval/Makefile.am     |  33 --
 testsuites/fstests/mrfs_fspermission/Makefile.am   |  33 --
 testsuites/fstests/mrfs_fsrdwr/Makefile.am         |  33 --
 testsuites/fstests/mrfs_fsscandir01/Makefile.am    |  33 --
 testsuites/fstests/mrfs_fssymlink/Makefile.am      |  33 --
 .../fstests/mrfs_fssymlink/mrfs_fssymlink.scn      |  37 --
 testsuites/fstests/mrfs_fstime/Makefile.am         |  33 --
 testsuites/fstests/support/fstest.h                |   2 -
 84 files changed, 513 insertions(+), 1577 deletions(-)
 create mode 100644 testsuites/aclocal/rtems-test-check.m4
 rename testsuites/fstests/{imfs_fserror => fserror}/imfs_fserror.scn (100%)
 rename testsuites/fstests/{jffs2_fserror => fserror}/jffs2_fserror.scn (100%)
 rename testsuites/fstests/{mdosfs_fserror => fserror}/mdosfs_fserror.scn (100%)
 rename testsuites/fstests/{mimfs_fserror => fserror}/mimfs_fserror.scn (100%)
 rename testsuites/fstests/{mrfs_fserror => fserror}/mrfs_fserror.scn (100%)
 rename testsuites/fstests/{imfs_fslink => fslink}/imfs_fslink.scn (100%)
 rename testsuites/fstests/{jffs2_fslink => fslink}/jffs2_fslink.scn (100%)
 rename testsuites/fstests/{mimfs_fslink => fslink}/mimfs_fslink.scn (100%)
 rename testsuites/fstests/{mrfs_fslink => fslink}/mrfs_fslink.scn (100%)
 rename testsuites/fstests/{imfs_fspatheval => fspatheval}/imfs_fspatheval.scn (100%)
 rename testsuites/fstests/{jffs2_fspatheval => fspatheval}/jffs2_fspatheval.scn (100%)
 rename testsuites/fstests/{mdosfs_fspatheval => fspatheval}/mdosfs_fspatheval.scn (100%)
 rename testsuites/fstests/{mimfs_fspatheval => fspatheval}/mimfs_fspatheval.scn (100%)
 rename testsuites/fstests/{mrfs_fspatheval => fspatheval}/mrfs_fspatheval.scn (100%)
 rename testsuites/fstests/{imfs_fspermission => fspermission}/imfs_fspermission.scn (100%)
 rename testsuites/fstests/{jffs2_fspermission => fspermission}/jffs2_fspermission.scn (100%)
 rename testsuites/fstests/{mimfs_fspermission => fspermission}/mimfs_fspermission-interupted.scn (100%)
 rename testsuites/fstests/{mrfs_fspermission => fspermission}/mrfs_fspermission.scn (100%)
 rename testsuites/fstests/{imfs_fsrdwr => fsrdwr}/imfs_fsrdwr.scn (100%)
 rename testsuites/fstests/{jffs2_fsrdwr => fsrdwr}/jffs2_fsrdwr.scn (100%)
 rename testsuites/fstests/{mdosfs_fsrdwr => fsrdwr}/mdosfs_fsrdwr.scn (100%)
 rename testsuites/fstests/{mimfs_fsrdwr => fsrdwr}/mimfs_fsrdwr.scn (100%)
 rename testsuites/fstests/{mrfs_fsrdwr => fsrdwr}/mrfs_fsrdwr.scn (100%)
 rename testsuites/fstests/{mimfs_fsrename => fsrename}/mimfs_fsrename.scn (100%)
 rename testsuites/fstests/{imfs_fsscandir01 => fsscandir01}/imfs_fsscandir01.scn (100%)
 rename testsuites/fstests/{jffs2_fsscandir01 => fsscandir01}/jffs2_fsscandir01.scn (100%)
 rename testsuites/fstests/{mdosfs_fsscandir01 => fsscandir01}/mdosfs_fsscandir01.scn (100%)
 rename testsuites/fstests/{mimfs_fsscandir01 => fsscandir01}/mimfs_fsscandir01.scn (100%)
 rename testsuites/fstests/{mrfs_fsscandir01 => fsscandir01}/mrfs_fsscandir01.scn (100%)
 rename testsuites/fstests/{mdosfs_fsstatvfs => fsstatvfs}/mdosfs_fsstatvfs.scn (100%)
 rename testsuites/fstests/{imfs_fstime => fstime}/imfs_fstime.scn (100%)
 rename testsuites/fstests/{jffs2_fstime => fstime}/jffs2_fstime.scn (100%)
 rename testsuites/fstests/{mimfs_fstime => fstime}/mimfs_fstime.scn (100%)
 rename testsuites/fstests/{mrfs_fstime => fstime}/mrfs_fstime.scn (100%)
 delete mode 100644 testsuites/fstests/imfs_fserror/Makefile.am
 delete mode 100644 testsuites/fstests/imfs_fslink/Makefile.am
 delete mode 100644 testsuites/fstests/imfs_fspatheval/Makefile.am
 delete mode 100644 testsuites/fstests/imfs_fspermission/Makefile.am
 delete mode 100644 testsuites/fstests/imfs_fsrdwr/Makefile.am
 delete mode 100644 testsuites/fstests/imfs_fsscandir01/Makefile.am
 delete mode 100644 testsuites/fstests/imfs_fssymlink/Makefile.am
 delete mode 100644 testsuites/fstests/imfs_fssymlink/imfs_fssymlink.scn
 delete mode 100644 testsuites/fstests/imfs_fstime/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fserror/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fslink/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fspatheval/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fspermission/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fsrdwr/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fsscandir01/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fssymlink/Makefile.am
 delete mode 100644 testsuites/fstests/jffs2_fssymlink/jffs2_fssymlink.scn
 delete mode 100644 testsuites/fstests/jffs2_fstime/Makefile.am
 delete mode 100644 testsuites/fstests/mdosfs_fserror/Makefile.am
 delete mode 100644 testsuites/fstests/mdosfs_fspatheval/Makefile.am
 delete mode 100644 testsuites/fstests/mdosfs_fsrdwr/Makefile.am
 delete mode 100644 testsuites/fstests/mdosfs_fsscandir01/Makefile.am
 delete mode 100644 testsuites/fstests/mdosfs_fsstatvfs/Makefile.am
 delete mode 100644 testsuites/fstests/mdosfs_fstime/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fserror/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fslink/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fspatheval/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fspermission/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fsrdwr/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fsrename/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fsscandir01/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fssymlink/Makefile.am
 delete mode 100644 testsuites/fstests/mimfs_fssymlink/mimfs_fssymlink.scn
 delete mode 100644 testsuites/fstests/mimfs_fstime/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fserror/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fsfpathconf/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fsfpathconf/mrfs_fsfpathconf.scn
 delete mode 100644 testsuites/fstests/mrfs_fslink/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fspatheval/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fspermission/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fsrdwr/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fsscandir01/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fssymlink/Makefile.am
 delete mode 100644 testsuites/fstests/mrfs_fssymlink/mrfs_fssymlink.scn
 delete mode 100644 testsuites/fstests/mrfs_fstime/Makefile.am

diff --git a/c/src/make/leaf.cfg b/c/src/make/leaf.cfg
index 8d3f52ecde..045ee1ab0e 100644
--- a/c/src/make/leaf.cfg
+++ b/c/src/make/leaf.cfg
@@ -11,25 +11,18 @@ endif
 EXEEXT?=.exe
 DOWNEXT?=.ralf
 
+RTEMS_LDFLAGS = $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS)
+
 define bsp-link-c
-	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-	    -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS)
+	$(LINK.c) $(RTEMS_LDFLAGS) -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS)
 endef
 
 define bsp-link-cxx
-	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-	    -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS)
-endef
-
-define default-bsp-post-link
-	$(NM) -g -n $@ > $(basename $@).num
-	$(SIZE) $@
+	$(LINK.cc) $(RTEMS_LDFLAGS) -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS)
 endef
 
 ifndef bsp-post-link
   define bsp-post-link
-	$(default-bsp-post-link)
-	cp $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT)
   endef
 endif
 
diff --git a/testsuites/aclocal/rtems-test-check.m4 b/testsuites/aclocal/rtems-test-check.m4
new file mode 100644
index 0000000000..de11120ea8
--- /dev/null
+++ b/testsuites/aclocal/rtems-test-check.m4
@@ -0,0 +1,31 @@
+dnl
+dnl Check a test getting it's status.
+dnl
+AC_DEFUN([RTEMS_TEST_CHECK],
+[AC_REQUIRE([RTEMS_ENV_RTEMSBSP])
+ AC_REQUIRE([RTEMS_SOURCE_TOP])
+ AC_MSG_CHECKING([$1 test])
+ tcheck="${RTEMS_SOURCE_ROOT}/tools/build/rtems-test-check-py"
+ tdata="${RTEMS_BSP}-testsuite.tcfg"
+ tincludes="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/make/custom:${RTEMS_SOURCE_ROOT}/testsuites"
+ if test -f $tcheck; then
+  check_result=`$tcheck exclude ${RTEMS_BSP} $tdata $tincludes $1`
+ else
+  check_result=$1
+ fi
+ if test "$1" = "$check_result"; then
+  if test -f $tcheck; then
+   test_FLAGS=`$tcheck flags ${RTEMS_BSP} $tdata $tincludes $1`
+  fi
+  if test -z "$test_FLAGS"; then
+   result_msg="PASS"
+  else
+   result_msg="$test_FLAGS"
+  fi
+ else
+   result_msg="EXCLUDED"
+ fi
+ AC_MSG_RESULT([$result_msg])
+ AM_CONDITIONAL([TEST_$1], [test "$result_msg" != "EXCLUDED"])
+ AC_SUBST([TEST_FLAGS_$1], [$test_FLAGS])
+])
diff --git a/testsuites/fstests/Makefile.am b/testsuites/fstests/Makefile.am
index 057985619f..844ff0d62b 100644
--- a/testsuites/fstests/Makefile.am
+++ b/testsuites/fstests/Makefile.am
@@ -1,63 +1,425 @@
+#
+# File system tests.
+#
+
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-_SUBDIRS  =
-_SUBDIRS += fsbdpart01
-_SUBDIRS += fsclose01
-_SUBDIRS += fsdosfsformat01
-_SUBDIRS += fsdosfsname01
-_SUBDIRS += fsdosfsname02
-_SUBDIRS += fsdosfssync01
-_SUBDIRS += fsdosfswrite01
-_SUBDIRS += fsfseeko01
-_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
-_SUBDIRS += imfs_fspermission
-_SUBDIRS += imfs_fsrdwr
-_SUBDIRS += imfs_fsscandir01
-_SUBDIRS += imfs_fssymlink
-_SUBDIRS += imfs_fstime
-_SUBDIRS += jffs2_fserror
-_SUBDIRS += jffs2_fslink
-_SUBDIRS += jffs2_fspatheval
-_SUBDIRS += jffs2_fspermission
-_SUBDIRS += jffs2_fsrdwr
-_SUBDIRS += jffs2_fsscandir01
-_SUBDIRS += jffs2_fssymlink
-_SUBDIRS += jffs2_fstime
-_SUBDIRS += mdosfs_fserror
-_SUBDIRS += mdosfs_fspatheval
-_SUBDIRS += mdosfs_fsrdwr
-_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 += mrfs_fserror
-_SUBDIRS += mrfs_fsfpathconf
-_SUBDIRS += mrfs_fslink
-_SUBDIRS += mrfs_fspatheval
-_SUBDIRS += mrfs_fspermission
-_SUBDIRS += mrfs_fsrdwr
-_SUBDIRS += mrfs_fsscandir01
-_SUBDIRS += mrfs_fssymlink
-_SUBDIRS += mrfs_fstime
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+fs_tests =
+fs_screens =
+fs_docs =
+
+fs_support_includes = \
+	-I$(top_srcdir)/../support/include
+fs_includes = \
+	$(fs_support_includes) \
+	-I$(top_srcdir)/support \
+	-I$(top_srcdir)/../psxtests/include
+fs_ramdisk_support_source = \
+	support/ramdisk_support.c
+fs_support_source = \
+	support/fstest_support.c \
+	$(fs_ramdisk_support_source)
+
+imfs_support_source = imfs_support/fs_support.c $(fs_support_source)
+jffs2_support_source = jffs2_support/fs_support.c $(fs_support_source)
+mdosfs_support_source = mdosfs_support/fs_support.c $(fs_support_source)
+mimfs_support_source = mimfs_support/fs_support.c $(fs_support_source)
+mrfs_support_source = mrfs_support/fs_support.c $(fs_support_source)
+
+if TEST_fsbdpart01
+fs_tests += fsbdpart01
+fs_screens += fsbdpart01/fsbdpart01.scn
+fs_docs += fsbdpart01/fsbdpart01.doc
+fsbdpart01_SOURCES = fsbdpart01/init.c
+fsbdpart01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsbdpart01) $(fs_support_includes)
+endif
+
+if TEST_fsclose01
+fs_tests += fsclose01
+fs_screens += fsclose01/fsclose01.scn
+fs_docs += fsclose01/fsclose01.doc
+fsclose01_SOURCES = fsclose01/init.c
+fsclose01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsclose01) $(fs_support_includes)
+endif
+
+if TEST_fsdosfsformat01
+fs_tests += fsdosfsformat01
+fs_screens += fsdosfsformat01/fsdosfsformat01.scn
+fs_docs += fsdosfsformat01/fsdosfsformat01.doc
+fsdosfsformat01_SOURCES = fsdosfsformat01/init.c
+fsdosfsformat01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsdosfsformat01) $(fs_support_includes)
+endif
+
+if TEST_fsdosfsname01
+fs_tests += fsdosfsname01
+fs_screens += fsdosfsname01/fsdosfsname01.scn
+fs_docs += fsdosfsname01/fsdosfsname01.doc
+fsdosfsname01_SOURCES = fsdosfsname01/init.c $(fs_ramdisk_support_source)
+fsdosfsname01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsdosfsname01) $(fs_support_includes)
+endif
+
+if TEST_fsdosfsname02
+fs_tests += fsdosfsname02
+fs_screens += fsdosfsname02/fsdosfsname02.scn
+fs_docs += fsdosfsname02/fsdosfsname02.doc
+fsdosfsname02_SOURCES = fsdosfsname02/init.c
+fsdosfsname02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsdosfsname02) $(fs_support_includes)
+endif
+
+if TEST_fsdosfssync01
+fs_tests += fsdosfssync01
+fs_screens += fsdosfssync01/fsdosfssync01.scn
+fs_docs += fsdosfssync01/fsdosfssync01.doc
+fsdosfssync01_SOURCES = fsdosfssync01/init.c
+fsdosfssync01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsdosfssync01) $(fs_support_includes)
+endif
+
+if TEST_fsdosfswrite01
+fs_tests += fsdosfswrite01
+fs_screens += fsdosfswrite01/fsdosfswrite01.scn
+fs_docs += fsdosfswrite01/fsdosfswrite01.doc
+fsdosfswrite01_SOURCES = fsdosfswrite01/init.c
+fsdosfswrite01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsdosfswrite01) $(fs_support_includes)
+endif
+
+if TEST_fsfseeko01
+fs_tests += fsfseeko01
+fs_screens += fsfseeko01/fsfseeko01.scn
+fs_docs += fsfseeko01/fsfseeko01.doc
+fsfseeko01_SOURCES = fsfseeko01/init.c
+fsfseeko01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsfseeko01) $(fs_support_includes)
+endif
+
+if TEST_fsimfsconfig01
+fs_tests += fsimfsconfig01
+fs_screens += fsimfsconfig01/fsimfsconfig01.scn
+fs_docs += fsimfsconfig01/fsimfsconfig01.doc
+fsimfsconfig01_SOURCES = fsimfsconfig01/init.c
+fsimfsconfig01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsimfsconfig01) $(fs_support_includes)
+endif
+
+if TEST_fsimfsconfig02
+fs_tests += fsimfsconfig02
+fs_screens += fsimfsconfig02/fsimfsconfig02.scn
+fs_docs += fsimfsconfig02/fsimfsconfig02.doc
+fsimfsconfig02_SOURCES = fsimfsconfig02/init.c
+fsimfsconfig02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsimfsconfig02) $(fs_support_includes)
+endif
+
+if TEST_fsimfsconfig03
+fs_tests += fsimfsconfig03
+fs_screens += fsimfsconfig03/fsimfsconfig03.scn
+fs_docs += fsimfsconfig03/fsimfsconfig03.doc
+fsimfsconfig03_SOURCES = fsimfsconfig03/init.c
+fsimfsconfig03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsimfsconfig03) $(fs_support_includes)
+endif
+
+if TEST_fsimfsgeneric01
+fs_tests += fsimfsgeneric01
+fs_screens += fsimfsgeneric01/fsimfsgeneric01.scn
+fs_docs += fsimfsgeneric01/fsimfsgeneric01.doc
+fsimfsgeneric01_SOURCES = fsimfsgeneric01/init.c
+fsimfsgeneric01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsimfsgeneric01) $(fs_support_includes)
+endif
+
+if TEST_fsjffs2gc01
+fs_tests += fsjffs2gc01
+fs_screens += fsjffs2gc01/fsjffs2gc01.scn
+fs_screens += fsjffs2gc01/fsjffs2gc01.doc
+fsjffs2gc01_SOURCES = fsjffs2gc01/init.c $(jffs2_support_source)
+fsjffs2gc01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsjffs2gc01) $(fs_includes) -I$(top_srcdir)/jffs2_support
+fsjffs2gc01_LDADD = -ljffs2
+endif
+
+if TEST_fsnofs01
+fs_tests += fsnofs01
+fs_screens += fsnofs01/fsnofs01.scn
+fs_docs += fsnofs01/fsnofs01.doc
+fsnofs01_SOURCES = fsnofs01/init.c
+fsnofs01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsnofs01) $(fs_support_includes)
+endif
+
+if TEST_fsrfsbitmap01
+fs_tests += fsrfsbitmap01
+fs_screens += fsrfsbitmap01/fsrfsbitmap01.scn
+fs_docs += fsrfsbitmap01/fsrfsbitmap01.doc
+fsrfsbitmap01_SOURCES = fsrfsbitmap01/test.c $(mrfs_support_source)
+fsrfsbitmap01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsrfsbitmap01) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_fsrofs01
+fs_tests += fsrofs01
+fs_screens += fsrofs01/fsrofs01.scn
+fs_docs += fsrofs01/fsrofs01.doc
+fsrofs01_SOURCES = fsrofs01/init.c
+fsrofs01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsrofs01) $(fs_support_includes)
+endif
+
+if TEST_imfs_fserror
+fs_tests += imfs_fserror
+fs_screens += fserror/imfs_fserror.scn
+imfs_fserror_SOURCES = fserror/test.c $(imfs_support_source)
+imfs_fserror_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_imfs_fserror) $(fs_includes) -I$(top_srcdir)/imfs_support
+endif
+
+if TEST_jffs2_fserror
+fs_tests += jffs2_fserror
+fs_screens += fserror/jffs2_fserror.scn
+jffs2_fserror_SOURCES = fserror/test.c $(jffs2_support_source)
+jffs2_fserror_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fserror) $(fs_includes) -I$(top_srcdir)/jffs2_support
+jffs2_fserror_LDADD = -ljffs2
+endif
+
+if TEST_mdosfs_fserror
+fs_tests += mdosfs_fserror
+fs_screens += fserror/mdosfs_fserror.scn
+mdosfs_fserror_SOURCES = fserror/test.c $(mdosfs_support_source)
+mdosfs_fserror_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mdosfs_fserror) $(fs_includes) -I$(top_srcdir)/mdosfs_support
+endif
+
+if TEST_mimfs_fserror
+fs_tests += mimfs_fserror
+fs_screens += fserror/mimfs_fserror.scn
+mimfs_fserror_SOURCES = fserror/test.c $(mimfs_support_source)
+mimfs_fserror_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fserror) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_mrfs_fserror
+fs_tests += mrfs_fserror
+fs_screens += fserror/mrfs_fserror.scn
+mrfs_fserror_SOURCES = fserror/test.c $(mrfs_support_source)
+mrfs_fserror_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fserror) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_mrfs_fsfpathconf
+fs_tests += mrfs_fsfpathconf
+fs_screens += fsfpathconf/fsfpathconf.scn
+mrfs_fsfpathconf_SOURCES = fsfpathconf/test.c $(mrfs_support_source)
+mrfs_fsfpathconf_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fsfpathconf) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_imfs_fslink
+fs_tests += imfs_fslink
+fs_screens += fslink/imfs_fslink.scn
+imfs_fslink_SOURCES = fslink/test.c $(imfs_support_source)
+imfs_fslink_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_imfs_fslink) $(fs_includes) -I$(top_srcdir)/imfs_support
+endif
+
+if TEST_jffs2_fslink
+fs_tests += jffs2_fslink
+fs_screens += fslink/jffs2_fslink.scn
+jffs2_fslink_SOURCES = fslink/test.c $(jffs2_support_source)
+jffs2_fslink_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fslink) $(fs_includes) -I$(top_srcdir)/jffs2_support
+jffs2_fslink_LDADD = -ljffs2
+endif
+
+if TEST_mimfs_fslink
+fs_tests += mimfs_fslink
+fs_screens += fslink/mimfs_fslink.scn
+mimfs_fslink_SOURCES = fslink/test.c $(mimfs_support_source)
+mimfs_fslink_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fslink) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_mrfs_fslink
+fs_tests += mrfs_fslink
+fs_screens += fslink/mrfs_fslink.scn
+mrfs_fslink_SOURCES = fslink/test.c $(mrfs_support_source)
+mrfs_fslink_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fslink) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_imfs_fspatheval
+fs_tests += imfs_fspatheval
+fs_screens += fspatheval/imfs_fspatheval.scn
+imfs_fspatheval_SOURCES = fspatheval/test.c $(imfs_support_source)
+imfs_fspatheval_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_imfs_fspatheval) $(fs_includes) -I$(top_srcdir)/imfs_support
+endif
+
+if TEST_jffs2_fspatheval
+fs_tests += jffs2_fspatheval
+fs_screens += fspatheval/jffs2_fspatheval.scn
+jffs2_fspatheval_SOURCES = fspatheval/test.c $(jffs2_support_source)
+jffs2_fspatheval_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fspatheval) $(fs_includes) -I$(top_srcdir)/jffs2_support
+jffs2_fspatheval_LDADD = -ljffs2
+endif
+
+if TEST_mdosfs_fspatheval
+fs_tests += mdosfs_fspatheval
+fs_screens += fspatheval/mdosfs_fspatheval.scn
+mdosfs_fspatheval_SOURCES = fspatheval/test.c $(mdosfs_support_source)
+mdosfs_fspatheval_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mdosfs_fspatheval) $(fs_includes) -I$(top_srcdir)/mdosfs_support
+endif
+
+if TEST_mimfs_fspatheval
+fs_tests += mimfs_fspatheval
+fs_screens += fspatheval/mimfs_fspatheval.scn
+mimfs_fspatheval_SOURCES = fspatheval/test.c $(mimfs_support_source)
+mimfs_fspatheval_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fspatheval) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_mrfs_fspatheval
+fs_tests += mrfs_fspatheval
+fs_screens += fspatheval/mrfs_fspatheval.scn
+mrfs_fspatheval_SOURCES = fspatheval/test.c $(mrfs_support_source)
+mrfs_fspatheval_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fspatheval) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_imfs_fspermission
+fs_tests += imfs_fspermission
+fs_screens += fspermission/imfs_fspermission.scn
+imfs_fspermission_SOURCES = fspermission/test.c $(imfs_support_source)
+imfs_fspermission_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_imfs_fspermission) $(fs_includes) -I$(top_srcdir)/imfs_support
+endif
+
+if TEST_jffs2_fspermission
+fs_tests += jffs2_fspermission
+fs_screens += fspermission/jffs2_fspermission.scn
+jffs2_fspermission_SOURCES = fspermission/test.c $(jffs2_support_source)
+jffs2_fspermission_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fspermission) $(fs_includes) -I$(top_srcdir)/jffs2_support
+jffs2_fspermission_LDADD = -ljffs2
+endif
+
+if TEST_mimfs_fspermission
+fs_tests += mimfs_fspermission
+fs_screens += fspermission/mimfs_fspermission-interupted.scn
+mimfs_fspermission_SOURCES = fspermission/test.c $(mimfs_support_source)
+mimfs_fspermission_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fspermission) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_mrfs_fspermission
+fs_tests += mrfs_fspermission
+fs_screens += fspermission/mrfs_fspermission.scn
+mrfs_fspermission_SOURCES = fspermission/test.c $(mrfs_support_source)
+mrfs_fspermission_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fspermission) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_imfs_fsrdwr
+fs_tests += imfs_fsrdwr
+fs_screens += fsrdwr/imfs_fsrdwr.scn
+imfs_fsrdwr_SOURCES = fsrdwr/init.c $(imfs_support_source)
+imfs_fsrdwr_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_imfs_fsrdwr) $(fs_includes) -I$(top_srcdir)/imfs_support
+endif
+
+if TEST_jffs2_fsrdwr
+fs_tests += jffs2_fsrdwr
+fs_screens += fsrdwr/jffs2_fsrdwr.scn
+jffs2_fsrdwr_SOURCES = fsrdwr/init.c $(jffs2_support_source)
+jffs2_fsrdwr_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fsrdwr) $(fs_includes) -I$(top_srcdir)/jffs2_support
+jffs2_fsrdwr_LDADD = -ljffs2
+endif
+
+if TEST_mdosfs_fsrdwr
+fs_tests += mdosfs_fsrdwr
+fs_screens += fsrdwr/mdosfs_fsrdwr.scn
+mdosfs_fsrdwr_SOURCES = fsrdwr/init.c $(mdosfs_support_source)
+mdosfs_fsrdwr_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mdosfs_fsrdwr) $(fs_includes) -I$(top_srcdir)/mdosfs_support
+endif
+
+if TEST_mimfs_fsrdwr
+fs_tests += mimfs_fsrdwr
+fs_screens += fsrdwr/mimfs_fsrdwr.scn
+mimfs_fsrdwr_SOURCES = fsrdwr/init.c $(mimfs_support_source)
+mimfs_fsrdwr_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fsrdwr) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_mrfs_fsrdwr
+fs_tests += mrfs_fsrdwr
+fs_screens += fsrdwr/mrfs_fsrdwr.scn
+mrfs_fsrdwr_SOURCES = fsrdwr/init.c $(mrfs_support_source)
+mrfs_fsrdwr_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fsrdwr) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_mimfs_fsrename
+fs_tests += mimfs_fsrename
+fs_screens += fsrename/mimfs_fsrename.scn
+mimfs_fsrename_SOURCES = fsrename/test.c $(mimfs_support_source)
+mimfs_fsrename_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fsrename) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_imfs_fsscandir01
+fs_tests += imfs_fsscandir01
+fs_screens += fsscandir01/imfs_fsscandir01.scn
+imfs_fsscandir01_SOURCES = fsscandir01/init.c $(imfs_support_source)
+imfs_fsscandir01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_imfs_fsscandir01) $(fs_includes) -I$(top_srcdir)/imfs_support
+endif
+
+if TEST_jffs2_fsscandir01
+fs_tests += jffs2_fsscandir01
+fs_screens += fsscandir01/jffs2_fsscandir01.scn
+jffs2_fsscandir01_SOURCES = fsscandir01/init.c $(jffs2_support_source)
+jffs2_fsscandir01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fsscandir01) $(fs_includes) -I$(top_srcdir)/jffs2_support
+jffs2_fsscandir01_LDADD = -ljffs2
+endif
+
+if TEST_mdosfs_fsscandir01
+fs_tests += mdosfs_fsscandir01
+fs_screens += fsscandir01/mdosfs_fsscandir01.scn
+mdosfs_fsscandir01_SOURCES = fsscandir01/init.c $(mdosfs_support_source)
+mdosfs_fsscandir01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mdosfs_fsscandir01) $(fs_includes) -I$(top_srcdir)/mdosfs_support
+endif
+
+if TEST_mimfs_fsscandir01
+fs_tests += mimfs_fsscandir01
+fs_screens += fsscandir01/mimfs_fsscandir01.scn
+mimfs_fsscandir01_SOURCES = fsscandir01/init.c $(mimfs_support_source)
+mimfs_fsscandir01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fsscandir01) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_mrfs_fsscandir01
+fs_tests += mrfs_fsscandir01
+fs_screens += fsscandir01/mrfs_fsscandir01.scn
+mrfs_fsscandir01_SOURCES = fsscandir01/init.c $(mrfs_support_source)
+mrfs_fsscandir01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fsscandir01) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+if TEST_mdosfs_fsstatvfs
+fs_tests += mdosfs_fsstatvfs
+fs_screens += fsstatvfs/mdosfs_fsstatvfs.scn
+mdosfs_fsstatvfs_SOURCES = fsstatvfs/test.c $(mdosfs_support_source)
+mdosfs_fsstatvfs_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mdosfs_fsstatvfs) $(fs_includes) -I$(top_srcdir)/mdosfs_support
+endif
+
+if TEST_imfs_fstime
+fs_tests += imfs_fstime
+fs_screens += fstime/imfs_fstime.scn
+imfs_fstime_SOURCES = fstime/test.c $(imfs_support_source)
+imfs_fstime_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_imfs_fstime) $(fs_includes) -I$(top_srcdir)/imfs_support
+endif
+
+if TEST_jffs2_fstime
+fs_tests += jffs2_fstime
+fs_screens += fstime/jffs2_fstime.scn
+jffs2_fstime_SOURCES = fstime/test.c $(jffs2_support_source)
+jffs2_fstime_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fstime) $(fs_includes) -I$(top_srcdir)/jffs2_support
+jffs2_fstime_LDADD = -ljffs2
+endif
+
+if TEST_mdosfs_fstime
+fs_tests += mdosfs_fstime
+mdosfs_fstime_SOURCES = fstime/test.c $(mdosfs_support_source)
+mdosfs_fstime_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mdosfs_fstime) $(fs_includes) -I$(top_srcdir)/mdosfs_support
+endif
+
+if TEST_mimfs_fstime
+fs_tests += mimfs_fstime
+fs_screens += fstime/mimfs_fstime.scn
+mimfs_fstime_SOURCES = fstime/test.c $(mimfs_support_source)
+mimfs_fstime_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mimfs_fstime) $(fs_includes) -I$(top_srcdir)/mimfs_support
+endif
+
+if TEST_mrfs_fstime
+fs_tests += mrfs_fstime
+fs_screens += fstime/mrfs_fstime.scn
+mrfs_fstime_SOURCES = fstime/test.c $(mrfs_support_source)
+mrfs_fstime_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mrfs_fstime) $(fs_includes) -I$(top_srcdir)/mrfs_support
+endif
+
+rtems_tests_PROGRAMS = $(fs_tests)
 
+dist_rtems_tests_DATA = $(fs_screens) $(fs_docs)
 
 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 9b4a299e80..edd9cb65c0 100644
--- a/testsuites/fstests/configure.ac
+++ b/testsuites/fstests/configure.ac
@@ -77,63 +77,64 @@ AC_CHECK_SIZEOF([off_t])
 AC_CHECK_SIZEOF([blksize_t])
 AC_CHECK_SIZEOF([blkcnt_t])
 
+# BSP Test configuration
+RTEMS_TEST_CHECK([fsbdpart01])
+RTEMS_TEST_CHECK([fsclose01])
+RTEMS_TEST_CHECK([fsdosfsformat01])
+RTEMS_TEST_CHECK([fsdosfsname01])
+RTEMS_TEST_CHECK([fsdosfsname02])
+RTEMS_TEST_CHECK([fsdosfssync01])
+RTEMS_TEST_CHECK([fsdosfswrite01])
+RTEMS_TEST_CHECK([fsfseeko01])
+RTEMS_TEST_CHECK([fsimfsconfig01])
+RTEMS_TEST_CHECK([fsimfsconfig02])
+RTEMS_TEST_CHECK([fsimfsconfig03])
+RTEMS_TEST_CHECK([fsimfsgeneric01])
+RTEMS_TEST_CHECK([fsjffs2gc01])
+RTEMS_TEST_CHECK([fsnofs01])
+RTEMS_TEST_CHECK([fsrfsbitmap01])
+RTEMS_TEST_CHECK([fsrofs01])
+RTEMS_TEST_CHECK([imfs_fserror])
+RTEMS_TEST_CHECK([imfs_fslink])
+RTEMS_TEST_CHECK([imfs_fspatheval])
+RTEMS_TEST_CHECK([imfs_fspermission])
+RTEMS_TEST_CHECK([imfs_fsrdwr])
+RTEMS_TEST_CHECK([imfs_fsscandir01])
+RTEMS_TEST_CHECK([imfs_fssymlink])
+RTEMS_TEST_CHECK([imfs_fstime])
+RTEMS_TEST_CHECK([jffs2_fserror])
+RTEMS_TEST_CHECK([jffs2_fslink])
+RTEMS_TEST_CHECK([jffs2_fspatheval])
+RTEMS_TEST_CHECK([jffs2_fspermission])
+RTEMS_TEST_CHECK([jffs2_fsrdwr])
+RTEMS_TEST_CHECK([jffs2_fsscandir01])
+RTEMS_TEST_CHECK([jffs2_fssymlink])
+RTEMS_TEST_CHECK([jffs2_fstime])
+RTEMS_TEST_CHECK([mdosfs_fserror])
+RTEMS_TEST_CHECK([mdosfs_fspatheval])
+RTEMS_TEST_CHECK([mdosfs_fsrdwr])
+RTEMS_TEST_CHECK([mdosfs_fsscandir01])
+RTEMS_TEST_CHECK([mdosfs_fsstatvfs])
+RTEMS_TEST_CHECK([mdosfs_fstime])
+RTEMS_TEST_CHECK([mimfs_fserror])
+RTEMS_TEST_CHECK([mimfs_fslink])
+RTEMS_TEST_CHECK([mimfs_fspatheval])
+RTEMS_TEST_CHECK([mimfs_fspermission])
+RTEMS_TEST_CHECK([mimfs_fsrdwr])
+RTEMS_TEST_CHECK([mimfs_fsrename])
+RTEMS_TEST_CHECK([mimfs_fsscandir01])
+RTEMS_TEST_CHECK([mimfs_fssymlink])
+RTEMS_TEST_CHECK([mimfs_fstime])
+RTEMS_TEST_CHECK([mrfs_fserror])
+RTEMS_TEST_CHECK([mrfs_fsfpathconf])
+RTEMS_TEST_CHECK([mrfs_fslink])
+RTEMS_TEST_CHECK([mrfs_fspatheval])
+RTEMS_TEST_CHECK([mrfs_fspermission])
+RTEMS_TEST_CHECK([mrfs_fsrdwr])
+RTEMS_TEST_CHECK([mrfs_fsscandir01])
+RTEMS_TEST_CHECK([mrfs_fssymlink])
+RTEMS_TEST_CHECK([mrfs_fstime])
+
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-fsbdpart01/Makefile
-fsclose01/Makefile
-fsdosfsformat01/Makefile
-fsdosfsname01/Makefile
-fsdosfsname02/Makefile
-fsdosfssync01/Makefile
-fsdosfswrite01/Makefile
-fsfseeko01/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
-imfs_fspermission/Makefile
-imfs_fsrdwr/Makefile
-imfs_fsscandir01/Makefile
-imfs_fssymlink/Makefile
-imfs_fstime/Makefile
-jffs2_fserror/Makefile
-jffs2_fslink/Makefile
-jffs2_fspatheval/Makefile
-jffs2_fspermission/Makefile
-jffs2_fsrdwr/Makefile
-jffs2_fsscandir01/Makefile
-jffs2_fssymlink/Makefile
-jffs2_fstime/Makefile
-mdosfs_fserror/Makefile
-mdosfs_fspatheval/Makefile
-mdosfs_fsrdwr/Makefile
-mdosfs_fsscandir01/Makefile
-mdosfs_fsstatvfs/Makefile
-mdosfs_fstime/Makefile
-mimfs_fserror/Makefile
-mimfs_fslink/Makefile
-mimfs_fspatheval/Makefile
-mimfs_fspermission/Makefile
-mimfs_fsrdwr/Makefile
-mimfs_fsrename/Makefile
-mimfs_fsscandir01/Makefile
-mimfs_fssymlink/Makefile
-mimfs_fstime/Makefile
-mrfs_fserror/Makefile
-mrfs_fsfpathconf/Makefile
-mrfs_fslink/Makefile
-mrfs_fspatheval/Makefile
-mrfs_fspermission/Makefile
-mrfs_fsrdwr/Makefile
-mrfs_fsscandir01/Makefile
-mrfs_fssymlink/Makefile
-mrfs_fstime/Makefile
-])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/testsuites/fstests/imfs_fserror/imfs_fserror.scn b/testsuites/fstests/fserror/imfs_fserror.scn
similarity index 100%
rename from testsuites/fstests/imfs_fserror/imfs_fserror.scn
rename to testsuites/fstests/fserror/imfs_fserror.scn
diff --git a/testsuites/fstests/jffs2_fserror/jffs2_fserror.scn b/testsuites/fstests/fserror/jffs2_fserror.scn
similarity index 100%
rename from testsuites/fstests/jffs2_fserror/jffs2_fserror.scn
rename to testsuites/fstests/fserror/jffs2_fserror.scn
diff --git a/testsuites/fstests/mdosfs_fserror/mdosfs_fserror.scn b/testsuites/fstests/fserror/mdosfs_fserror.scn
similarity index 100%
rename from testsuites/fstests/mdosfs_fserror/mdosfs_fserror.scn
rename to testsuites/fstests/fserror/mdosfs_fserror.scn
diff --git a/testsuites/fstests/mimfs_fserror/mimfs_fserror.scn b/testsuites/fstests/fserror/mimfs_fserror.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fserror/mimfs_fserror.scn
rename to testsuites/fstests/fserror/mimfs_fserror.scn
diff --git a/testsuites/fstests/mrfs_fserror/mrfs_fserror.scn b/testsuites/fstests/fserror/mrfs_fserror.scn
similarity index 100%
rename from testsuites/fstests/mrfs_fserror/mrfs_fserror.scn
rename to testsuites/fstests/fserror/mrfs_fserror.scn
diff --git a/testsuites/fstests/imfs_fslink/imfs_fslink.scn b/testsuites/fstests/fslink/imfs_fslink.scn
similarity index 100%
rename from testsuites/fstests/imfs_fslink/imfs_fslink.scn
rename to testsuites/fstests/fslink/imfs_fslink.scn
diff --git a/testsuites/fstests/jffs2_fslink/jffs2_fslink.scn b/testsuites/fstests/fslink/jffs2_fslink.scn
similarity index 100%
rename from testsuites/fstests/jffs2_fslink/jffs2_fslink.scn
rename to testsuites/fstests/fslink/jffs2_fslink.scn
diff --git a/testsuites/fstests/mimfs_fslink/mimfs_fslink.scn b/testsuites/fstests/fslink/mimfs_fslink.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fslink/mimfs_fslink.scn
rename to testsuites/fstests/fslink/mimfs_fslink.scn
diff --git a/testsuites/fstests/mrfs_fslink/mrfs_fslink.scn b/testsuites/fstests/fslink/mrfs_fslink.scn
similarity index 100%
rename from testsuites/fstests/mrfs_fslink/mrfs_fslink.scn
rename to testsuites/fstests/fslink/mrfs_fslink.scn
diff --git a/testsuites/fstests/imfs_fspatheval/imfs_fspatheval.scn b/testsuites/fstests/fspatheval/imfs_fspatheval.scn
similarity index 100%
rename from testsuites/fstests/imfs_fspatheval/imfs_fspatheval.scn
rename to testsuites/fstests/fspatheval/imfs_fspatheval.scn
diff --git a/testsuites/fstests/jffs2_fspatheval/jffs2_fspatheval.scn b/testsuites/fstests/fspatheval/jffs2_fspatheval.scn
similarity index 100%
rename from testsuites/fstests/jffs2_fspatheval/jffs2_fspatheval.scn
rename to testsuites/fstests/fspatheval/jffs2_fspatheval.scn
diff --git a/testsuites/fstests/mdosfs_fspatheval/mdosfs_fspatheval.scn b/testsuites/fstests/fspatheval/mdosfs_fspatheval.scn
similarity index 100%
rename from testsuites/fstests/mdosfs_fspatheval/mdosfs_fspatheval.scn
rename to testsuites/fstests/fspatheval/mdosfs_fspatheval.scn
diff --git a/testsuites/fstests/mimfs_fspatheval/mimfs_fspatheval.scn b/testsuites/fstests/fspatheval/mimfs_fspatheval.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fspatheval/mimfs_fspatheval.scn
rename to testsuites/fstests/fspatheval/mimfs_fspatheval.scn
diff --git a/testsuites/fstests/mrfs_fspatheval/mrfs_fspatheval.scn b/testsuites/fstests/fspatheval/mrfs_fspatheval.scn
similarity index 100%
rename from testsuites/fstests/mrfs_fspatheval/mrfs_fspatheval.scn
rename to testsuites/fstests/fspatheval/mrfs_fspatheval.scn
diff --git a/testsuites/fstests/imfs_fspermission/imfs_fspermission.scn b/testsuites/fstests/fspermission/imfs_fspermission.scn
similarity index 100%
rename from testsuites/fstests/imfs_fspermission/imfs_fspermission.scn
rename to testsuites/fstests/fspermission/imfs_fspermission.scn
diff --git a/testsuites/fstests/jffs2_fspermission/jffs2_fspermission.scn b/testsuites/fstests/fspermission/jffs2_fspermission.scn
similarity index 100%
rename from testsuites/fstests/jffs2_fspermission/jffs2_fspermission.scn
rename to testsuites/fstests/fspermission/jffs2_fspermission.scn
diff --git a/testsuites/fstests/mimfs_fspermission/mimfs_fspermission-interupted.scn b/testsuites/fstests/fspermission/mimfs_fspermission-interupted.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fspermission/mimfs_fspermission-interupted.scn
rename to testsuites/fstests/fspermission/mimfs_fspermission-interupted.scn
diff --git a/testsuites/fstests/mrfs_fspermission/mrfs_fspermission.scn b/testsuites/fstests/fspermission/mrfs_fspermission.scn
similarity index 100%
rename from testsuites/fstests/mrfs_fspermission/mrfs_fspermission.scn
rename to testsuites/fstests/fspermission/mrfs_fspermission.scn
diff --git a/testsuites/fstests/imfs_fsrdwr/imfs_fsrdwr.scn b/testsuites/fstests/fsrdwr/imfs_fsrdwr.scn
similarity index 100%
rename from testsuites/fstests/imfs_fsrdwr/imfs_fsrdwr.scn
rename to testsuites/fstests/fsrdwr/imfs_fsrdwr.scn
diff --git a/testsuites/fstests/jffs2_fsrdwr/jffs2_fsrdwr.scn b/testsuites/fstests/fsrdwr/jffs2_fsrdwr.scn
similarity index 100%
rename from testsuites/fstests/jffs2_fsrdwr/jffs2_fsrdwr.scn
rename to testsuites/fstests/fsrdwr/jffs2_fsrdwr.scn
diff --git a/testsuites/fstests/mdosfs_fsrdwr/mdosfs_fsrdwr.scn b/testsuites/fstests/fsrdwr/mdosfs_fsrdwr.scn
similarity index 100%
rename from testsuites/fstests/mdosfs_fsrdwr/mdosfs_fsrdwr.scn
rename to testsuites/fstests/fsrdwr/mdosfs_fsrdwr.scn
diff --git a/testsuites/fstests/mimfs_fsrdwr/mimfs_fsrdwr.scn b/testsuites/fstests/fsrdwr/mimfs_fsrdwr.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fsrdwr/mimfs_fsrdwr.scn
rename to testsuites/fstests/fsrdwr/mimfs_fsrdwr.scn
diff --git a/testsuites/fstests/mrfs_fsrdwr/mrfs_fsrdwr.scn b/testsuites/fstests/fsrdwr/mrfs_fsrdwr.scn
similarity index 100%
rename from testsuites/fstests/mrfs_fsrdwr/mrfs_fsrdwr.scn
rename to testsuites/fstests/fsrdwr/mrfs_fsrdwr.scn
diff --git a/testsuites/fstests/mimfs_fsrename/mimfs_fsrename.scn b/testsuites/fstests/fsrename/mimfs_fsrename.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fsrename/mimfs_fsrename.scn
rename to testsuites/fstests/fsrename/mimfs_fsrename.scn
diff --git a/testsuites/fstests/imfs_fsscandir01/imfs_fsscandir01.scn b/testsuites/fstests/fsscandir01/imfs_fsscandir01.scn
similarity index 100%
rename from testsuites/fstests/imfs_fsscandir01/imfs_fsscandir01.scn
rename to testsuites/fstests/fsscandir01/imfs_fsscandir01.scn
diff --git a/testsuites/fstests/jffs2_fsscandir01/jffs2_fsscandir01.scn b/testsuites/fstests/fsscandir01/jffs2_fsscandir01.scn
similarity index 100%
rename from testsuites/fstests/jffs2_fsscandir01/jffs2_fsscandir01.scn
rename to testsuites/fstests/fsscandir01/jffs2_fsscandir01.scn
diff --git a/testsuites/fstests/mdosfs_fsscandir01/mdosfs_fsscandir01.scn b/testsuites/fstests/fsscandir01/mdosfs_fsscandir01.scn
similarity index 100%
rename from testsuites/fstests/mdosfs_fsscandir01/mdosfs_fsscandir01.scn
rename to testsuites/fstests/fsscandir01/mdosfs_fsscandir01.scn
diff --git a/testsuites/fstests/mimfs_fsscandir01/mimfs_fsscandir01.scn b/testsuites/fstests/fsscandir01/mimfs_fsscandir01.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fsscandir01/mimfs_fsscandir01.scn
rename to testsuites/fstests/fsscandir01/mimfs_fsscandir01.scn
diff --git a/testsuites/fstests/mrfs_fsscandir01/mrfs_fsscandir01.scn b/testsuites/fstests/fsscandir01/mrfs_fsscandir01.scn
similarity index 100%
rename from testsuites/fstests/mrfs_fsscandir01/mrfs_fsscandir01.scn
rename to testsuites/fstests/fsscandir01/mrfs_fsscandir01.scn
diff --git a/testsuites/fstests/mdosfs_fsstatvfs/mdosfs_fsstatvfs.scn b/testsuites/fstests/fsstatvfs/mdosfs_fsstatvfs.scn
similarity index 100%
rename from testsuites/fstests/mdosfs_fsstatvfs/mdosfs_fsstatvfs.scn
rename to testsuites/fstests/fsstatvfs/mdosfs_fsstatvfs.scn
diff --git a/testsuites/fstests/imfs_fstime/imfs_fstime.scn b/testsuites/fstests/fstime/imfs_fstime.scn
similarity index 100%
rename from testsuites/fstests/imfs_fstime/imfs_fstime.scn
rename to testsuites/fstests/fstime/imfs_fstime.scn
diff --git a/testsuites/fstests/jffs2_fstime/jffs2_fstime.scn b/testsuites/fstests/fstime/jffs2_fstime.scn
similarity index 100%
rename from testsuites/fstests/jffs2_fstime/jffs2_fstime.scn
rename to testsuites/fstests/fstime/jffs2_fstime.scn
diff --git a/testsuites/fstests/mimfs_fstime/mimfs_fstime.scn b/testsuites/fstests/fstime/mimfs_fstime.scn
similarity index 100%
rename from testsuites/fstests/mimfs_fstime/mimfs_fstime.scn
rename to testsuites/fstests/fstime/mimfs_fstime.scn
diff --git a/testsuites/fstests/mrfs_fstime/mrfs_fstime.scn b/testsuites/fstests/fstime/mrfs_fstime.scn
similarity index 100%
rename from testsuites/fstests/mrfs_fstime/mrfs_fstime.scn
rename to testsuites/fstests/fstime/mrfs_fstime.scn
diff --git a/testsuites/fstests/imfs_fserror/Makefile.am b/testsuites/fstests/imfs_fserror/Makefile.am
deleted file mode 100644
index aea866851f..0000000000
--- a/testsuites/fstests/imfs_fserror/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fserror
-imfs_fserror_SOURCES  =  ../fserror/test.c
-imfs_fserror_SOURCES += ../support/fstest_support.c
-imfs_fserror_SOURCES += ../support/fstest_support.h
-imfs_fserror_SOURCES += ../support/fstest.h
-imfs_fserror_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fserror_SOURCES += ../imfs_support/fs_support.c
-imfs_fserror_SOURCES += ../imfs_support/fs_config.h 
-
-#dist_rtems_tests_DATA = imfs_fserror.scn
-#dist_rtems_tests_DATA += imfs_fserror.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fserror_OBJECTS)
-LINK_LIBS = $(imfs_fserror_LDLIBS)
-
-imfs_fserror$(EXEEXT): $(imfs_fserror_OBJECTS) $(imfs_fserror_DEPENDENCIES)
-	@rm -f imfs_fserror$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/imfs_fslink/Makefile.am b/testsuites/fstests/imfs_fslink/Makefile.am
deleted file mode 100644
index 09bdaa00c2..0000000000
--- a/testsuites/fstests/imfs_fslink/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fslink
-imfs_fslink_SOURCES  =  ../fslink/test.c
-imfs_fslink_SOURCES +=  ../support/fstest_support.c
-imfs_fslink_SOURCES += ../support/fstest_support.h
-imfs_fslink_SOURCES +=  ../support/fstest.h
-imfs_fslink_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fslink_SOURCES += ../imfs_support/fs_support.c
-imfs_fslink_SOURCES += ../imfs_support/fs_config.h 
-
-#dist_rtems_tests_DATA = imfs_fslink.scn
-#dist_rtems_tests_DATA += imfs_fslink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fslink_OBJECTS)
-LINK_LIBS = $(imfs_fslink_LDLIBS)
-
-imfs_fslink$(EXEEXT): $(imfs_fslink_OBJECTS) $(imfs_fslink_DEPENDENCIES)
-	@rm -f imfs_fslink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/imfs_fspatheval/Makefile.am b/testsuites/fstests/imfs_fspatheval/Makefile.am
deleted file mode 100644
index f5038c9115..0000000000
--- a/testsuites/fstests/imfs_fspatheval/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fspatheval
-imfs_fspatheval_SOURCES  = ../fspatheval/test.c
-imfs_fspatheval_SOURCES += ../support/fstest_support.c
-imfs_fspatheval_SOURCES += ../support/fstest_support.h
-imfs_fspatheval_SOURCES += ../support/fstest.h
-imfs_fspatheval_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fspatheval_SOURCES += ../imfs_support/fs_support.c
-imfs_fspatheval_SOURCES += ../imfs_support/fs_config.h 
-
-dist_rtems_tests_DATA = imfs_fspatheval.scn
-#dist_rtems_tests_DATA += imfs_fspatheval.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fspatheval_OBJECTS)
-LINK_LIBS = $(imfs_fspatheval_LDLIBS)
-
-imfs_fspatheval$(EXEEXT): $(imfs_fspatheval_OBJECTS) $(imfs_fspatheval_DEPENDENCIES)
-	@rm -f imfs_fspatheval$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/imfs_fspermission/Makefile.am b/testsuites/fstests/imfs_fspermission/Makefile.am
deleted file mode 100644
index dc76d96af8..0000000000
--- a/testsuites/fstests/imfs_fspermission/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fspermission
-imfs_fspermission_SOURCES  = ../fspermission/test.c
-imfs_fspermission_SOURCES += ../support/fstest_support.c
-imfs_fspermission_SOURCES += ../support/fstest_support.h
-imfs_fspermission_SOURCES += ../support/fstest.h
-imfs_fspermission_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fspermission_SOURCES += ../imfs_support/fs_support.c
-imfs_fspermission_SOURCES += ../imfs_support/fs_config.h 
-
-#dist_rtems_tests_DATA = imfs_fspermission.scn
-#dist_rtems_tests_DATA += imfs_fspermission.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fspermission_OBJECTS)
-LINK_LIBS = $(imfs_fspermission_LDLIBS)
-
-imfs_fspermission$(EXEEXT): $(imfs_fspermission_OBJECTS) $(imfs_fspermission_DEPENDENCIES)
-	@rm -f imfs_fspermission$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/imfs_fsrdwr/Makefile.am b/testsuites/fstests/imfs_fsrdwr/Makefile.am
deleted file mode 100644
index 3ac5d0b503..0000000000
--- a/testsuites/fstests/imfs_fsrdwr/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fsrdwr
-imfs_fsrdwr_SOURCES  = ../fsrdwr/init.c
-imfs_fsrdwr_SOURCES += ../support/fstest_support.c
-imfs_fsrdwr_SOURCES += ../support/fstest_support.h
-imfs_fsrdwr_SOURCES += ../support/fstest.h
-imfs_fsrdwr_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fsrdwr_SOURCES += ../imfs_support/fs_support.c
-imfs_fsrdwr_SOURCES += ../imfs_support/fs_config.h 
-
-#dist_rtems_tests_DATA = imfs_fsrdwr.scn
-#dist_rtems_tests_DATA += imfs_fsrdwr.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fsrdwr_OBJECTS)
-LINK_LIBS = $(imfs_fsrdwr_LDLIBS)
-
-imfs_fsrdwr$(EXEEXT): $(imfs_fsrdwr_OBJECTS) $(imfs_fsrdwr_DEPENDENCIES)
-	@rm -f imfs_fsrdwr$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/imfs_fsscandir01/Makefile.am b/testsuites/fstests/imfs_fsscandir01/Makefile.am
deleted file mode 100644
index 86bd06eb86..0000000000
--- a/testsuites/fstests/imfs_fsscandir01/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fsscandir01
-imfs_fsscandir01_SOURCES  = ../fsscandir01/init.c
-imfs_fsscandir01_SOURCES += ../support/fstest_support.c
-imfs_fsscandir01_SOURCES += ../support/fstest_support.h
-imfs_fsscandir01_SOURCES += ../support/fstest.h
-imfs_fsscandir01_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fsscandir01_SOURCES += ../imfs_support/fs_support.c
-imfs_fsscandir01_SOURCES += ../imfs_support/fs_config.h 
-
-#dist_rtems_tests_DATA = imfs_fsscandir01.scn
-#dist_rtems_tests_DATA += imfs_fsscandir01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fsscandir01_OBJECTS)
-LINK_LIBS = $(imfs_fsscandir01_LDLIBS)
-
-imfs_fsscandir01$(EXEEXT): $(imfs_fsscandir01_OBJECTS) $(imfs_fsscandir01_DEPENDENCIES)
-	@rm -f imfs_fsscandir01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/imfs_fssymlink/Makefile.am b/testsuites/fstests/imfs_fssymlink/Makefile.am
deleted file mode 100644
index 75d8ece894..0000000000
--- a/testsuites/fstests/imfs_fssymlink/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fssymlink
-imfs_fssymlink_SOURCES  = ../fssymlink/test.c
-imfs_fssymlink_SOURCES += ../support/fstest_support.c
-imfs_fssymlink_SOURCES += ../support/fstest_support.h
-imfs_fssymlink_SOURCES += ../support/fstest.h
-imfs_fssymlink_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fssymlink_SOURCES += ../imfs_support/fs_support.c
-imfs_fssymlink_SOURCES += ../imfs_support/fs_config.h
-
-dist_rtems_tests_DATA = imfs_fssymlink.scn
-#dist_rtems_tests_DATA += imfs_fssymlink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fssymlink_OBJECTS)
-LINK_LIBS = $(imfs_fssymlink_LDLIBS)
-
-imfs_fssymlink$(EXEEXT): $(imfs_fssymlink_OBJECTS) $(imfs_fssymlink_DEPENDENCIES)
-	@rm -f imfs_fssymlink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/imfs_fssymlink/imfs_fssymlink.scn b/testsuites/fstests/imfs_fssymlink/imfs_fssymlink.scn
deleted file mode 100644
index 53fc11f705..0000000000
--- a/testsuites/fstests/imfs_fssymlink/imfs_fssymlink.scn
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-*** FILE SYSTEM TEST ( IMFS ) ***
-Initializing filesystem IMFS
-
-
-*** SYMLINK TEST ***
-Create a file named file
-Create a symlink named symlink to file
-call readlink
-file
-Unlink the file
-call readlink
-Create a dir named file
-Create a symlink named symlink to file
-call readlink
-rmdir the dir
-symlink loop erro test
-Testing creat      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing open       with arguments: "path,O_CREAT|O_WRONLY,mode" EXPECT "ELOOP"
-PASS
-Testing truncate   with arguments: "path,0"             EXPECT "ELOOP"
-PASS
-Testing rename     with arguments: "path,file04"        EXPECT "ELOOP"
-FAIL   ../../../../../../../rtems/c/src/../../testsuites/fstests/imfs_fssymlink/../fssymlink/test.c: 151
-Testing unlink     with arguments: "path"               EXPECT "ELOOP"
-PASS
-Testing mkdir      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing rmdir      with arguments: "path"               EXPECT "ELOOP"
-PASS
-*** END OF SYMLINK TEST ***
-
-
-Shutting down filesystem IMFS
-*** END OF FILE SYSTEM TEST ( IMFS ) ***
diff --git a/testsuites/fstests/imfs_fstime/Makefile.am b/testsuites/fstests/imfs_fstime/Makefile.am
deleted file mode 100644
index 0ddd00573b..0000000000
--- a/testsuites/fstests/imfs_fstime/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = imfs_fstime
-imfs_fstime_SOURCES  = ../fstime/test.c
-imfs_fstime_SOURCES += ../support/fstest_support.c
-imfs_fstime_SOURCES += ../support/fstest_support.h
-imfs_fstime_SOURCES += ../support/fstest.h
-imfs_fstime_SOURCES += ../../psxtests/include/pmacros.h
-imfs_fstime_SOURCES += ../imfs_support/fs_support.c
-imfs_fstime_SOURCES += ../imfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = imfs_fstime.scn
-#dist_rtems_tests_DATA += imfs_fstime.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/imfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(imfs_fstime_OBJECTS)
-LINK_LIBS = $(imfs_fstime_LDLIBS)
-
-imfs_fstime$(EXEEXT): $(imfs_fstime_OBJECTS) $(imfs_fstime_DEPENDENCIES)
-	@rm -f imfs_fstime$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fserror/Makefile.am b/testsuites/fstests/jffs2_fserror/Makefile.am
deleted file mode 100644
index fbf2d772ca..0000000000
--- a/testsuites/fstests/jffs2_fserror/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fserror
-jffs2_fserror_SOURCES  = ../fserror/test.c
-jffs2_fserror_SOURCES += ../support/fstest_support.c
-jffs2_fserror_SOURCES += ../support/fstest_support.h
-jffs2_fserror_SOURCES += ../support/fstest.h
-jffs2_fserror_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fserror_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fserror_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fserror_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fserror.scn
-#dist_rtems_tests_DATA += jffs2_fserror.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fserror_OBJECTS) $(jffs2_fserror_LDADD)
-LINK_LIBS = $(jffs2_fserror_LDLIBS)
-
-jffs2_fserror$(EXEEXT): $(jffs2_fserror_OBJECTS) $(jffs2_fserror_DEPENDENCIES)
-	@rm -f jffs2_fserror$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fslink/Makefile.am b/testsuites/fstests/jffs2_fslink/Makefile.am
deleted file mode 100644
index 9daa2ac38c..0000000000
--- a/testsuites/fstests/jffs2_fslink/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fslink
-jffs2_fslink_SOURCES  = ../fslink/test.c
-jffs2_fslink_SOURCES += ../support/fstest_support.c
-jffs2_fslink_SOURCES += ../support/fstest_support.h
-jffs2_fslink_SOURCES += ../support/fstest.h
-jffs2_fslink_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fslink_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fslink_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fslink_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fslink.scn
-#dist_rtems_tests_DATA += jffs2_fslink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fslink_OBJECTS) $(jffs2_fslink_LDADD)
-LINK_LIBS = $(jffs2_fslink_LDLIBS)
-
-jffs2_fslink$(EXEEXT): $(jffs2_fslink_OBJECTS) $(jffs2_fslink_DEPENDENCIES)
-	@rm -f jffs2_fslink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fspatheval/Makefile.am b/testsuites/fstests/jffs2_fspatheval/Makefile.am
deleted file mode 100644
index ae5e0f76a6..0000000000
--- a/testsuites/fstests/jffs2_fspatheval/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fspatheval
-jffs2_fspatheval_SOURCES  = ../fspatheval/test.c
-jffs2_fspatheval_SOURCES += ../support/fstest_support.c
-jffs2_fspatheval_SOURCES += ../support/fstest_support.h
-jffs2_fspatheval_SOURCES += ../support/fstest.h
-jffs2_fspatheval_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fspatheval_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fspatheval_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fspatheval_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fspatheval.scn
-#dist_rtems_tests_DATA += jffs2_fspatheval.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fspatheval_OBJECTS) $(jffs2_fspatheval_LDADD)
-LINK_LIBS = $(jffs2_fspatheval_LDLIBS)
-
-jffs2_fspatheval$(EXEEXT): $(jffs2_fspatheval_OBJECTS) $(jffs2_fspatheval_DEPENDENCIES)
-	@rm -f jffs2_fspatheval$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fspermission/Makefile.am b/testsuites/fstests/jffs2_fspermission/Makefile.am
deleted file mode 100644
index 3ac1617e74..0000000000
--- a/testsuites/fstests/jffs2_fspermission/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fspermission
-jffs2_fspermission_SOURCES  = ../fspermission/test.c
-jffs2_fspermission_SOURCES += ../support/fstest_support.c
-jffs2_fspermission_SOURCES += ../support/fstest_support.h
-jffs2_fspermission_SOURCES += ../support/fstest.h
-jffs2_fspermission_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fspermission_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fspermission_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fspermission_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fspermission.scn
-#dist_rtems_tests_DATA += jffs2_fspermission.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fspermission_OBJECTS) $(jffs2_fspermission_LDADD)
-LINK_LIBS = $(jffs2_fspermission_LDLIBS)
-
-jffs2_fspermission$(EXEEXT): $(jffs2_fspermission_OBJECTS) $(jffs2_fspermission_DEPENDENCIES)
-	@rm -f jffs2_fspermission$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fsrdwr/Makefile.am b/testsuites/fstests/jffs2_fsrdwr/Makefile.am
deleted file mode 100644
index 2eca660f97..0000000000
--- a/testsuites/fstests/jffs2_fsrdwr/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fsrdwr
-jffs2_fsrdwr_SOURCES  = ../fsrdwr/init.c
-jffs2_fsrdwr_SOURCES += ../support/fstest_support.c
-jffs2_fsrdwr_SOURCES += ../support/fstest_support.h
-jffs2_fsrdwr_SOURCES += ../support/fstest.h
-jffs2_fsrdwr_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fsrdwr_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fsrdwr_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fsrdwr_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fsrdwr.scn
-#dist_rtems_tests_DATA += jffs2_fsrdwr.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fsrdwr_OBJECTS) $(jffs2_fsrdwr_LDADD)
-LINK_LIBS = $(jffs2_fsrdwr_LDLIBS)
-
-jffs2_fsrdwr$(EXEEXT): $(jffs2_fsrdwr_OBJECTS) $(jffs2_fsrdwr_DEPENDENCIES)
-	@rm -f jffs2_fsrdwr$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fsscandir01/Makefile.am b/testsuites/fstests/jffs2_fsscandir01/Makefile.am
deleted file mode 100644
index 9f64e3fb10..0000000000
--- a/testsuites/fstests/jffs2_fsscandir01/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fsscandir01
-jffs2_fsscandir01_SOURCES  = ../fsscandir01/init.c
-jffs2_fsscandir01_SOURCES += ../support/fstest_support.c
-jffs2_fsscandir01_SOURCES += ../support/fstest_support.h
-jffs2_fsscandir01_SOURCES += ../support/fstest.h
-jffs2_fsscandir01_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fsscandir01_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fsscandir01_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fsscandir01_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fsscandir01.scn
-#dist_rtems_tests_DATA += jffs2_fsscandir01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fsscandir01_OBJECTS) $(jffs2_fsscandir01_LDADD)
-LINK_LIBS = $(jffs2_fsscandir01_LDLIBS)
-
-jffs2_fsscandir01$(EXEEXT): $(jffs2_fsscandir01_OBJECTS) $(jffs2_fsscandir01_DEPENDENCIES)
-	@rm -f jffs2_fsscandir01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fssymlink/Makefile.am b/testsuites/fstests/jffs2_fssymlink/Makefile.am
deleted file mode 100644
index 6dbb63922a..0000000000
--- a/testsuites/fstests/jffs2_fssymlink/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fssymlink
-jffs2_fssymlink_SOURCES  = ../fssymlink/test.c
-jffs2_fssymlink_SOURCES += ../support/fstest_support.c
-jffs2_fssymlink_SOURCES += ../support/fstest_support.h
-jffs2_fssymlink_SOURCES += ../support/fstest.h
-jffs2_fssymlink_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fssymlink_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fssymlink_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fssymlink_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fssymlink.scn
-#dist_rtems_tests_DATA += jffs2_fssymlink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fssymlink_OBJECTS) $(jffs2_fssymlink_LDADD)
-LINK_LIBS = $(jffs2_fssymlink_LDLIBS)
-
-jffs2_fssymlink$(EXEEXT): $(jffs2_fssymlink_OBJECTS) $(jffs2_fssymlink_DEPENDENCIES)
-	@rm -f jffs2_fssymlink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/jffs2_fssymlink/jffs2_fssymlink.scn b/testsuites/fstests/jffs2_fssymlink/jffs2_fssymlink.scn
deleted file mode 100644
index 8ef1d580c9..0000000000
--- a/testsuites/fstests/jffs2_fssymlink/jffs2_fssymlink.scn
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-*** FILE SYSTEM TEST ( JFFS2 ) ***
-Initializing filesystem JFFS2
-
-
-*** SYMLINK TEST ***
-Create a file named file
-Create a symlink named symlink to file
-call readlink
-file
-Unlink the file
-call readlink
-Create a dir named file
-Create a symlink named symlink to file
-call readlink
-rmdir the dir
-symlink loop erro test
-Testing creat      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing open       with arguments: "path,O_CREAT|O_WRONLY,mode" EXPECT "ELOOP"
-PASS
-Testing truncate   with arguments: "path,0"             EXPECT "ELOOP"
-PASS
-Testing rename     with arguments: "path,file04"        EXPECT "ELOOP"
-FAIL   ../../../../../../../rtems/c/src/../../testsuites/fstests/jffs2_fssymlink/../fssymlink/test.c: 151
-Testing unlink     with arguments: "path"               EXPECT "ELOOP"
-PASS
-Testing mkdir      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing rmdir      with arguments: "path"               EXPECT "ELOOP"
-PASS
-*** END OF SYMLINK TEST ***
-
-
-Shutting down filesystem JFFS2
-*** END OF FILE SYSTEM TEST ( JFFS2 ) ***
diff --git a/testsuites/fstests/jffs2_fstime/Makefile.am b/testsuites/fstests/jffs2_fstime/Makefile.am
deleted file mode 100644
index a65dc23a00..0000000000
--- a/testsuites/fstests/jffs2_fstime/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-rtems_tests_PROGRAMS = jffs2_fstime
-jffs2_fstime_SOURCES  = ../fstime/test.c
-jffs2_fstime_SOURCES += ../support/fstest_support.c
-jffs2_fstime_SOURCES += ../support/fstest_support.h
-jffs2_fstime_SOURCES += ../support/fstest.h
-jffs2_fstime_SOURCES += ../../psxtests/include/pmacros.h
-jffs2_fstime_SOURCES += ../jffs2_support/fs_support.c
-jffs2_fstime_SOURCES += ../jffs2_support/fs_config.h
-jffs2_fstime_LDADD = -ljffs2
-
-dist_rtems_tests_DATA = jffs2_fstime.scn
-#dist_rtems_tests_DATA += jffs2_fstime.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(jffs2_fstime_OBJECTS) $(jffs2_fstime_LDADD)
-LINK_LIBS = $(jffs2_fstime_LDLIBS)
-
-jffs2_fstime$(EXEEXT): $(jffs2_fstime_OBJECTS) $(jffs2_fstime_DEPENDENCIES)
-	@rm -f jffs2_fstime$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mdosfs_fserror/Makefile.am b/testsuites/fstests/mdosfs_fserror/Makefile.am
deleted file mode 100644
index 2ef643687f..0000000000
--- a/testsuites/fstests/mdosfs_fserror/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mdosfs_fserror
-mdosfs_fserror_SOURCES  = ../fserror/test.c
-mdosfs_fserror_SOURCES += ../support/ramdisk_support.c
-mdosfs_fserror_SOURCES += ../support/fstest_support.c
-mdosfs_fserror_SOURCES += ../support/fstest_support.h
-mdosfs_fserror_SOURCES += ../support/ramdisk_support.h
-mdosfs_fserror_SOURCES += ../support/fstest.h
-mdosfs_fserror_SOURCES += ../../psxtests/include/pmacros.h
-mdosfs_fserror_SOURCES += ../mdosfs_support/fs_support.c
-mdosfs_fserror_SOURCES += ../mdosfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mdosfs_fserror.scn
-#dist_rtems_tests_DATA += mdosfs_fserror.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mdosfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mdosfs_fserror_OBJECTS)
-LINK_LIBS = $(mdosfs_fserror_LDLIBS)
-
-mdosfs_fserror$(EXEEXT): $(mdosfs_fserror_OBJECTS) $(mdosfs_fserror_DEPENDENCIES)
-	@rm -f mdosfs_fserror$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mdosfs_fspatheval/Makefile.am b/testsuites/fstests/mdosfs_fspatheval/Makefile.am
deleted file mode 100644
index ddc8bafe24..0000000000
--- a/testsuites/fstests/mdosfs_fspatheval/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mdosfs_fspatheval
-mdosfs_fspatheval_SOURCES  = ../fspatheval/test.c
-mdosfs_fspatheval_SOURCES += ../support/ramdisk_support.c
-mdosfs_fspatheval_SOURCES += ../support/fstest_support.c
-mdosfs_fspatheval_SOURCES += ../support/fstest_support.h
-mdosfs_fspatheval_SOURCES += ../support/ramdisk_support.h
-mdosfs_fspatheval_SOURCES += ../support/fstest.h
-mdosfs_fspatheval_SOURCES += ../../psxtests/include/pmacros.h
-mdosfs_fspatheval_SOURCES += ../mdosfs_support/fs_support.c
-mdosfs_fspatheval_SOURCES += ../mdosfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mdosfs_fspatheval.scn
-#dist_rtems_tests_DATA += mdosfs_fspatheval.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mdosfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mdosfs_fspatheval_OBJECTS)
-LINK_LIBS = $(mdosfs_fspatheval_LDLIBS)
-
-mdosfs_fspatheval$(EXEEXT): $(mdosfs_fspatheval_OBJECTS) $(mdosfs_fspatheval_DEPENDENCIES)
-	@rm -f mdosfs_fspatheval$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mdosfs_fsrdwr/Makefile.am b/testsuites/fstests/mdosfs_fsrdwr/Makefile.am
deleted file mode 100644
index 5ce91cc737..0000000000
--- a/testsuites/fstests/mdosfs_fsrdwr/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mdosfs_fsrdwr
-mdosfs_fsrdwr_SOURCES  = ../fsrdwr/init.c
-mdosfs_fsrdwr_SOURCES += ../support/ramdisk_support.c
-mdosfs_fsrdwr_SOURCES += ../support/fstest_support.c
-mdosfs_fsrdwr_SOURCES += ../support/fstest_support.h
-mdosfs_fsrdwr_SOURCES += ../support/ramdisk_support.h
-mdosfs_fsrdwr_SOURCES += ../support/fstest.h
-mdosfs_fsrdwr_SOURCES += ../../psxtests/include/pmacros.h
-mdosfs_fsrdwr_SOURCES += ../mdosfs_support/fs_support.c
-mdosfs_fsrdwr_SOURCES += ../mdosfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mdosfs_fsrdwr.scn
-#dist_rtems_tests_DATA += mdosfs_fsrdwr.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mdosfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mdosfs_fsrdwr_OBJECTS)
-LINK_LIBS = $(mdosfs_fsrdwr_LDLIBS)
-
-mdosfs_fsrdwr$(EXEEXT): $(mdosfs_fsrdwr_OBJECTS) $(mdosfs_fsrdwr_DEPENDENCIES)
-	@rm -f mdosfs_fsrdwr$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mdosfs_fsscandir01/Makefile.am b/testsuites/fstests/mdosfs_fsscandir01/Makefile.am
deleted file mode 100644
index ea67f71140..0000000000
--- a/testsuites/fstests/mdosfs_fsscandir01/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mdosfs_fsscandir01
-mdosfs_fsscandir01_SOURCES  = ../fsscandir01/init.c
-mdosfs_fsscandir01_SOURCES += ../support/ramdisk_support.c
-mdosfs_fsscandir01_SOURCES += ../support/fstest_support.c
-mdosfs_fsscandir01_SOURCES += ../support/fstest_support.h
-mdosfs_fsscandir01_SOURCES += ../support/ramdisk_support.h
-mdosfs_fsscandir01_SOURCES += ../support/fstest.h
-mdosfs_fsscandir01_SOURCES += ../../psxtests/include/pmacros.h
-mdosfs_fsscandir01_SOURCES += ../mdosfs_support/fs_support.c
-mdosfs_fsscandir01_SOURCES += ../mdosfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mdosfs_fsscandir01.scn
-#dist_rtems_tests_DATA += mdosfs_fsscandir01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mdosfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mdosfs_fsscandir01_OBJECTS)
-LINK_LIBS = $(mdosfs_fsscandir01_LDLIBS)
-
-mdosfs_fsscandir01$(EXEEXT): $(mdosfs_fsscandir01_OBJECTS) $(mdosfs_fsscandir01_DEPENDENCIES)
-	@rm -f mdosfs_fsscandir01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mdosfs_fsstatvfs/Makefile.am b/testsuites/fstests/mdosfs_fsstatvfs/Makefile.am
deleted file mode 100644
index 4461ede127..0000000000
--- a/testsuites/fstests/mdosfs_fsstatvfs/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mdosfs_fsstatvfs
-mdosfs_fsstatvfs_SOURCES  = ../fsstatvfs/test.c
-mdosfs_fsstatvfs_SOURCES += ../support/ramdisk_support.c
-mdosfs_fsstatvfs_SOURCES += ../support/fstest_support.c
-mdosfs_fsstatvfs_SOURCES += ../support/fstest_support.h
-mdosfs_fsstatvfs_SOURCES += ../support/ramdisk_support.h
-mdosfs_fsstatvfs_SOURCES += ../support/fstest.h
-mdosfs_fsstatvfs_SOURCES += ../../psxtests/include/pmacros.h
-mdosfs_fsstatvfs_SOURCES += ../mdosfs_support/fs_support.c
-mdosfs_fsstatvfs_SOURCES += ../mdosfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mdosfs_fsstatvfs.scn
-#dist_rtems_tests_DATA = mdosfs_fsstatvfs.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mdosfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mdosfs_fsstatvfs_OBJECTS)
-LINK_LIBS = $(mdosfs_fsstatvfs_LDLIBS)
-
-mdosfs_ffsstatvfs$(EXEEXT): $(mdosfs_fsstatvfs_OBJECTS) $(mdosfs_fsstatvfs_DEPENDENCIES)
-	@rm -f mdosfs_fsstatvfs$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mdosfs_fstime/Makefile.am b/testsuites/fstests/mdosfs_fstime/Makefile.am
deleted file mode 100644
index 14f58c5271..0000000000
--- a/testsuites/fstests/mdosfs_fstime/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mdosfs_fstime
-mdosfs_fstime_SOURCES  = ../fstime/test.c
-mdosfs_fstime_SOURCES += ../support/ramdisk_support.c
-mdosfs_fstime_SOURCES += ../support/fstest_support.c
-mdosfs_fstime_SOURCES += ../support/fstest_support.h
-mdosfs_fstime_SOURCES += ../support/ramdisk_support.h
-mdosfs_fstime_SOURCES += ../support/fstest.h
-mdosfs_fstime_SOURCES += ../../psxtests/include/pmacros.h
-mdosfs_fstime_SOURCES += ../mdosfs_support/fs_support.c
-mdosfs_fstime_SOURCES += ../mdosfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mdosfs_fstime.scn
-#dist_rtems_tests_DATA += mdosfs_fstime.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mdosfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mdosfs_fstime_OBJECTS)
-LINK_LIBS = $(mdosfs_fstime_LDLIBS)
-
-mdosfs_fstime$(EXEEXT): $(mdosfs_fstime_OBJECTS) $(mdosfs_fstime_DEPENDENCIES)
-	@rm -f mdosfs_fstime$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fserror/Makefile.am b/testsuites/fstests/mimfs_fserror/Makefile.am
deleted file mode 100644
index c418bc0d8f..0000000000
--- a/testsuites/fstests/mimfs_fserror/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fserror
-mimfs_fserror_SOURCES  = ../fserror/test.c
-mimfs_fserror_SOURCES += ../support/fstest_support.c
-mimfs_fserror_SOURCES += ../support/fstest_support.h
-mimfs_fserror_SOURCES += ../support/fstest.h
-mimfs_fserror_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fserror_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fserror_SOURCES += ../mimfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mimfs_fserror.scn
-#dist_rtems_tests_DATA += mimfs_fserror.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fserror_OBJECTS)
-LINK_LIBS = $(mimfs_fserror_LDLIBS)
-
-mimfs_fserror$(EXEEXT): $(mimfs_fserror_OBJECTS) $(mimfs_fserror_DEPENDENCIES)
-	@rm -f mimfs_fserror$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fslink/Makefile.am b/testsuites/fstests/mimfs_fslink/Makefile.am
deleted file mode 100644
index 7ae7e9e779..0000000000
--- a/testsuites/fstests/mimfs_fslink/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fslink
-mimfs_fslink_SOURCES  = ../fslink/test.c
-mimfs_fslink_SOURCES += ../support/fstest_support.c
-mimfs_fslink_SOURCES += ../support/fstest_support.h
-mimfs_fslink_SOURCES += ../support/fstest.h
-mimfs_fslink_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fslink_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fslink_SOURCES += ../mimfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mimfs_fslink.scn
-#dist_rtems_tests_DATA += mimfs_fslink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fslink_OBJECTS)
-LINK_LIBS = $(mimfs_fslink_LDLIBS)
-
-mimfs_fslink$(EXEEXT): $(mimfs_fslink_OBJECTS) $(mimfs_fslink_DEPENDENCIES)
-	@rm -f mimfs_fslink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fspatheval/Makefile.am b/testsuites/fstests/mimfs_fspatheval/Makefile.am
deleted file mode 100644
index 2704bac803..0000000000
--- a/testsuites/fstests/mimfs_fspatheval/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fspatheval
-mimfs_fspatheval_SOURCES  = ../fspatheval/test.c
-mimfs_fspatheval_SOURCES += ../support/fstest_support.c
-mimfs_fspatheval_SOURCES += ../support/fstest_support.h
-mimfs_fspatheval_SOURCES += ../support/fstest.h
-mimfs_fspatheval_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fspatheval_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fspatheval_SOURCES += ../mimfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mimfs_fspatheval.scn
-#dist_rtems_tests_DATA += mimfs_fspatheval.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fspatheval_OBJECTS)
-LINK_LIBS = $(mimfs_fspatheval_LDLIBS)
-
-mimfs_fspatheval$(EXEEXT): $(mimfs_fspatheval_OBJECTS) $(mimfs_fspatheval_DEPENDENCIES)
-	@rm -f mimfs_fspatheval$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fspermission/Makefile.am b/testsuites/fstests/mimfs_fspermission/Makefile.am
deleted file mode 100644
index 5b33b57a52..0000000000
--- a/testsuites/fstests/mimfs_fspermission/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fspermission
-mimfs_fspermission_SOURCES  = ../fspermission/test.c
-mimfs_fspermission_SOURCES += ../support/fstest_support.c
-mimfs_fspermission_SOURCES += ../support/fstest_support.h
-mimfs_fspermission_SOURCES += ../support/fstest.h
-mimfs_fspermission_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fspermission_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fspermission_SOURCES += ../mimfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mimfs_fspermission.scn
-#dist_rtems_tests_DATA += mimfs_fspermission.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fspermission_OBJECTS)
-LINK_LIBS = $(mimfs_fspermission_LDLIBS)
-
-mimfs_fspermission$(EXEEXT): $(mimfs_fspermission_OBJECTS) $(mimfs_fspermission_DEPENDENCIES)
-	@rm -f mimfs_fspermission$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fsrdwr/Makefile.am b/testsuites/fstests/mimfs_fsrdwr/Makefile.am
deleted file mode 100644
index f4c8e9a3c8..0000000000
--- a/testsuites/fstests/mimfs_fsrdwr/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fsrdwr
-mimfs_fsrdwr_SOURCES  = ../fsrdwr/init.c
-mimfs_fsrdwr_SOURCES += ../support/fstest_support.c
-mimfs_fsrdwr_SOURCES += ../support/fstest_support.h
-mimfs_fsrdwr_SOURCES += ../support/fstest.h
-mimfs_fsrdwr_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fsrdwr_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fsrdwr_SOURCES += ../mimfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mimfs_fsrdwr.scn
-#dist_rtems_tests_DATA += mimfs_fsrdwr.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fsrdwr_OBJECTS)
-LINK_LIBS = $(mimfs_fsrdwr_LDLIBS)
-
-mimfs_fsrdwr$(EXEEXT): $(mimfs_fsrdwr_OBJECTS) $(mimfs_fsrdwr_DEPENDENCIES)
-	@rm -f mimfs_fsrdwr$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fsrename/Makefile.am b/testsuites/fstests/mimfs_fsrename/Makefile.am
deleted file mode 100644
index 85b6072a25..0000000000
--- a/testsuites/fstests/mimfs_fsrename/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fsrename
-mimfs_fsrename_SOURCES  = ../fsrename/test.c
-mimfs_fsrename_SOURCES += ../support/fstest_support.c
-mimfs_fsrename_SOURCES += ../support/fstest_support.h
-mimfs_fsrename_SOURCES += ../support/fstest.h
-mimfs_fsrename_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fsrename_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fsrename_SOURCES += ../mimfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mimfs_fsrename.scn
-#dist_rtems_tests_DATA += mimfs_fsrename.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fsrename_OBJECTS)
-LINK_LIBS = $(mimfs_fsrename_LDLIBS)
-
-mimfs_fsrename$(EXEEXT): $(mimfs_fsrename_OBJECTS) $(mimfs_fsrename_DEPENDENCIES)
-	@rm -f mimfs_fsrename$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fsscandir01/Makefile.am b/testsuites/fstests/mimfs_fsscandir01/Makefile.am
deleted file mode 100644
index 1f8a554373..0000000000
--- a/testsuites/fstests/mimfs_fsscandir01/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fsscandir01
-mimfs_fsscandir01_SOURCES  = ../fsscandir01/init.c
-mimfs_fsscandir01_SOURCES += ../support/fstest_support.c
-mimfs_fsscandir01_SOURCES += ../support/fstest_support.h
-mimfs_fsscandir01_SOURCES += ../support/fstest.h
-mimfs_fsscandir01_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fsscandir01_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fsscandir01_SOURCES += ../mimfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mimfs_fsscandir01.scn
-#dist_rtems_tests_DATA += mimfs_fsscandir01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fsscandir01_OBJECTS)
-LINK_LIBS = $(mimfs_fsscandir01_LDLIBS)
-
-mimfs_fsscandir01$(EXEEXT): $(mimfs_fsscandir01_OBJECTS) $(mimfs_fsscandir01_DEPENDENCIES)
-	@rm -f mimfs_fsscandir01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fssymlink/Makefile.am b/testsuites/fstests/mimfs_fssymlink/Makefile.am
deleted file mode 100644
index 8c9ceeb83e..0000000000
--- a/testsuites/fstests/mimfs_fssymlink/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fssymlink
-mimfs_fssymlink_SOURCES  = ../fssymlink/test.c
-mimfs_fssymlink_SOURCES += ../support/fstest_support.c
-mimfs_fssymlink_SOURCES += ../support/fstest_support.h
-mimfs_fssymlink_SOURCES += ../support/fstest.h
-mimfs_fssymlink_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fssymlink_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fssymlink_SOURCES += ../mimfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mimfs_fssymlink.scn
-#dist_rtems_tests_DATA += mimfs_fssymlink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fssymlink_OBJECTS)
-LINK_LIBS = $(mimfs_fssymlink_LDLIBS)
-
-mimfs_fssymlink$(EXEEXT): $(mimfs_fssymlink_OBJECTS) $(mimfs_fssymlink_DEPENDENCIES)
-	@rm -f mimfs_fssymlink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mimfs_fssymlink/mimfs_fssymlink.scn b/testsuites/fstests/mimfs_fssymlink/mimfs_fssymlink.scn
deleted file mode 100644
index c18037dacf..0000000000
--- a/testsuites/fstests/mimfs_fssymlink/mimfs_fssymlink.scn
+++ /dev/null
@@ -1,31 +0,0 @@
-*** FILE SYSTEM TEST ( MOUNTED IMFS ) ***
-Initializing filesystem MOUNTED IMFS
-
-
-*** SYMLINK TEST ***
-Create a file named file
-Create a symlink named symlink to file
-call readlink 
-file
-Unlink the file
-call readlink 
-Create a dir named file
-Create a symlink named symlink to file
-call readlink 
-rmdir the dir
-symlink loop erro test
-Testing creat      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing open       with arguments: "path,O_CREAT|O_WRONLY,mode" EXPECT "ELOOP"
-PASS
-Testing truncate   with arguments: "path,0"             EXPECT "ELOOP"
-PASS
-Testing rename     with arguments: "path,file04"        EXPECT "ELOOP"
-FAIL   ../../../../../../../rtems/c/src/../../testsuites/fstests/mimfs_fssymlink/../fssymlink/test.c: 151 
-Testing unlink     with arguments: "path"               EXPECT "ELOOP"
-PASS
-Testing mkdir      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing rmdir      with arguments: "path"               EXPECT "ELOOP"
-PASS
-*** END OF SYMLINK TEST ***
diff --git a/testsuites/fstests/mimfs_fstime/Makefile.am b/testsuites/fstests/mimfs_fstime/Makefile.am
deleted file mode 100644
index 1a88784ab6..0000000000
--- a/testsuites/fstests/mimfs_fstime/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-rtems_tests_PROGRAMS = mimfs_fstime
-mimfs_fstime_SOURCES  = ../fstime/test.c
-mimfs_fstime_SOURCES += ../support/fstest_support.c
-mimfs_fstime_SOURCES += ../support/fstest_support.h
-mimfs_fstime_SOURCES += ../support/fstest.h
-mimfs_fstime_SOURCES += ../../psxtests/include/pmacros.h
-mimfs_fstime_SOURCES += ../mimfs_support/fs_support.c
-mimfs_fstime_SOURCES += ../mimfs_support/fs_config.h
-
-#dist_rtems_tests_DATA = mimfs_fstime.scn
-#dist_rtems_tests_DATA += mimfs_fstime.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mimfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mimfs_fstime_OBJECTS)
-LINK_LIBS = $(mimfs_fstime_LDLIBS)
-
-mimfs_fstime$(EXEEXT): $(mimfs_fstime_OBJECTS) $(mimfs_fstime_DEPENDENCIES)
-	@rm -f mimfs_fstime$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fserror/Makefile.am b/testsuites/fstests/mrfs_fserror/Makefile.am
deleted file mode 100644
index c0a9a60174..0000000000
--- a/testsuites/fstests/mrfs_fserror/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fserror
-mrfs_fserror_SOURCES  = ../fserror/test.c
-mrfs_fserror_SOURCES += ../support/ramdisk_support.c
-mrfs_fserror_SOURCES += ../support/fstest_support.c
-mrfs_fserror_SOURCES += ../support/fstest_support.h
-mrfs_fserror_SOURCES += ../support/ramdisk_support.h
-mrfs_fserror_SOURCES += ../support/fstest.h
-mrfs_fserror_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fserror_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fserror_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fserror.scn
-#dist_rtems_tests_DATA += mrfs_fserror.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fserror_OBJECTS)
-LINK_LIBS = $(mrfs_fserror_LDLIBS)
-
-mrfs_fserror$(EXEEXT): $(mrfs_fserror_OBJECTS) $(mrfs_fserror_DEPENDENCIES)
-	@rm -f mrfs_fserror$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fsfpathconf/Makefile.am b/testsuites/fstests/mrfs_fsfpathconf/Makefile.am
deleted file mode 100644
index cf1054d249..0000000000
--- a/testsuites/fstests/mrfs_fsfpathconf/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fsfpathconf
-mrfs_fsfpathconf_SOURCES  = ../fsfpathconf/test.c
-mrfs_fsfpathconf_SOURCES += ../support/ramdisk_support.c
-mrfs_fsfpathconf_SOURCES += ../support/fstest_support.c
-mrfs_fsfpathconf_SOURCES += ../support/fstest_support.h
-mrfs_fsfpathconf_SOURCES += ../support/ramdisk_support.h
-mrfs_fsfpathconf_SOURCES += ../support/fstest.h
-mrfs_fsfpathconf_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fsfpathconf_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fsfpathconf_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fsfpathconf.scn
-#dist_rtems_tests_DATA += mrfs_fsfpathconf.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fsfpathconf_OBJECTS)
-LINK_LIBS = $(mrfs_fsfpathconf_LDLIBS)
-
-mrfs_fsfpathconf$(EXEEXT): $(mrfs_fsfpathconf_OBJECTS) $(mrfs_fsfpathconf_DEPENDENCIES)
-	@rm -f mrfs_fsfpathconf$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fsfpathconf/mrfs_fsfpathconf.scn b/testsuites/fstests/mrfs_fsfpathconf/mrfs_fsfpathconf.scn
deleted file mode 100644
index 655b65ac45..0000000000
--- a/testsuites/fstests/mrfs_fsfpathconf/mrfs_fsfpathconf.scn
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-*** FILE SYSTEM TEST ( MOUNTED RFS ) ***
-Initializing filesystem MOUNTED RFS
-
-
-*** FPATHCONF TEST ***
-
-fpathconf of non-existing file give -1 , expected -1
-... creating file "testfile.km"
-*** file created succesfully
-
-request with _PC_LINK_MAX return : 5
-request with _PC_MAX_CANON return : 128
-request with _PC_MAX_INPUT return : 7
-request with _PC_NAME_MAX return : 255
-request with _PC_PATH_MAX return : 255
-request with _PC_PIPE_BUF return : 1024
-request with _PC_CHOWN_RESTRICTED return : 0
-request with _PC_NO_TRUNC return : 1
-request with _PC_VDISABLE return : 0
-request with _PC_ASYNC_IO return : 0
-request with _PC_PRIO_IO return : 0
-request with _PC_SYNC_IO return : 0
-request with bad argument return : -1
-*** END OF FPATHCONF TEST ***
-
-
-Shutting down filesystem MOUNTED RFS
-*** END OF FILE SYSTEM TEST ( MOUNTED RFS ) ***
diff --git a/testsuites/fstests/mrfs_fslink/Makefile.am b/testsuites/fstests/mrfs_fslink/Makefile.am
deleted file mode 100644
index 8d9ae340c9..0000000000
--- a/testsuites/fstests/mrfs_fslink/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fslink
-mrfs_fslink_SOURCES  = ../fslink/test.c
-mrfs_fslink_SOURCES += ../support/ramdisk_support.c
-mrfs_fslink_SOURCES += ../support/fstest_support.c
-mrfs_fslink_SOURCES += ../support/fstest_support.h
-mrfs_fslink_SOURCES += ../support/ramdisk_support.h
-mrfs_fslink_SOURCES += ../support/fstest.h
-mrfs_fslink_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fslink_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fslink_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fslink.scn
-#dist_rtems_tests_DATA += mrfs_fslink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fslink_OBJECTS)
-LINK_LIBS = $(mrfs_fslink_LDLIBS)
-
-mrfs_fslink$(EXEEXT): $(mrfs_fslink_OBJECTS) $(mrfs_fslink_DEPENDENCIES)
-	@rm -f mrfs_fslink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fspatheval/Makefile.am b/testsuites/fstests/mrfs_fspatheval/Makefile.am
deleted file mode 100644
index 877fbc770f..0000000000
--- a/testsuites/fstests/mrfs_fspatheval/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fspatheval
-mrfs_fspatheval_SOURCES  = ../fspatheval/test.c
-mrfs_fspatheval_SOURCES += ../support/ramdisk_support.c
-mrfs_fspatheval_SOURCES += ../support/fstest_support.c
-mrfs_fspatheval_SOURCES += ../support/fstest_support.h
-mrfs_fspatheval_SOURCES += ../support/ramdisk_support.h
-mrfs_fspatheval_SOURCES += ../support/fstest.h
-mrfs_fspatheval_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fspatheval_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fspatheval_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fspatheval.scn
-#dist_rtems_tests_DATA += mrfs_fspatheval.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fspatheval_OBJECTS)
-LINK_LIBS = $(mrfs_fspatheval_LDLIBS)
-
-mrfs_fspatheval$(EXEEXT): $(mrfs_fspatheval_OBJECTS) $(mrfs_fspatheval_DEPENDENCIES)
-	@rm -f mrfs_fspatheval$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fspermission/Makefile.am b/testsuites/fstests/mrfs_fspermission/Makefile.am
deleted file mode 100644
index aaee6865e0..0000000000
--- a/testsuites/fstests/mrfs_fspermission/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fspermission
-mrfs_fspermission_SOURCES  = ../fspermission/test.c
-mrfs_fspermission_SOURCES += ../support/ramdisk_support.c
-mrfs_fspermission_SOURCES += ../support/fstest_support.c
-mrfs_fspermission_SOURCES += ../support/fstest_support.h
-mrfs_fspermission_SOURCES += ../support/ramdisk_support.h
-mrfs_fspermission_SOURCES += ../support/fstest.h
-mrfs_fspermission_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fspermission_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fspermission_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fspermission.scn
-#dist_rtems_tests_DATA += mrfs_fspermission.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fspermission_OBJECTS)
-LINK_LIBS = $(mrfs_fspermission_LDLIBS)
-
-mrfs_fspermission$(EXEEXT): $(mrfs_fspermission_OBJECTS) $(mrfs_fspermission_DEPENDENCIES)
-	@rm -f mrfs_fspermission$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fsrdwr/Makefile.am b/testsuites/fstests/mrfs_fsrdwr/Makefile.am
deleted file mode 100644
index 19137702cb..0000000000
--- a/testsuites/fstests/mrfs_fsrdwr/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fsrdwr
-mrfs_fsrdwr_SOURCES  = ../fsrdwr/init.c
-mrfs_fsrdwr_SOURCES += ../support/ramdisk_support.c
-mrfs_fsrdwr_SOURCES += ../support/fstest_support.c
-mrfs_fsrdwr_SOURCES += ../support/fstest_support.h
-mrfs_fsrdwr_SOURCES += ../support/ramdisk_support.h
-mrfs_fsrdwr_SOURCES += ../support/fstest.h
-mrfs_fsrdwr_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fsrdwr_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fsrdwr_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fsrdwr.scn
-#dist_rtems_tests_DATA += mrfs_fsrdwr.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fsrdwr_OBJECTS)
-LINK_LIBS = $(mrfs_fsrdwr_LDLIBS)
-
-mrfs_fsrdwr$(EXEEXT): $(mrfs_fsrdwr_OBJECTS) $(mrfs_fsrdwr_DEPENDENCIES)
-	@rm -f mrfs_fsrdwr$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fsscandir01/Makefile.am b/testsuites/fstests/mrfs_fsscandir01/Makefile.am
deleted file mode 100644
index 6ef3a6b70e..0000000000
--- a/testsuites/fstests/mrfs_fsscandir01/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fsscandir01
-mrfs_fsscandir01_SOURCES  = ../fsscandir01/init.c
-mrfs_fsscandir01_SOURCES += ../support/ramdisk_support.c
-mrfs_fsscandir01_SOURCES += ../support/fstest_support.c
-mrfs_fsscandir01_SOURCES += ../support/fstest_support.h
-mrfs_fsscandir01_SOURCES += ../support/ramdisk_support.h
-mrfs_fsscandir01_SOURCES += ../support/fstest.h
-mrfs_fsscandir01_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fsscandir01_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fsscandir01_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fsscandir01.scn
-#dist_rtems_tests_DATA += mrfs_fsscandir01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fsscandir01_OBJECTS)
-LINK_LIBS = $(mrfs_fsscandir01_LDLIBS)
-
-mrfs_fsscandir01$(EXEEXT): $(mrfs_fsscandir01_OBJECTS) $(mrfs_fsscandir01_DEPENDENCIES)
-	@rm -f mrfs_fsscandir01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fssymlink/Makefile.am b/testsuites/fstests/mrfs_fssymlink/Makefile.am
deleted file mode 100644
index c3ede70991..0000000000
--- a/testsuites/fstests/mrfs_fssymlink/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fssymlink
-mrfs_fssymlink_SOURCES  = ../fssymlink/test.c
-mrfs_fssymlink_SOURCES += ../support/ramdisk_support.c
-mrfs_fssymlink_SOURCES += ../support/fstest_support.c
-mrfs_fssymlink_SOURCES += ../support/fstest_support.h
-mrfs_fssymlink_SOURCES += ../support/ramdisk_support.h
-mrfs_fssymlink_SOURCES += ../support/fstest.h
-mrfs_fssymlink_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fssymlink_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fssymlink_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fssymlink.scn
-#dist_rtems_tests_DATA += mrfs_fssymlink.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fssymlink_OBJECTS)
-LINK_LIBS = $(mrfs_fssymlink_LDLIBS)
-
-mrfs_fssymlink$(EXEEXT): $(mrfs_fssymlink_OBJECTS) $(mrfs_fssymlink_DEPENDENCIES)
-	@rm -f mrfs_fssymlink$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/mrfs_fssymlink/mrfs_fssymlink.scn b/testsuites/fstests/mrfs_fssymlink/mrfs_fssymlink.scn
deleted file mode 100644
index bdcbeefb59..0000000000
--- a/testsuites/fstests/mrfs_fssymlink/mrfs_fssymlink.scn
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-*** FILE SYSTEM TEST ( MOUNTED RFS ) ***
-Initializing filesystem MOUNTED RFS
-
-
-*** SYMLINK TEST ***
-Create a file named file
-Create a symlink named symlink to file
-call readlink
-file
-Unlink the file
-call readlink
-Create a dir named file
-Create a symlink named symlink to file
-call readlink
-rmdir the dir
-symlink loop erro test
-Testing creat      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing open       with arguments: "path,O_CREAT|O_WRONLY,mode" EXPECT "ELOOP"
-PASS
-Testing truncate   with arguments: "path,0"             EXPECT "ELOOP"
-PASS
-Testing rename     with arguments: "path,file04"        EXPECT "ELOOP"
-FAIL   ../../../../../../../rtems/c/src/../../testsuites/fstests/mrfs_fssymlink/../fssymlink/test.c: 151
-Testing unlink     with arguments: "path"               EXPECT "ELOOP"
-PASS
-Testing mkdir      with arguments: "path,mode"          EXPECT "ELOOP"
-PASS
-Testing rmdir      with arguments: "path"               EXPECT "ELOOP"
-PASS
-*** END OF SYMLINK TEST ***
-
-
-Shutting down filesystem MOUNTED RFS
-*** END OF FILE SYSTEM TEST ( MOUNTED RFS ) ***
diff --git a/testsuites/fstests/mrfs_fstime/Makefile.am b/testsuites/fstests/mrfs_fstime/Makefile.am
deleted file mode 100644
index f069418ddb..0000000000
--- a/testsuites/fstests/mrfs_fstime/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-rtems_tests_PROGRAMS = mrfs_fstime
-mrfs_fstime_SOURCES  = ../fstime/test.c
-mrfs_fstime_SOURCES += ../support/ramdisk_support.c
-mrfs_fstime_SOURCES += ../support/fstest_support.c
-mrfs_fstime_SOURCES += ../support/fstest_support.h
-mrfs_fstime_SOURCES += ../support/ramdisk_support.h
-mrfs_fstime_SOURCES += ../support/fstest.h
-mrfs_fstime_SOURCES += ../../psxtests/include/pmacros.h
-mrfs_fstime_SOURCES += ../mrfs_support/fs_support.c
-mrfs_fstime_SOURCES += ../mrfs_support/fs_config.h
-
-dist_rtems_tests_DATA = mrfs_fstime.scn
-#dist_rtems_tests_DATA += mrfs_fstime.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/support
-AM_CPPFLAGS += -I$(top_srcdir)/mrfs_support
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(mrfs_fstime_OBJECTS)
-LINK_LIBS = $(mrfs_fstime_LDLIBS)
-
-mrfs_fstime$(EXEEXT): $(mrfs_fstime_OBJECTS) $(mrfs_fstime_DEPENDENCIES)
-	@rm -f mrfs_fstime$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/support/fstest.h b/testsuites/fstests/support/fstest.h
index 2cea2108b4..d9f53c9f4a 100644
--- a/testsuites/fstests/support/fstest.h
+++ b/testsuites/fstests/support/fstest.h
@@ -48,7 +48,5 @@
      FS_FAIL();\
    } while (0)
 
-void test(void);
-
 #define BASE_FOR_TEST "/mnt"
 #endif
-- 
2.15.1

