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

9 files changed, 55 insertions, 19 deletions

diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c
index e425756f23..fcb586b5ea 100644
--- a/testsuites/libtests/termios/init.c
+++ b/testsuites/libtests/termios/init.c
@@ -36,6 +36,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "TERMIOS";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void print_32bits(unsigned long bits, unsigned char size, char * names[]);
@@ -683,7 +685,7 @@ out:
   if( tcsetattr( fileno( stdin ), TCSADRAIN, &old) < 0 )
     perror("do_raw_input(): tcsetattr() failed: %s\n" );
 
-  printf ("*** End of Raw input  VMIN=%d  VTIME=%d ***\n", vmin, vtime);
+  TEST_BEGIN();
 }
 
 
@@ -731,7 +733,7 @@ Init (rtems_task_argument ignored)
   char c ;
   struct termios orig_termios, test_termios;
 
-  puts( "\n\n*** TEST TERMIOS INPUT CAPABILITIES ***" );
+  TEST_BEGIN();
 
   status = rtems_shell_wait_for_input(
     STDIN_FILENO,
@@ -793,7 +795,7 @@ Init (rtems_task_argument ignored)
       }
     }
   } else {
-    puts( "*** END OF TEST TERMIOS INPUT CAPABILITIES ***" );
+    TEST_END();
 
     rtems_test_exit( 0 );
   }
@@ -805,6 +807,8 @@ Init (rtems_task_argument ignored)
 
 #define CONFIGURE_MAXIMUM_TASKS       1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000
diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c
index 153b596ba2..e717538212 100644
--- a/testsuites/libtests/termios01/init.c
+++ b/testsuites/libtests/termios01/init.c
@@ -18,6 +18,8 @@
 #include <limits.h>
 #include <sys/errno.h>
 
+const char rtems_test_name[] = "TERMIOS 1";
+
 /* rtems_termios_baud_t is a typedefs to int32_t */
 #define PRIdrtems_termios_baud_t PRId32
 
