2011-08-01 Xiang Cui <medivhc@gmail.com>

	* Makefile.am, configure.ac, fslink/fslink.doc, fslink/test.c,
	fssymlink/test.c, imfs_fslink/Makefile.am,
	imfs_fssymlink/Makefile.am, imfs_support/fs_config.h,
	imfs_support/fs_support.c, mdosfs_support/fs_config.h,
	mdosfs_support/fs_support.c, mimfs_fslink/Makefile.am,
	mimfs_fssymlink/Makefile.am, mimfs_support/fs_config.h,
	mimfs_support/fs_support.c, mrfs_fslink/Makefile.am,
	mrfs_fssymlink/Makefile.am, mrfs_support/fs_config.h,
	mrfs_support/fs_support.c, support/fstest.h,
	support/fstest_support.c, support/fstest_support.h,
	support/ramdisk_support.c, support/ramdisk_support.h: Submit correct
	tarball of current work.
	* fs01/init.c, fsfchx/fsfchx.doc, fsfchx/init.c, fsfile01/fsfile01.doc,
	fsfile01/test.c, fsfile01/test_cat.c, fsfile01/test_extend.c,
	fsfile01/test_write.c, fsfile02/fsfile02.doc, fsfile02/init.c,
	fsfstest/fs-test.c, fsfstest/fsfstest.doc, fsimfs01/fsimfs01.doc,
	fsimfs01/init.c, fsimfs02/fsimfs02.doc, fsimfs02/init.c,
	fsmkdir/fsmkdir.doc, fsmkdir/test.c, fsopen/fsopen.doc,
	fsopen/test.c, fsrdwrv/fsrdwrv.doc, fsrdwrv/test.c,
	fsreaddir/fsreaddir.doc, fsreaddir/test.c, fsrename/fsrename.doc,
	fsrename/test.c, fsrmdir/test.c, fsrwfile/fsrwfile.doc,
	fsrwfile/init.c, fsstat/fsstat.doc, fsstat/test.c,
	fstruncate/fstruncate.doc, fstruncate/test.c, imfs_fs01/.cvsignore,
	imfs_fs01/Makefile.am, imfs_fs01/imfs_fs01.scn,
	imfs_fsfchx/.cvsignore, imfs_fsfchx/Makefile.am,
	imfs_fsfile01/.cvsignore, imfs_fsfile01/Makefile.am,
	imfs_fsfile02/.cvsignore, imfs_fsfile02/Makefile.am,
	imfs_fsfstest/.cvsignore, imfs_fsfstest/Makefile.am,
	imfs_fsimfs01/.cvsignore, imfs_fsimfs01/Makefile.am,
	imfs_fsimfs02/.cvsignore, imfs_fsimfs02/Makefile.am,
	imfs_fslink/.cvsignore, imfs_fsmkdir/.cvsignore,
	imfs_fsmkdir/Makefile.am, imfs_fsopen/.cvsignore,
	imfs_fsopen/Makefile.am, imfs_fsrdwrv/.cvsignore,
	imfs_fsrdwrv/Makefile.am, imfs_fsreaddir/.cvsignore,
	imfs_fsreaddir/Makefile.am, imfs_fsrename/.cvsignore,
	imfs_fsrename/Makefile.am, imfs_fsrmdir/.cvsignore,
	imfs_fsrmdir/Makefile.am, imfs_fsrwfile/.cvsignore,
	imfs_fsrwfile/Makefile.am, imfs_fsstat/.cvsignore,
	imfs_fsstat/Makefile.am, imfs_fssymlink/.cvsignore,
	imfs_fstruncate/.cvsignore, imfs_fstruncate/Makefile.am,
	mdosfs_fsfchx/.cvsignore, mdosfs_fsfchx/Makefile.am,
	mdosfs_fsfile01/.cvsignore, mdosfs_fsfile01/Makefile.am,
	mdosfs_fsfile02/.cvsignore, mdosfs_fsfile02/Makefile.am,
	mdosfs_fsfstest/.cvsignore, mdosfs_fsfstest/Makefile.am,
	mdosfs_fsimfs01/.cvsignore, mdosfs_fsimfs01/Makefile.am,
	mdosfs_fsimfs02/.cvsignore, mdosfs_fsimfs02/Makefile.am,
	mdosfs_fslink/.cvsignore, mdosfs_fslink/Makefile.am,
	mdosfs_fsmkdir/.cvsignore, mdosfs_fsmkdir/Makefile.am,
	mdosfs_fsopen/.cvsignore, mdosfs_fsopen/Makefile.am,
	mdosfs_fsrdwrv/.cvsignore, mdosfs_fsrdwrv/Makefile.am,
	mdosfs_fsreaddir/.cvsignore, mdosfs_fsreaddir/Makefile.am,
	mdosfs_fsrename/.cvsignore, mdosfs_fsrename/Makefile.am,
	mdosfs_fsrmdir/.cvsignore, mdosfs_fsrmdir/Makefile.am,
	mdosfs_fsrwfile/.cvsignore, mdosfs_fsrwfile/Makefile.am,
	mdosfs_fsstat/.cvsignore, mdosfs_fsstat/Makefile.am,
	mdosfs_fssymlink/.cvsignore, mdosfs_fssymlink/Makefile.am,
	mdosfs_fstruncate/.cvsignore, mdosfs_fstruncate/Makefile.am,
	mimfs_fs01/.cvsignore, mimfs_fs01/Makefile.am,
	mimfs_fs01/mimfs_fs01.scn, mimfs_fsfchx/.cvsignore,
	mimfs_fsfchx/Makefile.am, mimfs_fsfile01/.cvsignore,
	mimfs_fsfile01/Makefile.am, mimfs_fsfile02/.cvsignore,
	mimfs_fsfile02/Makefile.am, mimfs_fsfstest/.cvsignore,
	mimfs_fsfstest/Makefile.am, mimfs_fsimfs01/.cvsignore,
	mimfs_fsimfs01/Makefile.am, mimfs_fsimfs02/.cvsignore,
	mimfs_fsimfs02/Makefile.am, mimfs_fslink/.cvsignore,
	mimfs_fsmkdir/.cvsignore, mimfs_fsmkdir/Makefile.am,
	mimfs_fsopen/.cvsignore, mimfs_fsopen/Makefile.am,
	mimfs_fsrdwrv/.cvsignore, mimfs_fsrdwrv/Makefile.am,
	mimfs_fsreaddir/.cvsignore, mimfs_fsreaddir/Makefile.am,
	mimfs_fsrename/.cvsignore, mimfs_fsrename/Makefile.am,
	mimfs_fsrmdir/.cvsignore, mimfs_fsrmdir/Makefile.am,
	mimfs_fsrwfile/.cvsignore, mimfs_fsrwfile/Makefile.am,
	mimfs_fsstat/.cvsignore, mimfs_fsstat/Makefile.am,
	mimfs_fssymlink/.cvsignore, mimfs_fstruncate/.cvsignore,
	mimfs_fstruncate/Makefile.am, mrfs_fsfchx/.cvsignore,
	mrfs_fsfchx/Makefile.am, mrfs_fsfile01/.cvsignore,
	mrfs_fsfile01/Makefile.am, mrfs_fsfile02/.cvsignore,
	mrfs_fsfile02/Makefile.am, mrfs_fsfstest/.cvsignore,
	mrfs_fsfstest/Makefile.am, mrfs_fsimfs01/.cvsignore,
	mrfs_fsimfs01/Makefile.am, mrfs_fsimfs02/.cvsignore,
	mrfs_fsimfs02/Makefile.am, mrfs_fslink/.cvsignore,
	mrfs_fsmkdir/.cvsignore, mrfs_fsmkdir/Makefile.am,
	mrfs_fsopen/.cvsignore, mrfs_fsopen/Makefile.am,
	mrfs_fsrdwrv/.cvsignore, mrfs_fsrdwrv/Makefile.am,
	mrfs_fsreaddir/.cvsignore, mrfs_fsreaddir/Makefile.am,
	mrfs_fsrename/.cvsignore, mrfs_fsrename/Makefile.am,
	mrfs_fsrmdir/.cvsignore, mrfs_fsrmdir/Makefile.am,
	mrfs_fsrwfile/.cvsignore, mrfs_fsrwfile/Makefile.am,
	mrfs_fsstat/.cvsignore, mrfs_fsstat/Makefile.am,
	mrfs_fssymlink/.cvsignore, mrfs_fstruncate/.cvsignore,
	mrfs_fstruncate/Makefile.am: Removed.

