tests/fstests: Use <rtems/test.h>

25 files changed, 99 insertions, 31 deletions

diff --git a/testsuites/fstests/fsbdpart01/init.c b/testsuites/fstests/fsbdpart01/init.c
index b94afdce46..89b3fa325a 100644
--- a/testsuites/fstests/fsbdpart01/init.c
+++ b/testsuites/fstests/fsbdpart01/init.c
@@ -27,6 +27,8 @@
 #include <rtems/ramdisk.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "FSBDPART 1";
+
 #define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
 
 #define PARTITION_COUNT 9
@@ -206,13 +208,12 @@ static void test_ide_part_table(void)
 
 static void Init(rtems_task_argument arg)
 {
-  printf("\n\n*** TEST FSBDPART 1 ***\n");
+  TEST_BEGIN();
 
   test_bdpart();
   test_ide_part_table();
 
-  printf("*** END OF TEST FSBDPART 1 ***\n");
-
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -235,6 +236,8 @@ size_t rtems_ramdisk_configuration_size = 1;
 
 #define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/fsdosfsformat01/init.c b/testsuites/fstests/fsdosfsformat01/init.c
index 03b2071810..9ef22b0ead 100644
--- a/testsuites/fstests/fsdosfsformat01/init.c
+++ b/testsuites/fstests/fsdosfsformat01/init.c
@@ -28,6 +28,8 @@
 
 #include <bsp.h>
 
+const char rtems_test_name[] = "FSDOSFSFORMAT 1";
+
 #define MAX_PATH_LENGTH 100 /* Maximum number of characters per path */
 #define SECTOR_SIZE 512 /* sector size (bytes) */
 #define FAT12_MAX_CLN 4085 /* maximum + 1 number of clusters for FAT12 */
@@ -471,12 +473,11 @@ static void test( void )
 
 static void Init( rtems_task_argument arg )
 {
-  puts( "\n\n*** TEST FSDOSFSFORMAT 1 ***" );
+  TEST_BEGIN();
 
   test();
 
-  puts( "*** END OF TEST FSDOSFSFORMAT 1 ***" );
-
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -496,6 +497,8 @@ static void Init( rtems_task_argument arg )
 
 #define CONFIGURE_INIT_TASK_STACK_SIZE ( 32 * 1024 )
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_BDBUF_BUFFER_MAX_SIZE ( 32 * 1024 )
diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c
index 72de7d94e9..1de672f4d2 100644
--- a/testsuites/fstests/fsdosfsname01/init.c
+++ b/testsuites/fstests/fsdosfsname01/init.c
@@ -36,6 +36,8 @@
 
 #include <errno.h>
 
+const char rtems_test_name[] = "FSDOSFSNAME 1";
+
 #define PRINT_DISK_IMAGE 0
 
 #define MOUNT_DIR "/mnt"
@@ -1287,12 +1289,11 @@ static void test( void )
 
 static void Init( rtems_task_argument arg )
 {
-  puts( "\n\n*** TEST fsdosfsname01 ***" );
+  TEST_BEGIN();
 
   test();
 
-  puts( "*** END OF TEST fsdosfsname01 ***" );
-
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -1323,6 +1324,8 @@ size_t rtems_ramdisk_configuration_size = RTEMS_ARRAY_SIZE(rtems_ramdisk_configu
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c
index fc38e2cfd9..77559788ca 100644
--- a/testsuites/fstests/fsdosfssync01/init.c
+++ b/testsuites/fstests/fsdosfssync01/init.c
@@ -30,6 +30,8 @@
 #include <rtems/dosfs.h>
 #include <rtems/ramdisk.h>
 
+const char rtems_test_name[] = "FSDOSFSSYNC 1";
+
 static void create_file(const char *file)
 {
   int fd;
@@ -139,12 +141,11 @@ static void test(const char *rda, const char *mnt, const char *file)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST FSDOSFSSYNC 1 ***");
+  TEST_BEGIN();
 
   test("/dev/rda", "/mnt", "/mnt/file");
 
-  puts("*** END OF TEST FSDOSFSSYNC 1 ***");
-
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -169,6 +170,8 @@ size_t rtems_ramdisk_configuration_size = 1;
 
 #define CONFIGURE_EXTRA_TASK_STACKS (8 * 1024)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/fsdosfswrite01/init.c b/testsuites/fstests/fsdosfswrite01/init.c
index 1b231497ec..3925882162 100644
--- a/testsuites/fstests/fsdosfswrite01/init.c
+++ b/testsuites/fstests/fsdosfswrite01/init.c
@@ -23,6 +23,8 @@
 #include <rtems/blkdev.h>
 #include <bsp.h>
 
+const char rtems_test_name[] = "FSDOSFSWRITE 1";
+
 #define MAX_PATH_LENGTH 100 /* Maximum number of characters per path */
 #define SECTOR_SIZE 512 /* sector size (bytes) */
 #define FAT16_MAX_CLN 65525 /* maximum + 1 number of clusters for FAT16 */
@@ -262,12 +264,11 @@ static void test( void )
 
 static void Init( rtems_task_argument arg )
 {
-  puts( "\n\n*** TEST FSDOSFSWRITE 1 ***" );
+  TEST_BEGIN();
 
   test();
 
-  puts( "*** END OF TEST FSDOSFSWRITE 1 ***" );
-
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -287,10 +288,12 @@ static void Init( rtems_task_argument arg )
 
 #define CONFIGURE_INIT_TASK_STACK_SIZE ( 32 * 1024 )
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_BDBUF_BUFFER_MAX_SIZE ( 32 * 1024 )
 
 #define CONFIGURE_INIT
 
-#include <rtems/confdefs.h>
\ No newline at end of file
+#include <rtems/confdefs.h>
diff --git a/testsuites/fstests/fserror/test.c b/testsuites/fstests/fserror/test.c
index 7f2d8b9a84..a037888f43 100644
--- a/testsuites/fstests/fserror/test.c
+++ b/testsuites/fstests/fserror/test.c
@@ -22,8 +22,11 @@
 #include <unistd.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "FSERROR " FILESYSTEM;
+
 static void open_mkdir_error (void)
 {
   int fd;
diff --git a/testsuites/fstests/fsfpathconf/test.c b/testsuites/fstests/fsfpathconf/test.c
index 73d66d4a84..c5e25fb2c6 100644
--- a/testsuites/fstests/fsfpathconf/test.c
+++ b/testsuites/fstests/fsfpathconf/test.c
@@ -25,8 +25,11 @@
 #include <rtems/libcsupport.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "tmacros.h"
 
+const char rtems_test_name[] = "FSFPATHCONF " FILESYSTEM;
+
 static void fpathconf_test(void){
 
   int rv = 0;
diff --git a/testsuites/fstests/fsfseeko01/init.c b/testsuites/fstests/fsfseeko01/init.c
index 2c3d7985d6..babc730fd8 100644
--- a/testsuites/fstests/fsfseeko01/init.c
+++ b/testsuites/fstests/fsfseeko01/init.c
@@ -24,6 +24,8 @@
 #include <inttypes.h>
 #include <limits.h>
 
+const char rtems_test_name[] = "FSFSEEKO 1";
+
 static void test(void)
 {
   FILE *file;
@@ -78,12 +80,11 @@ static void test(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST FSFSEEKO 1 ***");
+  TEST_BEGIN();
 
   test();
 
-  puts("*** END OF TEST FSFSEEKO 1 ***");
-
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -96,6 +97,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/fsimfsgeneric01/init.c b/testsuites/fstests/fsimfsgeneric01/init.c
index 2eab2e427e..0e617100b3 100644
--- a/testsuites/fstests/fsimfsgeneric01/init.c
+++ b/testsuites/fstests/fsimfsgeneric01/init.c
@@ -29,6 +29,8 @@
 #include <rtems/malloc.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "FSIMFSGENERIC 1";
+
 typedef enum {
   TEST_NEW,
   TEST_INITIALIZED,
@@ -474,13 +476,12 @@ static void test_imfs_make_generic_node_errors(void)
 
 static void Init(rtems_task_argument arg)
 {
-  printf("\n\n*** TEST FSIMFSGENERIC 1 ***\n");
+  TEST_BEGIN();
 
   test_imfs_make_generic_node();
   test_imfs_make_generic_node_errors();
 
-  printf("*** END OF TEST FSIMFSGENERIC 1 ***\n");
-
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -493,6 +494,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/fslink/test.c b/testsuites/fstests/fslink/test.c
index 1e58162860..2762758620 100644
--- a/testsuites/fstests/fslink/test.c
+++ b/testsuites/fstests/fslink/test.c
@@ -23,8 +23,11 @@
 #include <math.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "FSLINK " FILESYSTEM;
+
 /*
  * Test if the successful call works as expect
  */
diff --git a/testsuites/fstests/fsnofs01/init.c b/testsuites/fstests/fsnofs01/init.c
index 9d7f98b053..8e5d39849a 100644
--- a/testsuites/fstests/fsnofs01/init.c
+++ b/testsuites/fstests/fsnofs01/init.c
@@ -28,6 +28,8 @@
 
 #include <rtems/libio_.h>
 
+const char rtems_test_name[] = "FSNOFS 1";
+
 static int node_count(const rtems_chain_control *chain)
 {
   int count = 0;
@@ -333,7 +335,7 @@ static void test_user_env(void)
 
 static void Init(rtems_task_argument arg)
 {
-  printk("\n\n*** TEST FSNOFS 1 ***\n");
+  rtems_test_begink();
 
   rtems_libio_init();
 
@@ -345,8 +347,7 @@ static void Init(rtems_task_argument arg)
   test_path_ops();
   test_user_env();
 
-  printk("*** END OF TEST FSNOFS 1 ***\n");
-
+  rtems_test_endk();
   exit(0);
 }
 
@@ -356,6 +357,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/fspatheval/test.c b/testsuites/fstests/fspatheval/test.c
index ad69b7e14b..6a460578fa 100644
--- a/testsuites/fstests/fspatheval/test.c
+++ b/testsuites/fstests/fspatheval/test.c
@@ -21,10 +21,13 @@
 #include <unistd.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
 
 #define BUF_SIZE 100
 
+const char rtems_test_name[] = "FSPATHEVAL " FILESYSTEM;
+
 static void make_multiple_files (char **files,int is_directory)
 {
   int i;
diff --git a/testsuites/fstests/fspermission/test.c b/testsuites/fstests/fspermission/test.c
index 60e0c79438..cf100d744a 100644
--- a/testsuites/fstests/fspermission/test.c
+++ b/testsuites/fstests/fspermission/test.c
@@ -22,8 +22,11 @@
 #include <unistd.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "FSPERMISSION " FILESYSTEM;
+
 /*
  *  Test the umask
  */
diff --git a/testsuites/fstests/fsrdwr/init.c b/testsuites/fstests/fsrdwr/init.c
index e8576b4b7a..3ca0c67d12 100644
--- a/testsuites/fstests/fsrdwr/init.c
+++ b/testsuites/fstests/fsrdwr/init.c
@@ -23,8 +23,11 @@
 #include <errno.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "FSRDWR " FILESYSTEM;
+
 static const mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO;
 
 static const char databuf [] =
diff --git a/testsuites/fstests/fsrfsbitmap01/test.c b/testsuites/fstests/fsrfsbitmap01/test.c
index df6e47882d..90b8ba86dd 100644
--- a/testsuites/fstests/fsrfsbitmap01/test.c
+++ b/testsuites/fstests/fsrfsbitmap01/test.c
@@ -25,9 +25,12 @@
 #include <rtems/rfs/rtems-rfs-file-system.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "tmacros.h"
 #include <rtems/malloc.h>
 
+const char rtems_test_name[] = "FSRFSBITMAP 1";
+
 #define rtems_rfs_exit_on_error(_rc, _r, _c, _b)                         \
   if ((_rc > 0) || _r) { free (_b); rtems_rfs_bitmap_close (_c); return; }
 
diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c
index 9bea11503d..fd8dd69ae5 100644
--- a/testsuites/fstests/fsrofs01/init.c
+++ b/testsuites/fstests/fsrofs01/init.c
@@ -28,6 +28,8 @@
 #include <rtems/rtems-rfs-format.h>
 #include <rtems/ramdisk.h>
 
+const char rtems_test_name[] = "FSROFS 1";
+
 static const rtems_rfs_format_config rfs_config;
 
 static const char rda [] = "/dev/rda";
@@ -151,13 +153,12 @@ static void test_rofs(void)
 
 static void Init(rtems_task_argument arg)
 {
-  printf("\n\n*** TEST FSROFS 1 ***\n");
+  TEST_BEGIN():
 
   test_create_file_system();
   test_rofs();
 
-  printf("*** END OF TEST FSROFS 1 ***\n");
-
+  TEST_END():
   rtems_test_exit(0);
 }
 
@@ -181,6 +182,8 @@ size_t rtems_ramdisk_configuration_size = 1;
 
 #define CONFIGURE_EXTRA_TASK_STACKS (8 * 1024)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/fsstatvfs/test.c b/testsuites/fstests/fsstatvfs/test.c
index ddf7b29720..afa6fc9083 100644
--- a/testsuites/fstests/fsstatvfs/test.c
+++ b/testsuites/fstests/fsstatvfs/test.c
@@ -15,8 +15,11 @@
 #include <fcntl.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "FSSTATVFS " FILESYSTEM;
+
 static void statvfs_validate(struct statvfs *stat)
 {
   rtems_test_assert(stat->f_bsize > 0);
diff --git a/testsuites/fstests/fssymlink/test.c b/testsuites/fstests/fssymlink/test.c
index f8f7d4493b..f7ad705497 100644
--- a/testsuites/fstests/fssymlink/test.c
+++ b/testsuites/fstests/fssymlink/test.c
@@ -23,8 +23,11 @@
 #include <dirent.h>
 
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "FSSYMLINK " FILESYSTEM;
+
 /*
  * Test the function of symlink
  */
diff --git a/testsuites/fstests/fstime/test.c b/testsuites/fstests/fstime/test.c
index cb672d8ec5..f4574ed418 100644
--- a/testsuites/fstests/fstime/test.c
+++ b/testsuites/fstests/fstime/test.c
@@ -24,7 +24,10 @@
 
 #ifdef __rtems__
 #include "fstest.h"
+#include "fs_config.h"
 #include "pmacros.h"
+
+const char rtems_test_name[] = "FSTIME " FILESYSTEM;
 #else
 #include <assert.h>
 #define rtems_test_assert(x) assert(x)
diff --git a/testsuites/fstests/imfs_support/fs_support.c b/testsuites/fstests/imfs_support/fs_support.c
index f623d9b873..40b7bb1478 100644
--- a/testsuites/fstests/imfs_support/fs_support.c
+++ b/testsuites/fstests/imfs_support/fs_support.c
@@ -33,6 +33,8 @@ test_shutdown_filesystem (void)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_TASKS                  10
diff --git a/testsuites/fstests/jffs2_support/fs_support.c b/testsuites/fstests/jffs2_support/fs_support.c
index 3148d0dcc8..9be4a038de 100644
--- a/testsuites/fstests/jffs2_support/fs_support.c
+++ b/testsuites/fstests/jffs2_support/fs_support.c
@@ -154,6 +154,9 @@ void test_shutdown_filesystem(void)
 #define CONFIGURE_MAXIMUM_TASKS 1
 
 #define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)
+
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c
index 03c377e03e..e864ed080e 100644
--- a/testsuites/fstests/mdosfs_support/fs_support.c
+++ b/testsuites/fstests/mdosfs_support/fs_support.c
@@ -80,6 +80,9 @@ void test_shutdown_filesystem(void)
 /**
  * Configure base RTEMS resources.
  */
+
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_SEMAPHORES RTEMS_DOSFS_SEMAPHORES_PER_INSTANCE
diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c
index 2ac1e6c04d..ec20f64445 100644
--- a/testsuites/fstests/mimfs_support/fs_support.c
+++ b/testsuites/fstests/mimfs_support/fs_support.c
@@ -47,8 +47,8 @@ test_shutdown_filesystem (void)
 /**
  * Configure base RTEMS resources.
  */
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c
index 1e960063f5..90575b85b0 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -61,6 +61,8 @@ test_shutdown_filesystem (void)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_TASKS                     10
diff --git a/testsuites/fstests/support/fstest_support.c b/testsuites/fstests/support/fstest_support.c
index 56526a949b..fdc3af0f41 100644
--- a/testsuites/fstests/support/fstest_support.c
+++ b/testsuites/fstests/support/fstest_support.c
@@ -56,7 +56,8 @@ rtems_task Init(
     rtems_task_argument ignored)
 {
   int rc=0;
-  puts( "\n\n*** FILE SYSTEM TEST ( " FILESYSTEM " ) ***" );
+
+  TEST_BEGIN();
 
   puts( "Initializing filesystem " FILESYSTEM );
   test_initialize_filesystem();
@@ -71,6 +72,6 @@ rtems_task Init(
   puts( "\n\nShutting down filesystem " FILESYSTEM );
   test_shutdown_filesystem();
 
-  puts( "*** END OF FILE SYSTEM TEST ( " FILESYSTEM " ) ***" );
+  TEST_END();
   rtems_test_exit(0);
 }