From 802d3ba712222f3900b7276e02d73e5d393aa559 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 20 Mar 2014 09:09:05 +0100 Subject: tests/fstests: Remove duplicate begin/end messages Fix file system names. Remove superfluous defines. --- testsuites/fstests/fserror/test.c | 2 -- testsuites/fstests/fsfpathconf/test.c | 2 -- testsuites/fstests/fslink/test.c | 2 -- testsuites/fstests/fspatheval/test.c | 2 -- testsuites/fstests/fspermission/test.c | 2 -- testsuites/fstests/fsstatvfs/test.c | 2 -- testsuites/fstests/fssymlink/test.c | 2 -- testsuites/fstests/fstime/test.c | 2 -- testsuites/fstests/imfs_support/fs_config.h | 4 +--- testsuites/fstests/mdosfs_support/fs_config.h | 8 +++----- testsuites/fstests/mimfs_support/fs_config.h | 2 -- testsuites/fstests/mrfs_support/fs_config.h | 8 +++----- 12 files changed, 7 insertions(+), 31 deletions(-) diff --git a/testsuites/fstests/fserror/test.c b/testsuites/fstests/fserror/test.c index a037888f43..2a065744cc 100644 --- a/testsuites/fstests/fserror/test.c +++ b/testsuites/fstests/fserror/test.c @@ -389,11 +389,9 @@ static void rdwr_error (void) void test (void) { - puts ("\n\n*** ERROR TEST ***"); open_mkdir_error (); rename_error (); truncate_error (); rmdir_unlink_error (); rdwr_error (); - puts ("*** END OF ERROR TEST ***"); } diff --git a/testsuites/fstests/fsfpathconf/test.c b/testsuites/fstests/fsfpathconf/test.c index c5e25fb2c6..9ca1eabd04 100644 --- a/testsuites/fstests/fsfpathconf/test.c +++ b/testsuites/fstests/fsfpathconf/test.c @@ -87,9 +87,7 @@ static void fpathconf_test(void){ void test(void){ - puts("\n\n*** FPATHCONF TEST ***" ); fpathconf_test(); - puts( "\n*** END OF FPATHCONF TEST ***" ); } /* end of file */ diff --git a/testsuites/fstests/fslink/test.c b/testsuites/fstests/fslink/test.c index 2762758620..e3897083a4 100644 --- a/testsuites/fstests/fslink/test.c +++ b/testsuites/fstests/fslink/test.c @@ -158,7 +158,5 @@ static void link_test01 (void) void test (void) { - puts ("\n\n*** LINK TEST ***"); link_test01 (); - puts ("*** END OF LINK TEST ***"); } diff --git a/testsuites/fstests/fspatheval/test.c b/testsuites/fstests/fspatheval/test.c index 6a460578fa..e1d6f81010 100644 --- a/testsuites/fstests/fspatheval/test.c +++ b/testsuites/fstests/fspatheval/test.c @@ -187,8 +187,6 @@ static void path_eval_test02(void ) void test (void ) { - puts( "\n\n*** PATH EVALUATION TEST ***" ); path_eval_test01(); path_eval_test02(); - puts( "*** END OF PATH EVALUATION TEST ***" ); } diff --git a/testsuites/fstests/fspermission/test.c b/testsuites/fstests/fspermission/test.c index cf100d744a..6f450c984f 100644 --- a/testsuites/fstests/fspermission/test.c +++ b/testsuites/fstests/fspermission/test.c @@ -479,10 +479,8 @@ static void root_test(void ) void test(void ) { - puts( "\n\n*** PERMISSION TEST ***" ); umask_test01(); test_premission01(); test_premission02(); root_test(); - puts( "*** END OF PERMISSION TEST ***" ); } diff --git a/testsuites/fstests/fsstatvfs/test.c b/testsuites/fstests/fsstatvfs/test.c index afa6fc9083..0f87f0e90f 100644 --- a/testsuites/fstests/fsstatvfs/test.c +++ b/testsuites/fstests/fsstatvfs/test.c @@ -85,7 +85,5 @@ static void statvfs_test01(void) */ void test(void) { - puts( "\n\n*** STATVFS TEST ***"); statvfs_test01(); - puts( "*** END OF TEST STATVFS ***"); } diff --git a/testsuites/fstests/fssymlink/test.c b/testsuites/fstests/fssymlink/test.c index f7ad705497..fade42c44d 100644 --- a/testsuites/fstests/fssymlink/test.c +++ b/testsuites/fstests/fssymlink/test.c @@ -160,10 +160,8 @@ static void symlink_loop_error_test(void ) void test(void ) { - puts( "\n\n*** SYMLINK TEST ***" ); symlink_test01(); symlink_loop_error_test(); - puts( "*** END OF SYMLINK TEST ***" ); } diff --git a/testsuites/fstests/fstime/test.c b/testsuites/fstests/fstime/test.c index f4574ed418..fec560642e 100644 --- a/testsuites/fstests/fstime/test.c +++ b/testsuites/fstests/fstime/test.c @@ -327,9 +327,7 @@ int main(int argc, char **argv) #endif { - puts( "\n\n*** TIME TEST ***" ); time_test01(); - puts( "*** END OF TIME TEST ***" ); #ifndef __rtems__ return 0; diff --git a/testsuites/fstests/imfs_support/fs_config.h b/testsuites/fstests/imfs_support/fs_config.h index 787fcbe64a..609f2fae47 100644 --- a/testsuites/fstests/imfs_support/fs_config.h +++ b/testsuites/fstests/imfs_support/fs_config.h @@ -9,8 +9,6 @@ #ifndef __IMFS_SUPPORT_h #define __IMFS_SUPPORT_h -#define IMFS_TEST - -#define FILESYSTEM "IMFS" +#define FILESYSTEM "ROOT IMFS" #endif diff --git a/testsuites/fstests/mdosfs_support/fs_config.h b/testsuites/fstests/mdosfs_support/fs_config.h index 6e484ed826..79056c3b58 100644 --- a/testsuites/fstests/mdosfs_support/fs_config.h +++ b/testsuites/fstests/mdosfs_support/fs_config.h @@ -7,11 +7,9 @@ * http://www.rtems.com/license/LICENSE. */ -#ifndef __MIMFS_SUPPORT_h -#define __MIMFS_SUPPORT_h +#ifndef __DOSFS_SUPPORT_h +#define __DOSFS_SUPPORT_h -#define MDOSFS_TEST - -#define FILESYSTEM "MOUNTED DOSFS" +#define FILESYSTEM "DOSFS" #endif diff --git a/testsuites/fstests/mimfs_support/fs_config.h b/testsuites/fstests/mimfs_support/fs_config.h index 2b444a239f..ff606ff98d 100644 --- a/testsuites/fstests/mimfs_support/fs_config.h +++ b/testsuites/fstests/mimfs_support/fs_config.h @@ -10,8 +10,6 @@ #ifndef __MIMFS_SUPPORT_h #define __MIMFS_SUPPORT_h -#define MIMFS_TEST - #define FILESYSTEM "MOUNTED IMFS" #endif diff --git a/testsuites/fstests/mrfs_support/fs_config.h b/testsuites/fstests/mrfs_support/fs_config.h index 1bbc575b60..dddc5f89fd 100644 --- a/testsuites/fstests/mrfs_support/fs_config.h +++ b/testsuites/fstests/mrfs_support/fs_config.h @@ -7,11 +7,9 @@ * http://www.rtems.com/license/LICENSE. */ -#ifndef __MIMFS_SUPPORT_h -#define __MIMFS_SUPPORT_h +#ifndef __RFS_SUPPORT_h +#define __RFS_SUPPORT_h -#define MRFS_TEST - -#define FILESYSTEM "MOUNTED RFS" +#define FILESYSTEM "RFS" #endif -- cgit v1.2.3