2 files changed, 33 insertions, 50 deletions

diff --git a/testsuites/fstests/mrfs_support/fs_config.h b/testsuites/fstests/mrfs_support/fs_config.h
index 808440c356..ba8bbdaa85 100644
--- a/testsuites/fstests/mrfs_support/fs_config.h
+++ b/testsuites/fstests/mrfs_support/fs_config.h
@@ -8,14 +8,5 @@
 #define MRFS_TEST
 
 #define FILESYSTEM "MOUNTED RFS"
-#define BASE_FOR_TEST "/mnt/"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifdef __cplusplus
-};
-#endif
 
 #endif
diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c
index 7db033afd5..b4f6b6b108 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -1,5 +1,12 @@
 /*
- *  $Id$
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -7,79 +14,64 @@
 #endif
 #include "pmacros.h"
 
-#include "fs_config.h"
-
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <rtems/libio.h>
 #include <rtems/rtems-rfs-format.h>
+
 #include "ramdisk_support.h"
 
+#include "fstest.h"
+
 #define BLOCK_SIZE (512)
 
-rtems_rfs_format_config config=
-{
+rtems_rfs_format_config config = {
 block_size:BLOCK_SIZE
 };
 
 
-void test_initialize_filesystem(void)
+void
+test_initialize_filesystem (void)
 {
-  int rc=0;
-  rc=mkdir(BASE_FOR_TEST,0777);
-  rtems_test_assert(rc==0);
+  int rc = 0;
+  rc = mkdir (BASE_FOR_TEST,S_IRWXU|S_IRWXG|S_IRWXO);
+  rtems_test_assert (rc == 0);
 
-  init_ramdisk();
+  init_ramdisk ();
 
-  rc=rtems_rfs_format(RAMDISK_PATH,&config);
-  rtems_test_assert(rc==0);
+  rc = rtems_rfs_format (RAMDISK_PATH, &config);
+  rtems_test_assert (rc == 0);
 
-  rc=mount(RAMDISK_PATH,
-      BASE_FOR_TEST,
-      "rfs",
-      RTEMS_FILESYSTEM_READ_WRITE,
-      NULL);
-  rtems_test_assert(rc==0);
+  rc = mount (RAMDISK_PATH,
+              BASE_FOR_TEST, "rfs", RTEMS_FILESYSTEM_READ_WRITE, NULL);
+  rtems_test_assert (rc == 0);
 }
 
 
-void test_shutdown_filesystem(void)
+void
+test_shutdown_filesystem (void)
 {
-  int rc=0;
-  rc=unmount(BASE_FOR_TEST) ;
-  rtems_test_assert(rc==0);
-  del_ramdisk();
+  int rc = 0;
+  rc = unmount (BASE_FOR_TEST);
+  rtems_test_assert (rc == 0);
+  del_ramdisk ();
 }
 
 /* configuration information */
-
-/* drivers */
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-/**
- * Configure base RTEMS resources.
- */
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_MEMORY_OVERHEAD                  512
-#define CONFIGURE_MAXIMUM_TASKS                    rtems_resource_unlimited (10)
-#define CONFIGURE_MAXIMUM_SEMAPHORES               rtems_resource_unlimited (10)
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES           rtems_resource_unlimited (6)
-#define CONFIGURE_MAXIMUM_PARTITIONS               rtems_resource_unlimited (4)
-#define CONFIGURE_MAXIMUM_TIMERS                   10
-
 
-/**
- * Configure file system and libblock.
- */
+#define CONFIGURE_MAXIMUM_TASKS                     10
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS  100
-#define CONFIGURE_MAXIMUM_DRIVERS                  100
+#define CONFIGURE_MAXIMUM_DRIVERS                   10
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS    40
+
 #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
 
 #define CONFIGURE_FILESYSTEM_RFS
 
 #define CONFIGURE_INIT
 #include <rtems/confdefs.h>
-