@@ -524,7 +526,7 @@ static rtems_task Init(
   struct termios            t;
   int index = 0;
 
-  puts( "\n\n*** TEST TERMIOS 01 ***" );
+  TEST_BEGIN();
 
   test_termios_baud2index();
   test_termios_baud2number();
@@ -666,7 +668,7 @@ static rtems_task Init(
   }
   puts( "" );
 
-  puts( "*** END OF TEST TERMIOS 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -685,6 +687,8 @@ static rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 
 #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/libtests/termios02/init.c b/testsuites/libtests/termios02/init.c
index e944bca9af..2ff960ec65 100644
--- a/testsuites/libtests/termios02/init.c
+++ b/testsuites/libtests/termios02/init.c
@@ -16,6 +16,8 @@
 #include <errno.h>
 #include <unistd.h>
 
+const char rtems_test_name[] = "TERMIOS 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -28,7 +30,7 @@ rtems_task Init(
   char *term_name_p;
   char term_name[32];
 
-  puts( "\n\n*** TERMIOS 02 TEST ***" );
+  TEST_BEGIN();
 
   puts( "tcdrain(12) - EBADF" );
   sc = tcdrain(12);
@@ -136,7 +138,7 @@ rtems_task Init(
   rtems_test_assert( term_name_p == term_name );
   printf( "ctermid ==> %s\n", term_name_p );
 
-  puts( "*** END OF TERMIOS 02 TEST ***" );
+  TEST_END();
   exit( 0 );
 }
 
@@ -148,6 +150,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS            1
 #define CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c
index bc33feb42e..441adff1d1 100644
--- a/testsuites/libtests/termios03/init.c
+++ b/testsuites/libtests/termios03/init.c
@@ -22,6 +22,8 @@
 #include <termios.h>
 #include <rtems/dumpbuf.h>
 
+const char rtems_test_name[] = "TERMIOS 3";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void write_helper(int fd, const char *c);
@@ -122,7 +124,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST TERMIOS03 ***" );
+  TEST_BEGIN();
 
   open_it();
 
@@ -147,7 +149,7 @@ rtems_task Init(
   puts( "" );
   close_it();
 
-  puts( "*** END OF TEST TERMIOS03 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -168,6 +170,8 @@ rtems_task Init(
 /* we need to be able to open the test device */
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 #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/libtests/termios04/init.c b/testsuites/libtests/termios04/init.c
index 1755f64233..6f3a9e5a5e 100644
--- a/testsuites/libtests/termios04/init.c
+++ b/testsuites/libtests/termios04/init.c
@@ -22,6 +22,8 @@
 #include <termios.h>
 #include <rtems/dumpbuf.h>
 
+const char rtems_test_name[] = "TERMIOS 4";
+
 /* forward declarations to avoid warnings */
 void write_helper(int fd, const char *c);
 void read_helper(int fd, const char *expected);
@@ -115,7 +117,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST TERMIOS04 ***" );
+  TEST_BEGIN();
 
   open_it();
 
@@ -127,7 +129,7 @@ rtems_task Init(
 
   close_it();
 
-  puts( "*** END OF TEST TERMIOS04 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -149,6 +151,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 #define CONFIGURE_MAXIMUM_TASKS             1
 #define CONFIGURE_MAXIMUM_TIMERS            2
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c
index 4dec03805f..e8d92a6af9 100644
--- a/testsuites/libtests/termios05/init.c
+++ b/testsuites/libtests/termios05/init.c
@@ -22,6 +22,8 @@
 #include <termios.h>
 #include <rtems/dumpbuf.h>
 
+const char rtems_test_name[] = "TERMIOS 5";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void write_helper(int fd, const char *c);
@@ -118,7 +120,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST TERMIOS05 ***" );
+  TEST_BEGIN();
 
   open_it();
 
@@ -137,7 +139,7 @@ rtems_task Init(
 
   close_it();
 
-  puts( "*** END OF TEST TERMIOS05 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -160,6 +162,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS             4
 #define CONFIGURE_MAXIMUM_TIMERS            2
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/libtests/termios06/init.c b/testsuites/libtests/termios06/init.c
index 204689e70b..794bf4517f 100644
--- a/testsuites/libtests/termios06/init.c
+++ b/testsuites/libtests/termios06/init.c
@@ -23,6 +23,8 @@
 #include <rtems/dumpbuf.h>
 #include <rtems/termiostypes.h>
 
+const char rtems_test_name[] = "TERMIOS 6";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void open_it(void);
@@ -186,7 +188,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST TERMIOS06 ***" );
+  TEST_BEGIN();
 
   pppasyncattach();
   open_it();
@@ -197,7 +199,7 @@ rtems_task Init(
   read_it();
   close_it();
   
-  puts( "*** END OF TEST TERMIOS06 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -215,6 +217,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 
 #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/libtests/termios07/init.c b/testsuites/libtests/termios07/init.c
index 5514ee98c9..49b0bd2524 100644
--- a/testsuites/libtests/termios07/init.c
+++ b/testsuites/libtests/termios07/init.c
@@ -23,6 +23,8 @@
 #include <rtems/dumpbuf.h>
 #include <rtems/libio.h>
 
+const char rtems_test_name[] = "TERMIOS 7";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void write_helper(int fd, const char *c);
@@ -128,7 +130,7 @@ rtems_task Init(
 {
   rtems_status_code sc;
 
-  puts( "\n\n*** TEST TERMIOS07 ***" );
+  TEST_BEGIN();
 
   puts( "rtems_termios_bufsize( 64, 64, 64 ) - OK" );
   sc = rtems_termios_bufsize ( 64, 64, 64 );
@@ -154,7 +156,7 @@ rtems_task Init(
 
   close_it();
 
-  puts( "*** END OF TEST TERMIOS07 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -176,6 +178,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 #define CONFIGURE_MAXIMUM_TASKS                  1
 #define CONFIGURE_MAXIMUM_TIMERS                 2
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/libtests/termios08/init.c b/testsuites/libtests/termios08/init.c
index b3471a330f..e82593ec98 100644
--- a/testsuites/libtests/termios08/init.c
+++ b/testsuites/libtests/termios08/init.c
@@ -23,6 +23,8 @@
 #include <rtems/dumpbuf.h>
 #include <rtems/termiostypes.h>
 
+const char rtems_test_name[] = "TERMIOS 8";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void open_it(void);
@@ -113,7 +115,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST TERMIOS08 ***" );
+  TEST_BEGIN();
 
   open_it();
   change_lflag( "non-canonical", ICANON, 0 );
@@ -141,7 +143,7 @@ rtems_task Init(
 
   close_it();
   
-  puts( "*** END OF TEST TERMIOS08 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -159,6 +161,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT