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

3 files changed, 12 insertions, 5 deletions

diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c
index 772b039592..c123c01042 100644
--- a/testsuites/libtests/stackchk/init.c
+++ b/testsuites/libtests/stackchk/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "STACKCHK";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -33,7 +35,7 @@ rtems_task Init(
   rtems_time_of_day time;
   rtems_status_code status;
 
-  puts( "\n\n*** TEST STACK CHECKER ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
   status = rtems_clock_set( &time );
@@ -99,6 +101,6 @@ void Fatal_extension(
   } else if ( error != rtems_build_name( 'T', 'A', '1', ' ' ) ) {
     printk( "unexpected fatal error\n" );
   } else {
-    printk( "*** END OF TEST STACK CHECKER ***\n" );
+    rtems_test_endk();
   }
 }
diff --git a/testsuites/libtests/stackchk/system.h b/testsuites/libtests/stackchk/system.h
index 16b623ae2d..737ed812b2 100644
--- a/testsuites/libtests/stackchk/system.h
+++ b/testsuites/libtests/stackchk/system.h
@@ -48,7 +48,8 @@ void Fatal_extension(
 );
 
 #define CONFIGURE_INITIAL_EXTENSIONS \
-  { NULL, NULL, NULL, NULL, NULL, NULL, NULL, Fatal_extension }
+  { NULL, NULL, NULL, NULL, NULL, NULL, NULL, Fatal_extension }, \
+  RTEMS_TEST_INITIAL_EXTENSION
 
 #include <rtems/confdefs.h>
 
diff --git a/testsuites/libtests/stackchk01/init.c b/testsuites/libtests/stackchk01/init.c
index f54f1af4a3..b361d12ff2 100644
--- a/testsuites/libtests/stackchk01/init.c
+++ b/testsuites/libtests/stackchk01/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include <rtems/stackchk.h>
 
+const char rtems_test_name[] = "STACKCHK 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -23,13 +25,13 @@ rtems_task Init(
 {
   bool              blown;
 
-  puts( "\n\n*** TEST STACK CHECKER 01 ***" );
+  TEST_BEGIN();
 
   puts( "stack_checker_is_blown - NOT BLOWN" );
   blown = rtems_stack_checker_is_blown();
   rtems_test_assert(!blown);
 
-  puts( "*** END OF TEST STACK CHECKER 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -39,6 +41,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS 1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_STACK_CHECKER_ENABLED