[PATCH] tests: Change TEST_BEGIN to rtems_test_being and TEST_ENG to rtems_test_end.
Gedare Bloom
gedare at rtems.org
Thu Nov 16 14:51:20 UTC 2017
Fix typo in commit message: being -> begin
On Sat, Nov 11, 2017 at 2:42 AM, Chris Johns <chrisj at rtems.org> wrote:
> Remove buffer_test_io.h.
>
> Update #3199.
> ---
> testsuites/Makefile.am | 1 -
> testsuites/benchmarks/dhrystone/init.c | 6 ++++--
> testsuites/benchmarks/linpack/init.c | 6 ++++--
> testsuites/benchmarks/whetstone/init.c | 6 ++++--
> testsuites/fstests/fsbdpart01/init.c | 6 ++++--
> testsuites/fstests/fsclose01/init.c | 6 ++++--
> testsuites/fstests/fsdosfsformat01/init.c | 6 ++++--
> testsuites/fstests/fsdosfsname01/init.c | 6 ++++--
> testsuites/fstests/fsdosfsname02/init.c | 6 ++++--
> testsuites/fstests/fsdosfssync01/init.c | 6 ++++--
> testsuites/fstests/fsdosfswrite01/init.c | 6 ++++--
> testsuites/fstests/fsfseeko01/init.c | 6 ++++--
> testsuites/fstests/fsimfsconfig01/init.c | 6 ++++--
> testsuites/fstests/fsimfsconfig02/init.c | 6 ++++--
> testsuites/fstests/fsimfsconfig03/init.c | 6 ++++--
> testsuites/fstests/fsimfsgeneric01/init.c | 6 ++++--
> testsuites/fstests/fsnofs01/init.c | 6 ++++--
> testsuites/fstests/fsrofs01/init.c | 6 ++++--
> testsuites/fstests/support/fstest_support.c | 6 ++++--
> testsuites/libtests/block01/init.c | 6 ++++--
> testsuites/libtests/block02/init.c | 6 ++++--
> testsuites/libtests/block03/init.c | 6 ++++--
> testsuites/libtests/block04/init.c | 6 ++++--
> testsuites/libtests/block05/init.c | 6 ++++--
> testsuites/libtests/block06/init.c | 6 ++++--
> testsuites/libtests/block07/init.c | 6 ++++--
> testsuites/libtests/block08/init.c | 6 ++++--
> testsuites/libtests/block09/init.c | 6 ++++--
> testsuites/libtests/block10/init.c | 6 ++++--
> testsuites/libtests/block11/init.c | 6 ++++--
> testsuites/libtests/block12/init.c | 6 ++++--
> testsuites/libtests/block13/init.c | 6 ++++--
> testsuites/libtests/block14/init.c | 6 ++++--
> testsuites/libtests/block15/init.c | 6 ++++--
> testsuites/libtests/block16/init.c | 6 ++++--
> testsuites/libtests/block17/init.c | 6 ++++--
> testsuites/libtests/bspcmdline01/init.c | 6 ++++--
> testsuites/libtests/capture01/init.c | 6 ++++--
> testsuites/libtests/complex/init.c | 6 ++++--
> testsuites/libtests/cpuuse/init.c | 3 ++-
> testsuites/libtests/cpuuse/task2.c | 3 ++-
> testsuites/libtests/crypt01/init.c | 6 ++++--
> testsuites/libtests/debugger01/init.c | 6 ++++--
> testsuites/libtests/defaultconfig01/init.c | 6 ++++--
> testsuites/libtests/devfs01/init.c | 6 ++++--
> testsuites/libtests/devfs02/init.c | 6 ++++--
> testsuites/libtests/devfs03/init.c | 6 ++++--
> testsuites/libtests/devfs04/init.c | 6 ++++--
> testsuites/libtests/deviceio01/init.c | 6 ++++--
> testsuites/libtests/dl01/init.c | 6 ++++--
> testsuites/libtests/dl02/init.c | 6 ++++--
> testsuites/libtests/dl03/init.c | 6 ++++--
> testsuites/libtests/dl04/init.c | 6 ++++--
> testsuites/libtests/dl05/init.c | 6 ++++--
> testsuites/libtests/dumpbuf01/init.c | 6 ++++--
> testsuites/libtests/exit01/init.c | 6 ++++--
> testsuites/libtests/exit02/init.c | 6 ++++--
> testsuites/libtests/flashdisk01/init.c | 6 ++++--
> testsuites/libtests/ftp01/init.c | 6 ++++--
> testsuites/libtests/gxx01/init.c | 6 ++++--
> testsuites/libtests/heapwalk/init.c | 6 ++++--
> testsuites/libtests/i2c01/init.c | 6 ++++--
> testsuites/libtests/libfdt01/init.c | 6 ++++--
> testsuites/libtests/malloc02/init.c | 6 ++++--
> testsuites/libtests/malloc03/init.c | 6 ++++--
> testsuites/libtests/malloc04/init.c | 6 ++++--
> testsuites/libtests/malloctest/init.c | 3 ++-
> testsuites/libtests/malloctest/task1.c | 3 ++-
> testsuites/libtests/math/init.c | 6 ++++--
> testsuites/libtests/mathf/init.c | 6 ++++--
> testsuites/libtests/mathl/init.c | 6 ++++--
> testsuites/libtests/md501/init.c | 6 ++++--
> testsuites/libtests/mghttpd01/init.c | 6 ++++--
> testsuites/libtests/monitor/init.c | 6 ++++--
> testsuites/libtests/monitor02/init.c | 6 ++++--
> testsuites/libtests/mouse01/init.c | 6 ++++--
> testsuites/libtests/networking01/init.c | 6 ++++--
> testsuites/libtests/newlib01/init.c | 6 ++++--
> testsuites/libtests/putenvtest/init.c | 6 ++++--
> testsuites/libtests/pwdgrp01/init.c | 6 ++++--
> testsuites/libtests/pwdgrp02/init.c | 6 ++++--
> testsuites/libtests/rbheap01/init.c | 6 ++++--
> testsuites/libtests/rtmonuse/init.c | 3 ++-
> testsuites/libtests/rtmonuse/task1.c | 3 ++-
> testsuites/libtests/sha/init.c | 6 ++++--
> testsuites/libtests/shell01/init.c | 6 ++++--
> testsuites/libtests/sparsedisk01/init.c | 6 ++++--
> testsuites/libtests/spi01/init.c | 6 ++++--
> testsuites/libtests/stackchk/init.c | 6 ++++--
> testsuites/libtests/stackchk01/init.c | 6 ++++--
> testsuites/libtests/stringto01/init.c | 6 ++++--
> testsuites/libtests/syscall01/init.c | 6 ++++--
> testsuites/libtests/tar01/init.c | 6 ++++--
> testsuites/libtests/tar02/init.c | 6 ++++--
> testsuites/libtests/tar03/init.c | 6 ++++--
> testsuites/libtests/termios/init.c | 9 ++++++---
> testsuites/libtests/termios01/init.c | 6 ++++--
> testsuites/libtests/termios02/init.c | 6 ++++--
> testsuites/libtests/termios03/init.c | 6 ++++--
> testsuites/libtests/termios04/init.c | 6 ++++--
> testsuites/libtests/termios05/init.c | 6 ++++--
> testsuites/libtests/termios06/init.c | 6 ++++--
> testsuites/libtests/termios07/init.c | 6 ++++--
> testsuites/libtests/termios08/init.c | 6 ++++--
> testsuites/libtests/termios09/init.c | 6 ++++--
> testsuites/libtests/top/init.c | 6 ++++--
> testsuites/libtests/top/task1.c | 3 ++-
> testsuites/libtests/top/task2.c | 3 ++-
> testsuites/libtests/tztest/init.c | 6 ++++--
> testsuites/libtests/uid01/init.c | 6 ++++--
> testsuites/libtests/utf8proc01/init.c | 6 ++++--
> testsuites/psxtests/include/pmacros.h | 1 -
> testsuites/psxtests/psx01/init.c | 3 ++-
> testsuites/psxtests/psx01/task.c | 3 ++-
> testsuites/psxtests/psx02/init.c | 6 ++++--
> testsuites/psxtests/psx02/task.c | 3 ++-
> testsuites/psxtests/psx03/init.c | 6 ++++--
> testsuites/psxtests/psx04/init.c | 6 ++++--
> testsuites/psxtests/psx05/init.c | 6 ++++--
> testsuites/psxtests/psx06/init.c | 6 ++++--
> testsuites/psxtests/psx07/init.c | 6 ++++--
> testsuites/psxtests/psx08/init.c | 3 ++-
> testsuites/psxtests/psx08/task3.c | 3 ++-
> testsuites/psxtests/psx09/init.c | 6 ++++--
> testsuites/psxtests/psx10/init.c | 6 ++++--
> testsuites/psxtests/psx11/init.c | 6 ++++--
> testsuites/psxtests/psx12/init.c | 6 ++++--
> testsuites/psxtests/psx13/test.c | 6 ++++--
> testsuites/psxtests/psx14/init.c | 6 ++++--
> testsuites/psxtests/psx15/init.c | 6 ++++--
> testsuites/psxtests/psx16/init.c | 6 ++++--
> testsuites/psxtests/psxaio01/init.c | 6 ++++--
> testsuites/psxtests/psxaio02/init.c | 6 ++++--
> testsuites/psxtests/psxaio03/init.c | 6 ++++--
> testsuites/psxtests/psxalarm01/init.c | 6 ++++--
> testsuites/psxtests/psxautoinit01/init.c | 6 ++++--
> testsuites/psxtests/psxautoinit02/init.c | 6 ++++--
> testsuites/psxtests/psxbarrier01/test.c | 6 ++++--
> testsuites/psxtests/psxcancel/init.c | 6 ++++--
> testsuites/psxtests/psxcancel01/init.c | 6 ++++--
> testsuites/psxtests/psxchroot01/test.c | 6 ++++--
> testsuites/psxtests/psxclassic01/init.c | 6 ++++--
> testsuites/psxtests/psxcleanup/psxcleanup.c | 6 ++++--
> testsuites/psxtests/psxcleanup01/init.c | 6 ++++--
> testsuites/psxtests/psxcleanup02/init.c | 6 ++++--
> testsuites/psxtests/psxclock/init.c | 6 ++++--
> testsuites/psxtests/psxclock01/init.c | 6 ++++--
> testsuites/psxtests/psxclockrealtime01/init.c | 6 ++++--
> testsuites/psxtests/psxconcurrency01/init.c | 6 ++++--
> testsuites/psxtests/psxcond01/init.c | 6 ++++--
> testsuites/psxtests/psxcond02/init.c | 6 ++++--
> testsuites/psxtests/psxconfig01/init.c | 6 ++++--
> testsuites/psxtests/psxdevctl01/test.c | 6 ++++--
> testsuites/psxtests/psxeintr_join/init.c | 6 ++++--
> testsuites/psxtests/psxenosys/init.c | 6 ++++--
> testsuites/psxtests/psxfatal_support/init.c | 6 ++++--
> testsuites/psxtests/psxfchx01/init.c | 6 ++++--
> testsuites/psxtests/psxfile01/test.c | 6 ++++--
> testsuites/psxtests/psxfile02/init.c | 6 ++++--
> testsuites/psxtests/psxfilelock01/init.c | 6 ++++--
> testsuites/psxtests/psxgetattrnp01/init.c | 12 ++++++++----
> testsuites/psxtests/psxgetrusage01/init.c | 6 ++++--
> testsuites/psxtests/psxglobalcon01/init.cc | 6 ++++--
> testsuites/psxtests/psxglobalcon02/init.cc | 6 ++++--
> testsuites/psxtests/psxid01/init.c | 6 ++++--
> testsuites/psxtests/psximfs01/init.c | 6 ++++--
> testsuites/psxtests/psximfs02/init.c | 6 ++++--
> testsuites/psxtests/psxintrcritical01/init.c | 6 ++++--
> testsuites/psxtests/psxitimer/init.c | 6 ++++--
> testsuites/psxtests/psxkey01/init.c | 6 ++++--
> testsuites/psxtests/psxkey02/init.c | 6 ++++--
> testsuites/psxtests/psxkey03/init.c | 6 ++++--
> testsuites/psxtests/psxkey04/init.c | 6 ++++--
> testsuites/psxtests/psxkey05/init.c | 6 ++++--
> testsuites/psxtests/psxkey06/init.c | 6 ++++--
> testsuites/psxtests/psxkey07/init.c | 6 ++++--
> testsuites/psxtests/psxkey08/init.c | 6 ++++--
> testsuites/psxtests/psxkey09/init.c | 6 ++++--
> testsuites/psxtests/psxkey10/init.c | 6 ++++--
> testsuites/psxtests/psxmmap01/init.c | 6 ++++--
> testsuites/psxtests/psxmount/test.c | 6 ++++--
> testsuites/psxtests/psxmsgq01/init.c | 6 ++++--
> testsuites/psxtests/psxmsgq02/init.c | 6 ++++--
> testsuites/psxtests/psxmsgq03/init.c | 6 ++++--
> testsuites/psxtests/psxmsgq04/init.c | 6 ++++--
> testsuites/psxtests/psxmutexattr01/init.c | 6 ++++--
> testsuites/psxtests/psxobj01/init.c | 6 ++++--
> testsuites/psxtests/psxonce01/init.c | 6 ++++--
> testsuites/psxtests/psxpasswd01/init.c | 6 ++++--
> testsuites/psxtests/psxpasswd02/init.c | 6 ++++--
> testsuites/psxtests/psxpipe01/init.c | 6 ++++--
> testsuites/psxtests/psxrdwrv/test.c | 6 ++++--
> testsuites/psxtests/psxreaddir/test.c | 6 ++++--
> testsuites/psxtests/psxrwlock01/test.c | 6 ++++--
> testsuites/psxtests/psxsem01/init.c | 6 ++++--
> testsuites/psxtests/psxshm01/init.c | 6 ++++--
> testsuites/psxtests/psxshm02/init.c | 6 ++++--
> testsuites/psxtests/psxsignal01/init.c | 6 ++++--
> testsuites/psxtests/psxsignal02/init.c | 6 ++++--
> testsuites/psxtests/psxsignal03/init.c | 6 ++++--
> testsuites/psxtests/psxsignal05/init.c | 6 ++++--
> testsuites/psxtests/psxsignal06/init.c | 6 ++++--
> testsuites/psxtests/psxspin01/test.c | 6 ++++--
> testsuites/psxtests/psxstack01/init.c | 6 ++++--
> testsuites/psxtests/psxstack02/init.c | 6 ++++--
> testsuites/psxtests/psxstat/test.c | 6 ++++--
> testsuites/psxtests/psxstrsignal01/init.c | 6 ++++--
> testsuites/psxtests/psxsysconf/init.c | 6 ++++--
> testsuites/psxtests/psxthreadname01/init.c | 6 ++++--
> testsuites/psxtests/psxtime/test.c | 6 ++++--
> testsuites/psxtests/psxtimer01/psxtimer.c | 6 ++++--
> testsuites/psxtests/psxtimer02/psxtimer.c | 6 ++++--
> testsuites/psxtests/psxtimes01/init.c | 6 ++++--
> testsuites/psxtests/psxualarm/init.c | 6 ++++--
> testsuites/psxtests/psxusleep/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmbarrier01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmbarrier02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmbarrier03/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmbarrier04/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmclocknanosleep01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmclocknanosleep02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmclocknanosleep03/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond03/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond04/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond05/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond06/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond07/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmcond08/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmkey01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmkey02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmq01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmutex01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmutex02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmutex03/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmutex04/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmutex05/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmutex06/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmmutex07/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmnanosleep01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmnanosleep02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmrwlock01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmrwlock02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmrwlock03/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmrwlock04/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmrwlock05/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmrwlock06/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmrwlock07/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmsem01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmsem02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmsem03/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmsem04/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmsem05/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmsleep01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmsleep02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmthread01/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmthread02/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmthread03/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmthread04/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmthread05/init.c | 6 ++++--
> testsuites/psxtmtests/psxtmthread06/init.c | 6 ++++--
> testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c | 6 ++++--
> testsuites/rhealstone/rhilatency/ilatency.c | 6 ++++--
> testsuites/rhealstone/rhmlatency/mlatency.c | 6 ++++--
> testsuites/rhealstone/rhsemshuffle/semshuffle.c | 6 ++++--
> testsuites/rhealstone/rhtaskpreempt/taskpreempt.c | 6 ++++--
> testsuites/rhealstone/rhtaskswitch/taskswitch.c | 6 ++++--
> testsuites/samples/base_mp/apptask.c | 3 ++-
> testsuites/samples/base_mp/init.c | 3 ++-
> testsuites/samples/base_sp/apptask.c | 3 ++-
> testsuites/samples/base_sp/init.c | 3 ++-
> testsuites/samples/capture/init.c | 6 ++++--
> testsuites/samples/cdtest/main.cc | 6 ++++--
> testsuites/samples/fileio/init.c | 6 ++++--
> testsuites/samples/hello/init.c | 6 ++++--
> testsuites/samples/loopback/init.c | 6 ++++--
> testsuites/samples/nsecs/init.c | 6 ++++--
> testsuites/samples/paranoia/init.c | 6 ++++--
> testsuites/samples/pppd/init.c | 6 ++++--
> testsuites/samples/ticker/init.c | 3 ++-
> testsuites/samples/ticker/tasks.c | 3 ++-
> testsuites/samples/unlimited/init.c | 6 ++++--
> testsuites/smptests/smp01/init.c | 6 ++++--
> testsuites/smptests/smp02/init.c | 6 ++++--
> testsuites/smptests/smp03/init.c | 6 ++++--
> testsuites/smptests/smp05/init.c | 6 ++++--
> testsuites/smptests/smp07/init.c | 6 ++++--
> testsuites/smptests/smp08/init.c | 3 ++-
> testsuites/smptests/smp08/tasks.c | 3 ++-
> testsuites/smptests/smp09/init.c | 6 ++++--
> testsuites/smptests/smpaffinity01/init.c | 6 ++++--
> testsuites/smptests/smpatomic01/init.c | 6 ++++--
> testsuites/smptests/smpcache01/init.c | 6 ++++--
> testsuites/smptests/smpcapture01/init.c | 6 ++++--
> testsuites/smptests/smpcapture02/init.c | 6 ++++--
> testsuites/smptests/smpclock01/init.c | 6 ++++--
> testsuites/smptests/smpfatal01/init.c | 9 ++++++---
> testsuites/smptests/smpfatal02/init.c | 9 ++++++---
> testsuites/smptests/smpfatal03/init.c | 6 ++++--
> testsuites/smptests/smpfatal04/init.c | 6 ++++--
> testsuites/smptests/smpfatal05/init.c | 6 ++++--
> testsuites/smptests/smpfatal06/init.c | 6 ++++--
> testsuites/smptests/smpfatal08/init.c | 6 ++++--
> testsuites/smptests/smpipi01/init.c | 6 ++++--
> testsuites/smptests/smpload01/init.c | 6 ++++--
> testsuites/smptests/smplock01/init.c | 6 ++++--
> testsuites/smptests/smpmigration01/init.c | 6 ++++--
> testsuites/smptests/smpmigration02/init.c | 6 ++++--
> testsuites/smptests/smpmrsp01/init.c | 6 ++++--
> testsuites/smptests/smpmutex01/init.c | 6 ++++--
> testsuites/smptests/smpmutex02/init.c | 6 ++++--
> testsuites/smptests/smppsxaffinity01/init.c | 12 ++++++++----
> testsuites/smptests/smppsxaffinity02/init.c | 12 ++++++++----
> testsuites/smptests/smppsxmutex01/init.c | 6 ++++--
> testsuites/smptests/smppsxsignal01/init.c | 6 ++++--
> testsuites/smptests/smpschedaffinity01/init.c | 6 ++++--
> testsuites/smptests/smpschedaffinity02/init.c | 6 ++++--
> testsuites/smptests/smpschedaffinity03/init.c | 6 ++++--
> testsuites/smptests/smpschedaffinity04/init.c | 6 ++++--
> testsuites/smptests/smpschedaffinity05/init.c | 6 ++++--
> testsuites/smptests/smpschededf01/init.c | 6 ++++--
> testsuites/smptests/smpschededf02/init.c | 6 ++++--
> testsuites/smptests/smpschededf03/init.c | 6 ++++--
> testsuites/smptests/smpschedsem01/init.c | 6 ++++--
> testsuites/smptests/smpscheduler01/init.c | 6 ++++--
> testsuites/smptests/smpscheduler02/init.c | 6 ++++--
> testsuites/smptests/smpscheduler03/test.c | 6 ++++--
> testsuites/smptests/smpscheduler04/init.c | 6 ++++--
> testsuites/smptests/smpsignal01/init.c | 6 ++++--
> testsuites/smptests/smpstrongapa01/init.c | 6 ++++--
> testsuites/smptests/smpswitchextension01/init.c | 6 ++++--
> testsuites/smptests/smpthreadlife01/init.c | 6 ++++--
> testsuites/smptests/smpunsupported01/init.c | 6 ++++--
> testsuites/smptests/smpwakeafter01/init.c | 6 ++++--
> testsuites/sptests/sp01/init.c | 3 ++-
> testsuites/sptests/sp01/task1.c | 3 ++-
> testsuites/sptests/sp02/init.c | 3 ++-
> testsuites/sptests/sp02/task1.c | 3 ++-
> testsuites/sptests/sp03/init.c | 3 ++-
> testsuites/sptests/sp03/task2.c | 3 ++-
> testsuites/sptests/sp04/init.c | 3 ++-
> testsuites/sptests/sp04/task1.c | 3 ++-
> testsuites/sptests/sp05/init.c | 3 ++-
> testsuites/sptests/sp05/task1.c | 3 ++-
> testsuites/sptests/sp06/init.c | 3 ++-
> testsuites/sptests/sp06/task1.c | 3 ++-
> testsuites/sptests/sp07/init.c | 3 ++-
> testsuites/sptests/sp07/taskexit.c | 3 ++-
> testsuites/sptests/sp08/init.c | 6 ++++--
> testsuites/sptests/sp11/init.c | 3 ++-
> testsuites/sptests/sp11/task1.c | 3 ++-
> testsuites/sptests/sp12/init.c | 3 ++-
> testsuites/sptests/sp12/task5.c | 3 ++-
> testsuites/sptests/sp13/init.c | 3 ++-
> testsuites/sptests/sp13/task1.c | 3 ++-
> testsuites/sptests/sp14/init.c | 3 ++-
> testsuites/sptests/sp14/task2.c | 3 ++-
> testsuites/sptests/sp15/init.c | 3 ++-
> testsuites/sptests/sp15/task1.c | 3 ++-
> testsuites/sptests/sp16/init.c | 3 ++-
> testsuites/sptests/sp16/task1.c | 3 ++-
> testsuites/sptests/sp17/init.c | 3 ++-
> testsuites/sptests/sp17/task1.c | 3 ++-
> testsuites/sptests/sp18/init.c | 6 ++++--
> testsuites/sptests/sp19/fptask.c | 3 ++-
> testsuites/sptests/sp19/init.c | 3 ++-
> testsuites/sptests/sp20/init.c | 6 ++++--
> testsuites/sptests/sp2038/init.c | 6 ++++--
> testsuites/sptests/sp21/init.c | 6 ++++--
> testsuites/sptests/sp22/init.c | 3 ++-
> testsuites/sptests/sp22/task1.c | 3 ++-
> testsuites/sptests/sp23/init.c | 3 ++-
> testsuites/sptests/sp23/task1.c | 3 ++-
> testsuites/sptests/sp24/init.c | 3 ++-
> testsuites/sptests/sp24/task1.c | 3 ++-
> testsuites/sptests/sp25/init.c | 3 ++-
> testsuites/sptests/sp25/task1.c | 3 ++-
> testsuites/sptests/sp26/init.c | 3 ++-
> testsuites/sptests/sp26/task1.c | 3 ++-
> testsuites/sptests/sp27/init.c | 6 ++++--
> testsuites/sptests/sp29/init.c | 6 ++++--
> testsuites/sptests/sp30/init.c | 3 ++-
> testsuites/sptests/sp30/task1.c | 3 ++-
> testsuites/sptests/sp31/init.c | 3 ++-
> testsuites/sptests/sp31/task1.c | 3 ++-
> testsuites/sptests/sp32/init.c | 6 ++++--
> testsuites/sptests/sp33/init.c | 6 ++++--
> testsuites/sptests/sp34/changepri.c | 6 ++++--
> testsuites/sptests/sp35/priinv.c | 6 ++++--
> testsuites/sptests/sp37/init.c | 6 ++++--
> testsuites/sptests/sp38/init.c | 6 ++++--
> testsuites/sptests/sp40/init.c | 6 ++++--
> testsuites/sptests/sp41/init.c | 6 ++++--
> testsuites/sptests/sp42/init.c | 6 ++++--
> testsuites/sptests/sp43/init.c | 6 ++++--
> testsuites/sptests/sp44/init.c | 6 ++++--
> testsuites/sptests/sp45/init.c | 6 ++++--
> testsuites/sptests/sp46/init.c | 6 ++++--
> testsuites/sptests/sp47/init.c | 6 ++++--
> testsuites/sptests/sp48/init.c | 6 ++++--
> testsuites/sptests/sp49/init.c | 6 ++++--
> testsuites/sptests/sp50/init.c | 6 ++++--
> testsuites/sptests/sp51/init.c | 6 ++++--
> testsuites/sptests/sp52/init.c | 6 ++++--
> testsuites/sptests/sp54/init.c | 6 ++++--
> testsuites/sptests/sp55/init.c | 6 ++++--
> testsuites/sptests/sp56/init.c | 6 ++++--
> testsuites/sptests/sp57/init.c | 6 ++++--
> testsuites/sptests/sp58/init.c | 6 ++++--
> testsuites/sptests/sp59/init.c | 6 ++++--
> testsuites/sptests/sp60/init.c | 6 ++++--
> testsuites/sptests/sp62/init.c | 6 ++++--
> testsuites/sptests/sp63/init.c | 6 ++++--
> testsuites/sptests/sp64/init.c | 6 ++++--
> testsuites/sptests/sp65/init.c | 6 ++++--
> testsuites/sptests/sp67/init.c | 6 ++++--
> testsuites/sptests/sp68/init.c | 6 ++++--
> testsuites/sptests/sp69/init.c | 6 ++++--
> testsuites/sptests/sp70/init.c | 6 ++++--
> testsuites/sptests/sp71/init.c | 6 ++++--
> testsuites/sptests/sp72/init.c | 6 ++++--
> testsuites/sptests/sp73/init.c | 6 ++++--
> testsuites/sptests/sp74/init.c | 6 ++++--
> testsuites/sptests/sp75/init.c | 6 ++++--
> testsuites/sptests/sp76/init.c | 6 ++++--
> testsuites/sptests/sp77/init.c | 6 ++++--
> testsuites/sptests/spassoc01/init.c | 6 ++++--
> testsuites/sptests/spatomic01/init.c | 6 ++++--
> testsuites/sptests/spcache01/init.c | 6 ++++--
> testsuites/sptests/spcbssched01/init.c | 3 ++-
> testsuites/sptests/spcbssched01/task1.c | 3 ++-
> testsuites/sptests/spcbssched02/init.c | 6 ++++--
> testsuites/sptests/spcbssched03/init.c | 3 ++-
> testsuites/sptests/spcbssched03/tasks_periodic.c | 3 ++-
> testsuites/sptests/spchain/init.c | 6 ++++--
> testsuites/sptests/spclock_err01/init.c | 6 ++++--
> testsuites/sptests/spclock_err02/init.c | 6 ++++--
> testsuites/sptests/spconsole01/init.c | 6 ++++--
> testsuites/sptests/spcontext01/init.c | 6 ++++--
> testsuites/sptests/spcoverage/init.c | 6 ++++--
> testsuites/sptests/spcpucounter01/init.c | 6 ++++--
> testsuites/sptests/spcpuset01/init.c | 6 ++++--
> testsuites/sptests/spedfsched01/init.c | 3 ++-
> testsuites/sptests/spedfsched01/task1.c | 3 ++-
> testsuites/sptests/spedfsched02/init.c | 3 ++-
> testsuites/sptests/spedfsched02/task1.c | 3 ++-
> testsuites/sptests/spedfsched03/init.c | 3 ++-
> testsuites/sptests/spedfsched03/tasks_periodic.c | 3 ++-
> testsuites/sptests/spedfsched04/init.c | 6 ++++--
> testsuites/sptests/sperror01/init.c | 6 ++++--
> testsuites/sptests/sperror02/init.c | 6 ++++--
> testsuites/sptests/sperror03/init.c | 6 ++++--
> testsuites/sptests/spevent_err03/init.c | 6 ++++--
> testsuites/sptests/speventsystem01/init.c | 6 ++++--
> testsuites/sptests/speventtransient01/init.c | 6 ++++--
> testsuites/sptests/spextensions01/init.c | 6 ++++--
> testsuites/sptests/spfatal07/testcase.h | 3 ++-
> testsuites/sptests/spfatal16/testcase.h | 3 ++-
> testsuites/sptests/spfatal26/init.c | 6 ++++--
> testsuites/sptests/spfatal30/init.c | 9 ++++++---
> testsuites/sptests/spfatal31/init.c | 9 ++++++---
> testsuites/sptests/spfatal_support/init.c | 6 ++++--
> testsuites/sptests/spfifo01/init.c | 6 ++++--
> testsuites/sptests/spfifo02/init.c | 6 ++++--
> testsuites/sptests/spfifo03/init.c | 6 ++++--
> testsuites/sptests/spfifo04/init.c | 6 ++++--
> testsuites/sptests/spfifo05/init.c | 6 ++++--
> testsuites/sptests/spfreechain01/init.c | 6 ++++--
> testsuites/sptests/spglobalcon01/init.cc | 6 ++++--
> testsuites/sptests/spheapprot/init.c | 6 ++++--
> testsuites/sptests/spinternalerror01/init.c | 6 ++++--
> testsuites/sptests/spinternalerror02/init.c | 6 ++++--
> testsuites/sptests/spintr_err01/init.c | 6 ++++--
> testsuites/sptests/spintrcritical01/init.c | 6 ++++--
> testsuites/sptests/spintrcritical06/init.c | 6 ++++--
> testsuites/sptests/spintrcritical08/init.c | 6 ++++--
> testsuites/sptests/spintrcritical09/init.c | 6 ++++--
> testsuites/sptests/spintrcritical10/init.c | 6 ++++--
> testsuites/sptests/spintrcritical11/init.c | 6 ++++--
> testsuites/sptests/spintrcritical13/init.c | 6 ++++--
> testsuites/sptests/spintrcritical15/init.c | 6 ++++--
> testsuites/sptests/spintrcritical16/init.c | 6 ++++--
> testsuites/sptests/spintrcritical18/init.c | 6 ++++--
> testsuites/sptests/spintrcritical20/init.c | 6 ++++--
> testsuites/sptests/spintrcritical21/init.c | 6 ++++--
> testsuites/sptests/spintrcritical22/init.c | 6 ++++--
> testsuites/sptests/spintrcritical23/init.c | 6 ++++--
> testsuites/sptests/spintrcritical24/init.c | 6 ++++--
> testsuites/sptests/splinkersets01/init.c | 6 ++++--
> testsuites/sptests/spmkdir/init.c | 6 ++++--
> testsuites/sptests/spmountmgr01/init.c | 6 ++++--
> testsuites/sptests/spmrsp01/init.c | 6 ++++--
> testsuites/sptests/spmsgq_err01/init.c | 6 ++++--
> testsuites/sptests/spmsgq_err02/init.c | 6 ++++--
> testsuites/sptests/spmutex01/init.c | 6 ++++--
> testsuites/sptests/spnsext01/init.c | 6 ++++--
> testsuites/sptests/spobjgetnext/init.c | 6 ++++--
> testsuites/sptests/sppagesize/init.c | 6 ++++--
> testsuites/sptests/sppartition_err01/init.c | 6 ++++--
> testsuites/sptests/spport_err01/init.c | 6 ++++--
> testsuites/sptests/spprintk/init.c | 6 ++++--
> testsuites/sptests/spprivenv01/init.c | 6 ++++--
> testsuites/sptests/spprofiling01/init.c | 6 ++++--
> testsuites/sptests/spqreslib/init.c | 3 ++-
> testsuites/sptests/spqreslib/task_periodic.c | 3 ++-
> testsuites/sptests/spratemon_err01/init.c | 6 ++++--
> testsuites/sptests/sprbtree01/init.c | 6 ++++--
> testsuites/sptests/spregion_err01/init.c | 6 ++++--
> testsuites/sptests/sprmsched01/init.c | 6 ++++--
> testsuites/sptests/sprmsched02/init.c | 6 ++++--
> testsuites/sptests/spscheduler01/init.c | 6 ++++--
> testsuites/sptests/spsem01/init.c | 6 ++++--
> testsuites/sptests/spsem02/init.c | 6 ++++--
> testsuites/sptests/spsem03/init.c | 6 ++++--
> testsuites/sptests/spsem_err01/init.c | 6 ++++--
> testsuites/sptests/spsem_err02/init.c | 6 ++++--
> testsuites/sptests/spsignal_err01/init.c | 6 ++++--
> testsuites/sptests/spsimplesched01/init.c | 6 ++++--
> testsuites/sptests/spsimplesched02/init.c | 6 ++++--
> testsuites/sptests/spsimplesched03/init.c | 6 ++++--
> testsuites/sptests/spsize/init.c | 6 ++++--
> testsuites/sptests/spstdthreads01/init.c | 6 ++++--
> testsuites/sptests/spstkalloc/init.c | 6 ++++--
> testsuites/sptests/spstkalloc02/init.c | 6 ++++--
> testsuites/sptests/spsysinit01/init.c | 6 ++++--
> testsuites/sptests/spsyslock01/init.c | 6 ++++--
> testsuites/sptests/sptask_err01/init.c | 6 ++++--
> testsuites/sptests/sptask_err02/init.c | 6 ++++--
> testsuites/sptests/sptask_err03/init.c | 6 ++++--
> testsuites/sptests/sptask_err04/init.c | 3 ++-
> testsuites/sptests/sptask_err04/task1.c | 3 ++-
> testsuites/sptests/sptasknopreempt01/init.c | 6 ++++--
> testsuites/sptests/spthreadlife01/init.c | 6 ++++--
> testsuites/sptests/spthreadq01/init.c | 6 ++++--
> testsuites/sptests/sptimecounter01/init.c | 6 ++++--
> testsuites/sptests/sptimecounter02/init.c | 6 ++++--
> testsuites/sptests/sptimecounter03/init.c | 6 ++++--
> testsuites/sptests/sptimecounter04/init.c | 6 ++++--
> testsuites/sptests/sptimer_err01/init.c | 6 ++++--
> testsuites/sptests/sptimer_err02/init.c | 6 ++++--
> testsuites/sptests/sptimerserver01/init.c | 6 ++++--
> testsuites/sptests/sptimespec01/init.c | 6 ++++--
> testsuites/sptests/sptls01/init.c | 6 ++++--
> testsuites/sptests/sptls02/init.cc | 6 ++++--
> testsuites/sptests/sptls03/init.c | 6 ++++--
> testsuites/sptests/spversion01/init.c | 6 ++++--
> testsuites/sptests/spwatchdog/init.c | 3 ++-
> testsuites/sptests/spwatchdog/task1.c | 3 ++-
> testsuites/sptests/spwkspace/init.c | 6 ++++--
> testsuites/support/include/buffer_test_io.h | 21 ---------------------
> testsuites/support/include/tmacros.h | 2 --
> testsuites/tmtests/tm01/task1.c | 6 ++++--
> testsuites/tmtests/tm02/task1.c | 6 ++++--
> testsuites/tmtests/tm03/task1.c | 6 ++++--
> testsuites/tmtests/tm04/task1.c | 6 ++++--
> testsuites/tmtests/tm05/task1.c | 6 ++++--
> testsuites/tmtests/tm06/task1.c | 6 ++++--
> testsuites/tmtests/tm07/task1.c | 6 ++++--
> testsuites/tmtests/tm08/task1.c | 6 ++++--
> testsuites/tmtests/tm09/task1.c | 6 ++++--
> testsuites/tmtests/tm10/task1.c | 6 ++++--
> testsuites/tmtests/tm11/task1.c | 6 ++++--
> testsuites/tmtests/tm12/task1.c | 6 ++++--
> testsuites/tmtests/tm13/task1.c | 6 ++++--
> testsuites/tmtests/tm14/task1.c | 6 ++++--
> testsuites/tmtests/tm15/task1.c | 6 ++++--
> testsuites/tmtests/tm16/task1.c | 6 ++++--
> testsuites/tmtests/tm17/task1.c | 6 ++++--
> testsuites/tmtests/tm18/task1.c | 6 ++++--
> testsuites/tmtests/tm19/task1.c | 6 ++++--
> testsuites/tmtests/tm20/task1.c | 6 ++++--
> testsuites/tmtests/tm21/task1.c | 6 ++++--
> testsuites/tmtests/tm22/task1.c | 6 ++++--
> testsuites/tmtests/tm23/task1.c | 6 ++++--
> testsuites/tmtests/tm24/task1.c | 6 ++++--
> testsuites/tmtests/tm25/task1.c | 6 ++++--
> testsuites/tmtests/tm26/task1.c | 9 ++++++---
> testsuites/tmtests/tm27/task1.c | 9 ++++++---
> testsuites/tmtests/tm28/task1.c | 6 ++++--
> testsuites/tmtests/tm29/task1.c | 6 ++++--
> testsuites/tmtests/tm30/init.c | 6 ++++--
> testsuites/tmtests/tmck/task1.c | 6 ++++--
> testsuites/tmtests/tmcontext01/init.c | 6 ++++--
> testsuites/tmtests/tmfine01/init.c | 6 ++++--
> testsuites/tmtests/tmoverhd/testtask.c | 6 ++++--
> testsuites/tmtests/tmtimer01/init.c | 6 ++++--
> 587 files changed, 2192 insertions(+), 1121 deletions(-)
> delete mode 100644 testsuites/support/include/buffer_test_io.h
>
> diff --git a/testsuites/Makefile.am b/testsuites/Makefile.am
> index a466996fa4..d54cc304e3 100644
> --- a/testsuites/Makefile.am
> +++ b/testsuites/Makefile.am
> @@ -4,7 +4,6 @@ DISTCLEANFILES =
> CLEANFILES =
>
> noinst_HEADERS =
> -noinst_HEADERS += support/include/buffer_test_io.h
> noinst_HEADERS += support/include/test_support.h
> noinst_HEADERS += support/include/tmacros.h
> noinst_HEADERS += support/include/pritime.h
> diff --git a/testsuites/benchmarks/dhrystone/init.c b/testsuites/benchmarks/dhrystone/init.c
> index 9ff4662d16..3ef4ddb506 100644
> --- a/testsuites/benchmarks/dhrystone/init.c
> +++ b/testsuites/benchmarks/dhrystone/init.c
> @@ -30,12 +30,14 @@ static void Init(rtems_task_argument arg)
> NULL
> };
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> main(2, argv);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/benchmarks/linpack/init.c b/testsuites/benchmarks/linpack/init.c
> index ce9e0e7448..c92a591df9 100644
> --- a/testsuites/benchmarks/linpack/init.c
> +++ b/testsuites/benchmarks/linpack/init.c
> @@ -30,12 +30,14 @@ static void Init(rtems_task_argument arg)
> NULL
> };
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> main(2, argv);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/benchmarks/whetstone/init.c b/testsuites/benchmarks/whetstone/init.c
> index 0e8f7a4893..9b3042c16a 100644
> --- a/testsuites/benchmarks/whetstone/init.c
> +++ b/testsuites/benchmarks/whetstone/init.c
> @@ -30,12 +30,14 @@ static void Init(rtems_task_argument arg)
> NULL
> };
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> main(2, argv);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsbdpart01/init.c b/testsuites/fstests/fsbdpart01/init.c
> index 0ac42c5a1d..970e575798 100644
> --- a/testsuites/fstests/fsbdpart01/init.c
> +++ b/testsuites/fstests/fsbdpart01/init.c
> @@ -208,12 +208,14 @@ static void test_ide_part_table(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_bdpart();
> test_ide_part_table();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsclose01/init.c b/testsuites/fstests/fsclose01/init.c
> index 3b65b3b432..08210fc338 100644
> --- a/testsuites/fstests/fsclose01/init.c
> +++ b/testsuites/fstests/fsclose01/init.c
> @@ -509,9 +509,11 @@ static void test(test_context *ctx)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> test(&test_instance);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsdosfsformat01/init.c b/testsuites/fstests/fsdosfsformat01/init.c
> index fb5896dca4..edd1f589a7 100644
> --- a/testsuites/fstests/fsdosfsformat01/init.c
> +++ b/testsuites/fstests/fsdosfsformat01/init.c
> @@ -501,11 +501,13 @@ static void test( void )
>
> static void Init( rtems_task_argument arg )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c
> index b796dee40f..922a16ebd4 100644
> --- a/testsuites/fstests/fsdosfsname01/init.c
> +++ b/testsuites/fstests/fsdosfsname01/init.c
> @@ -1337,11 +1337,13 @@ static void test( void )
>
> static void Init( rtems_task_argument arg )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/fstests/fsdosfsname02/init.c b/testsuites/fstests/fsdosfsname02/init.c
> index 929157b18b..8fdd739f1c 100644
> --- a/testsuites/fstests/fsdosfsname02/init.c
> +++ b/testsuites/fstests/fsdosfsname02/init.c
> @@ -78,11 +78,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c
> index 5aee87622c..28d86000d9 100644
> --- a/testsuites/fstests/fsdosfssync01/init.c
> +++ b/testsuites/fstests/fsdosfssync01/init.c
> @@ -141,11 +141,13 @@ static void test(const char *rda, const char *mnt, const char *file)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test("/dev/rda", "/mnt", "/mnt/file");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsdosfswrite01/init.c b/testsuites/fstests/fsdosfswrite01/init.c
> index 91111cc7fe..a6b8fcdea4 100644
> --- a/testsuites/fstests/fsdosfswrite01/init.c
> +++ b/testsuites/fstests/fsdosfswrite01/init.c
> @@ -278,11 +278,13 @@ static void test( void )
>
> static void Init( rtems_task_argument arg )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/fstests/fsfseeko01/init.c b/testsuites/fstests/fsfseeko01/init.c
> index 26aa9a7ea8..4ce2cde398 100644
> --- a/testsuites/fstests/fsfseeko01/init.c
> +++ b/testsuites/fstests/fsfseeko01/init.c
> @@ -87,11 +87,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsimfsconfig01/init.c b/testsuites/fstests/fsimfsconfig01/init.c
> index 5ba3f1f24c..9a1015b8c8 100644
> --- a/testsuites/fstests/fsimfsconfig01/init.c
> +++ b/testsuites/fstests/fsimfsconfig01/init.c
> @@ -51,7 +51,8 @@ static void Init(rtems_task_argument arg)
> struct dirent *dire;
> struct stat st;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rv = IMFS_make_generic_node(
> generic,
> @@ -138,7 +139,8 @@ static void Init(rtems_task_argument arg)
> rtems_test_assert(rv == -1);
> rtems_test_assert(errno == ENOTSUP);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsimfsconfig02/init.c b/testsuites/fstests/fsimfsconfig02/init.c
> index 0e3febd18c..e6c56ed3c5 100644
> --- a/testsuites/fstests/fsimfsconfig02/init.c
> +++ b/testsuites/fstests/fsimfsconfig02/init.c
> @@ -34,7 +34,8 @@ static void Init(rtems_task_argument arg)
> char buf[1];
> int rv;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rv = mkdir(mnt, S_IRWXU);
> rtems_test_assert(rv == 0);
> @@ -61,7 +62,8 @@ static void Init(rtems_task_argument arg)
> rtems_test_assert(rv == -1);
> rtems_test_assert(errno == ENOTSUP);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsimfsconfig03/init.c b/testsuites/fstests/fsimfsconfig03/init.c
> index 4905697b19..72bb36db02 100644
> --- a/testsuites/fstests/fsimfsconfig03/init.c
> +++ b/testsuites/fstests/fsimfsconfig03/init.c
> @@ -47,7 +47,8 @@ static void Init(rtems_task_argument arg)
> int rv;
> int fd;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rv = IMFS_make_generic_node(
> generic,
> @@ -121,7 +122,8 @@ static void Init(rtems_task_argument arg)
> rv = unlink(generic);
> rtems_test_assert(rv == 0);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsimfsgeneric01/init.c b/testsuites/fstests/fsimfsgeneric01/init.c
> index 300bc01178..8a6d10ef82 100644
> --- a/testsuites/fstests/fsimfsgeneric01/init.c
> +++ b/testsuites/fstests/fsimfsgeneric01/init.c
> @@ -480,12 +480,14 @@ static void test_imfs_make_generic_node_errors(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_imfs_make_generic_node();
> test_imfs_make_generic_node_errors();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/fsnofs01/init.c b/testsuites/fstests/fsnofs01/init.c
> index fc69879b53..e5be05799d 100644
> --- a/testsuites/fstests/fsnofs01/init.c
> +++ b/testsuites/fstests/fsnofs01/init.c
> @@ -494,7 +494,8 @@ static void test_check_access(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_initial_values();
> test_location_obtain();
> @@ -505,7 +506,8 @@ static void Init(rtems_task_argument arg)
> test_user_env();
> test_check_access();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c
> index 6173701a24..cab068313e 100644
> --- a/testsuites/fstests/fsrofs01/init.c
> +++ b/testsuites/fstests/fsrofs01/init.c
> @@ -153,12 +153,14 @@ static void test_rofs(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_create_file_system();
> test_rofs();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/fstests/support/fstest_support.c b/testsuites/fstests/support/fstest_support.c
> index eedda92382..752cf61e9a 100644
> --- a/testsuites/fstests/support/fstest_support.c
> +++ b/testsuites/fstests/support/fstest_support.c
> @@ -57,7 +57,8 @@ rtems_task Init(
> {
> int rc=0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Initializing filesystem " FILESYSTEM );
> test_initialize_filesystem();
> @@ -72,6 +73,7 @@ rtems_task Init(
> puts( "\n\nShutting down filesystem " FILESYSTEM );
> test_shutdown_filesystem();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/block01/init.c b/testsuites/libtests/block01/init.c
> index 92dbfc9aba..1d96cf35fa 100644
> --- a/testsuites/libtests/block01/init.c
> +++ b/testsuites/libtests/block01/init.c
> @@ -237,11 +237,13 @@ static void test_diskdevs(void)
>
> static rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_diskdevs();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/libtests/block02/init.c b/testsuites/libtests/block02/init.c
> index c550517e21..95510a7c1a 100644
> --- a/testsuites/libtests/block02/init.c
> +++ b/testsuites/libtests/block02/init.c
> @@ -83,7 +83,8 @@ static void task_low(rtems_task_argument arg)
>
> rtems_test_assert(bd->dd == dd_a);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> @@ -137,7 +138,8 @@ static rtems_task Init(rtems_task_argument argument)
> dev_t dev_a = 0;
> dev_t dev_b = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_disk_io_initialize();
> ASSERT_SC(sc);
> diff --git a/testsuites/libtests/block03/init.c b/testsuites/libtests/block03/init.c
> index c66a52049f..bfdfb08221 100644
> --- a/testsuites/libtests/block03/init.c
> +++ b/testsuites/libtests/block03/init.c
> @@ -77,7 +77,8 @@ static void task_low(rtems_task_argument arg)
>
> rtems_test_assert(bd->block == 0);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> @@ -130,7 +131,8 @@ static rtems_task Init(rtems_task_argument argument)
> rtems_bdbuf_buffer *bd = NULL;
> dev_t dev = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_disk_io_initialize();
> ASSERT_SC(sc);
> diff --git a/testsuites/libtests/block04/init.c b/testsuites/libtests/block04/init.c
> index 1b5d114029..e8021625e8 100644
> --- a/testsuites/libtests/block04/init.c
> +++ b/testsuites/libtests/block04/init.c
> @@ -102,7 +102,8 @@ static void task_high(rtems_task_argument arg)
>
> printk("H: release done: 0\n");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> @@ -112,7 +113,8 @@ static rtems_task Init(rtems_task_argument argument)
> rtems_status_code sc = RTEMS_SUCCESSFUL;
> dev_t dev = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_disk_io_initialize();
> ASSERT_SC(sc);
> diff --git a/testsuites/libtests/block05/init.c b/testsuites/libtests/block05/init.c
> index c20ccbf20d..62e54dcceb 100644
> --- a/testsuites/libtests/block05/init.c
> +++ b/testsuites/libtests/block05/init.c
> @@ -427,7 +427,8 @@ static rtems_task Init(rtems_task_argument argument)
> rtems_status_code sc = RTEMS_SUCCESSFUL;
> unsigned i = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> task_id_init = rtems_task_self();
>
> @@ -506,7 +507,8 @@ static rtems_task Init(rtems_task_argument argument)
> }
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/libtests/block06/init.c b/testsuites/libtests/block06/init.c
> index 94b7298eae..03045450f7 100644
> --- a/testsuites/libtests/block06/init.c
> +++ b/testsuites/libtests/block06/init.c
> @@ -1818,11 +1818,13 @@ bdbuf_tester (void)
>
> static rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> bdbuf_tester ();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit (0);
> }
> diff --git a/testsuites/libtests/block07/init.c b/testsuites/libtests/block07/init.c
> index 914dd35a90..8e4267e5bb 100644
> --- a/testsuites/libtests/block07/init.c
> +++ b/testsuites/libtests/block07/init.c
> @@ -103,7 +103,8 @@ static void task_low(rtems_task_argument arg)
>
> printf("L: release done: 0\n");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> @@ -165,7 +166,8 @@ static rtems_task Init(rtems_task_argument argument)
> rtems_bdbuf_buffer *bd = NULL;
> dev_t dev = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_disk_io_initialize();
> ASSERT_SC(sc);
> diff --git a/testsuites/libtests/block08/init.c b/testsuites/libtests/block08/init.c
> index 83eaf6d534..d980a78880 100644
> --- a/testsuites/libtests/block08/init.c
> +++ b/testsuites/libtests/block08/init.c
> @@ -32,9 +32,11 @@ const char rtems_test_name[] = "BLOCK 8";
>
> rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> run_bdbuf_tests();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/libtests/block09/init.c b/testsuites/libtests/block09/init.c
> index b25c4e4113..f046422846 100644
> --- a/testsuites/libtests/block09/init.c
> +++ b/testsuites/libtests/block09/init.c
> @@ -178,7 +178,8 @@ static rtems_task Init(rtems_task_argument argument)
> dev_t dev = 0;
> rtems_disk_device *dd = NULL;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_disk_io_initialize();
> ASSERT_SC(sc);
> @@ -226,7 +227,8 @@ static rtems_task Init(rtems_task_argument argument)
> sc = rtems_disk_release(dd);
> ASSERT_SC(sc);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/libtests/block10/init.c b/testsuites/libtests/block10/init.c
> index 27c0bb5478..5137507e74 100644
> --- a/testsuites/libtests/block10/init.c
> +++ b/testsuites/libtests/block10/init.c
> @@ -404,7 +404,8 @@ static rtems_task Init(rtems_task_argument argument)
> size_t i_rel = 0;
> size_t i_p = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> task_id_init = rtems_task_self();
>
> @@ -468,7 +469,8 @@ static rtems_task Init(rtems_task_argument argument)
> }
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/libtests/block11/init.c b/testsuites/libtests/block11/init.c
> index f607bf515e..8308d73ac3 100644
> --- a/testsuites/libtests/block11/init.c
> +++ b/testsuites/libtests/block11/init.c
> @@ -403,7 +403,8 @@ static rtems_task Init(rtems_task_argument argument)
> {
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_disk_io_initialize();
> ASSERT_SC(sc);
> @@ -415,7 +416,8 @@ static rtems_task Init(rtems_task_argument argument)
> sc = rtems_disk_io_done();
> ASSERT_SC(sc);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/libtests/block12/init.c b/testsuites/libtests/block12/init.c
> index 036a4e92e6..e0cd44c000 100644
> --- a/testsuites/libtests/block12/init.c
> +++ b/testsuites/libtests/block12/init.c
> @@ -125,11 +125,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/block13/init.c b/testsuites/libtests/block13/init.c
> index afd7704026..951bc814b8 100644
> --- a/testsuites/libtests/block13/init.c
> +++ b/testsuites/libtests/block13/init.c
> @@ -211,11 +211,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/block14/init.c b/testsuites/libtests/block14/init.c
> index 879582f214..2b13079e0e 100644
> --- a/testsuites/libtests/block14/init.c
> +++ b/testsuites/libtests/block14/init.c
> @@ -191,11 +191,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/block15/init.c b/testsuites/libtests/block15/init.c
> index cf9ec5fc0c..d6dedc6e30 100644
> --- a/testsuites/libtests/block15/init.c
> +++ b/testsuites/libtests/block15/init.c
> @@ -156,11 +156,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/block16/init.c b/testsuites/libtests/block16/init.c
> index 401a888925..74404c8c50 100644
> --- a/testsuites/libtests/block16/init.c
> +++ b/testsuites/libtests/block16/init.c
> @@ -125,11 +125,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/block17/init.c b/testsuites/libtests/block17/init.c
> index d916c738d5..73a50cf766 100644
> --- a/testsuites/libtests/block17/init.c
> +++ b/testsuites/libtests/block17/init.c
> @@ -30,11 +30,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/bspcmdline01/init.c b/testsuites/libtests/bspcmdline01/init.c
> index 243c7aad2a..a7305ad528 100644
> --- a/testsuites/libtests/bspcmdline01/init.c
> +++ b/testsuites/libtests/bspcmdline01/init.c
> @@ -142,7 +142,8 @@ rtems_task Init(
> {
> const char *bspcmdline;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> bspcmdline = rtems_bsp_cmdline_get();
> if ( bspcmdline ) {
> @@ -168,7 +169,8 @@ rtems_task Init(
> "-name"
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/capture01/init.c b/testsuites/libtests/capture01/init.c
> index 1366164dae..6425a4bc96 100644
> --- a/testsuites/libtests/capture01/init.c
> +++ b/testsuites/libtests/capture01/init.c
> @@ -49,7 +49,8 @@ rtems_task Init(
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_task_set_priority(RTEMS_SELF, 20, &old_priority);
> rtems_task_mode(RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode);
> @@ -89,7 +90,8 @@ rtems_task Init(
> rtems_capture_print_trace_records ( 22, false );
> rtems_capture_print_trace_records ( 22, false );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
>
> #endif
> diff --git a/testsuites/libtests/complex/init.c b/testsuites/libtests/complex/init.c
> index 185b38f8f3..038015bdbf 100644
> --- a/testsuites/libtests/complex/init.c
> +++ b/testsuites/libtests/complex/init.c
> @@ -57,14 +57,16 @@ int main( void )
> {
> #if __rtems__
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> #endif
>
> docomplex();
> docomplexf();
> docomplexl();
> #if __rtems__
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> #endif
> exit( 0 );
> }
> diff --git a/testsuites/libtests/cpuuse/init.c b/testsuites/libtests/cpuuse/init.c
> index 11fb273733..72a74b1811 100644
> --- a/testsuites/libtests/cpuuse/init.c
> +++ b/testsuites/libtests/cpuuse/init.c
> @@ -42,7 +42,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_time_of_day time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> build_time( &time, 12, 31, 1988, 9, 15, 0, 0 );
>
> status = rtems_clock_set( &time );
> diff --git a/testsuites/libtests/cpuuse/task2.c b/testsuites/libtests/cpuuse/task2.c
> index 166192966f..948412509c 100644
> --- a/testsuites/libtests/cpuuse/task2.c
> +++ b/testsuites/libtests/cpuuse/task2.c
> @@ -51,6 +51,7 @@ rtems_task Task_2(
> puts( "" );
> rtems_cpu_usage_report();
> puts( "" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/crypt01/init.c b/testsuites/libtests/crypt01/init.c
> index c48fe1171d..5c03af34ed 100644
> --- a/testsuites/libtests/crypt01/init.c
> +++ b/testsuites/libtests/crypt01/init.c
> @@ -232,7 +232,8 @@ static void test_generic(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_formats();
> test_md5();
> @@ -240,7 +241,8 @@ static void Init(rtems_task_argument arg)
> test_sha512();
> test_generic();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/debugger01/init.c b/testsuites/libtests/debugger01/init.c
> index 9fb85007de..d7e713efc5 100644
> --- a/testsuites/libtests/debugger01/init.c
> +++ b/testsuites/libtests/debugger01/init.c
> @@ -42,9 +42,11 @@ const char rtems_test_name[] = "DEBUGGER01";
>
> rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/libtests/defaultconfig01/init.c b/testsuites/libtests/defaultconfig01/init.c
> index 21c326dcbd..a349795918 100644
> --- a/testsuites/libtests/defaultconfig01/init.c
> +++ b/testsuites/libtests/defaultconfig01/init.c
> @@ -45,7 +45,8 @@ int main(int argc, char **argv)
> {
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> install_bsp_extension();
>
> @@ -53,7 +54,8 @@ int main(int argc, char **argv)
> printf("argv[%i] = %s\n", i, argv[i]);
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> return 0;
> }
> diff --git a/testsuites/libtests/devfs01/init.c b/testsuites/libtests/devfs01/init.c
> index 44b55e171c..6a5c93d820 100644
> --- a/testsuites/libtests/devfs01/init.c
> +++ b/testsuites/libtests/devfs01/init.c
> @@ -25,12 +25,14 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "devFS_Show" );
> devFS_Show();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/devfs02/init.c b/testsuites/libtests/devfs02/init.c
> index b9de92a2a5..be3b648507 100644
> --- a/testsuites/libtests/devfs02/init.c
> +++ b/testsuites/libtests/devfs02/init.c
> @@ -44,7 +44,8 @@ rtems_task Init(
> };
> void *opaque;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - attempt to create a fifo - expect ENOTSUP" );
> status = mkfifo( "/fifo01", 0 );
> @@ -82,7 +83,8 @@ rtems_task Init(
> rtems_test_assert( status == -1 );
> rtems_test_assert( errno == EEXIST );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/devfs03/init.c b/testsuites/libtests/devfs03/init.c
> index b9917b84fb..46dd10536f 100644
> --- a/testsuites/libtests/devfs03/init.c
> +++ b/testsuites/libtests/devfs03/init.c
> @@ -39,7 +39,8 @@ rtems_task Init(
> .count = 1
> };
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> memset(nodes, 0, sizeof(nodes));
>
> @@ -76,7 +77,8 @@ rtems_task Init(
> status = rmdir( "/dir01" );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/devfs04/init.c b/testsuites/libtests/devfs04/init.c
> index ea952d8585..0909cb473f 100644
> --- a/testsuites/libtests/devfs04/init.c
> +++ b/testsuites/libtests/devfs04/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> int fdr = 0, fdw = 0;
> char buf[10];
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - attempt to open the /dev/test WR mode -- OK" );
> fdw = open( "/dev/test", O_WRONLY );
> @@ -72,7 +73,8 @@ rtems_task Init(
> status = mknod( "/dev/null", 0777 | S_IFCHR, 0LL );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/deviceio01/init.c b/testsuites/libtests/deviceio01/init.c
> index ca176fbd34..f4bbede7d1 100644
> --- a/testsuites/libtests/deviceio01/init.c
> +++ b/testsuites/libtests/deviceio01/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> int fdr = 0, fdw = 0;
> char buf[10];
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - attempt to open the /dev/test WR mode -- OK" );
> fdw = open( "/dev/test", O_WRONLY );
> @@ -60,7 +61,8 @@ rtems_task Init(
> rtems_test_assert( status == -1 );
> rtems_test_assert( errno == ENOSYS );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/dl01/init.c b/testsuites/libtests/dl01/init.c
> index 9b4a2ae687..edbc324deb 100644
> --- a/testsuites/libtests/dl01/init.c
> +++ b/testsuites/libtests/dl01/init.c
> @@ -45,7 +45,8 @@ static void Init(rtems_task_argument arg)
> {
> int te;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
> if (te != 0)
> @@ -57,7 +58,8 @@ static void Init(rtems_task_argument arg)
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/dl02/init.c b/testsuites/libtests/dl02/init.c
> index bab6b80045..1bdea79082 100644
> --- a/testsuites/libtests/dl02/init.c
> +++ b/testsuites/libtests/dl02/init.c
> @@ -45,7 +45,8 @@ static void Init(rtems_task_argument arg)
> {
> int te;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
> if (te != 0)
> @@ -57,7 +58,8 @@ static void Init(rtems_task_argument arg)
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/dl03/init.c b/testsuites/libtests/dl03/init.c
> index e1d3235d7c..d1c137601b 100644
> --- a/testsuites/libtests/dl03/init.c
> +++ b/testsuites/libtests/dl03/init.c
> @@ -35,11 +35,13 @@ static int test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/dl04/init.c b/testsuites/libtests/dl04/init.c
> index 7b1bb1b35c..a9743c5ced 100644
> --- a/testsuites/libtests/dl04/init.c
> +++ b/testsuites/libtests/dl04/init.c
> @@ -45,7 +45,8 @@ static void Init(rtems_task_argument arg)
> {
> int te;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
> if (te != 0)
> @@ -57,7 +58,8 @@ static void Init(rtems_task_argument arg)
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/dl05/init.c b/testsuites/libtests/dl05/init.c
> index cb19de13f2..456dc6aebd 100644
> --- a/testsuites/libtests/dl05/init.c
> +++ b/testsuites/libtests/dl05/init.c
> @@ -45,7 +45,8 @@ static void Init(rtems_task_argument arg)
> {
> int te;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
> if (te != 0)
> @@ -57,7 +58,8 @@ static void Init(rtems_task_argument arg)
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/dumpbuf01/init.c b/testsuites/libtests/dumpbuf01/init.c
> index 45cf0c2f5a..ce45dc1ada 100644
> --- a/testsuites/libtests/dumpbuf01/init.c
> +++ b/testsuites/libtests/dumpbuf01/init.c
> @@ -38,14 +38,16 @@ rtems_task Init(
> {
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i = 0 ; i < sizeof(Buffer) ; i++ ) {
> do_test( i );
> }
> do_test( -1 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/exit01/init.c b/testsuites/libtests/exit01/init.c
> index 82e59a6286..3856665ea5 100644
> --- a/testsuites/libtests/exit01/init.c
> +++ b/testsuites/libtests/exit01/init.c
> @@ -61,7 +61,8 @@ static void fatal_extension(
> && error == EXIT_STATUS
> && counter == 3
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> @@ -86,7 +87,8 @@ static void Init(rtems_task_argument arg)
> rtems_status_code sc;
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_task_create(
> rtems_build_name('E', 'X', 'I', 'T'),
> diff --git a/testsuites/libtests/exit02/init.c b/testsuites/libtests/exit02/init.c
> index 19a1517d8e..1dbe71d261 100644
> --- a/testsuites/libtests/exit02/init.c
> +++ b/testsuites/libtests/exit02/init.c
> @@ -45,7 +45,8 @@ static void fatal_extension(
> && !always_set_to_false
> && error == EXIT_STATUS
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> @@ -64,7 +65,8 @@ static void Init(rtems_task_argument arg)
> rtems_status_code sc;
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_task_create(
> rtems_build_name('E', 'X', 'I', 'T'),
> diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c
> index 8aac454a52..f79a8ce766 100644
> --- a/testsuites/libtests/flashdisk01/init.c
> +++ b/testsuites/libtests/flashdisk01/init.c
> @@ -149,11 +149,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/ftp01/init.c b/testsuites/libtests/ftp01/init.c
> index 380c2829f7..41c0cb71ca 100644
> --- a/testsuites/libtests/ftp01/init.c
> +++ b/testsuites/libtests/ftp01/init.c
> @@ -218,9 +218,11 @@ static void test(void)
>
> static rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> test();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/gxx01/init.c b/testsuites/libtests/gxx01/init.c
> index 306e4f1f0b..5c2dc2b7bd 100644
> --- a/testsuites/libtests/gxx01/init.c
> +++ b/testsuites/libtests/gxx01/init.c
> @@ -189,7 +189,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_mutex();
> puts( "" );
> @@ -203,7 +204,8 @@ rtems_task Init(
> test_key();
> puts( "" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/heapwalk/init.c b/testsuites/libtests/heapwalk/init.c
> index 3bd6c91ce4..803ae055f7 100644
> --- a/testsuites/libtests/heapwalk/init.c
> +++ b/testsuites/libtests/heapwalk/init.c
> @@ -318,7 +318,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_system_not_up();
> test_check_control();
> @@ -328,6 +329,7 @@ rtems_task Init(
> test_check_free_block();
> test_output();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/i2c01/init.c b/testsuites/libtests/i2c01/init.c
> index f993fa0259..f5256e3f97 100644
> --- a/testsuites/libtests/i2c01/init.c
> +++ b/testsuites/libtests/i2c01/init.c
> @@ -642,11 +642,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/libfdt01/init.c b/testsuites/libtests/libfdt01/init.c
> index 1918505ffe..82592da316 100644
> --- a/testsuites/libtests/libfdt01/init.c
> +++ b/testsuites/libtests/libfdt01/init.c
> @@ -123,11 +123,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/malloc02/init.c b/testsuites/libtests/malloc02/init.c
> index 6db32478e7..7a4e656daa 100644
> --- a/testsuites/libtests/malloc02/init.c
> +++ b/testsuites/libtests/malloc02/init.c
> @@ -42,7 +42,8 @@ rtems_task Init(
> rtems_id timer;
> void *pointer2;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "malloc memory to free from ISR" );
> Pointer1 = malloc( 20 );
> @@ -75,7 +76,8 @@ rtems_task Init(
> pointer2 = malloc(20);
> rtems_test_assert( pointer2 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/libtests/malloc03/init.c b/testsuites/libtests/malloc03/init.c
> index 9e2b04d2a0..efd524572e 100644
> --- a/testsuites/libtests/malloc03/init.c
> +++ b/testsuites/libtests/malloc03/init.c
> @@ -25,13 +25,15 @@ rtems_task Init(
> {
> void *p1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> p1 = __builtin_frame_address(0);
> printf("Attempt to free stack memory\n");
> free( p1 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/malloc04/init.c b/testsuites/libtests/malloc04/init.c
> index 632ea28fc4..a50fd12b53 100644
> --- a/testsuites/libtests/malloc04/init.c
> +++ b/testsuites/libtests/malloc04/init.c
> @@ -81,7 +81,8 @@ rtems_task Init(
> Heap_Area area;
> void *p;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Safe information on real heap */
> real_heap = malloc_get_heap_pointer();
> @@ -168,7 +169,8 @@ rtems_task Init(
> /* Restore information on real heap */
> malloc_set_heap_pointer( real_heap );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/malloctest/init.c b/testsuites/libtests/malloctest/init.c
> index 6be6c1c25d..0b823b32ed 100644
> --- a/testsuites/libtests/malloctest/init.c
> +++ b/testsuites/libtests/malloctest/init.c
> @@ -1251,7 +1251,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
> status = rtems_clock_set( &time );
> diff --git a/testsuites/libtests/malloctest/task1.c b/testsuites/libtests/malloctest/task1.c
> index 753a74e77a..41fcdbd5e7 100644
> --- a/testsuites/libtests/malloctest/task1.c
> +++ b/testsuites/libtests/malloctest/task1.c
> @@ -42,7 +42,8 @@ rtems_task Task_1_through_5(
> bool malloc_walk_ok;
>
> if ( passes++ > NUM_PASSES ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/math/init.c b/testsuites/libtests/math/init.c
> index a5f6802b00..2a39ac4a25 100644
> --- a/testsuites/libtests/math/init.c
> +++ b/testsuites/libtests/math/init.c
> @@ -55,13 +55,15 @@ int main( void )
> {
> #if __rtems__
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> #endif
>
> domath();
>
> #if __rtems__
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> #endif
> exit( 0 );
> }
> diff --git a/testsuites/libtests/mathf/init.c b/testsuites/libtests/mathf/init.c
> index 143ac63f1a..d40d1aebf6 100644
> --- a/testsuites/libtests/mathf/init.c
> +++ b/testsuites/libtests/mathf/init.c
> @@ -57,13 +57,15 @@ int main( void )
> {
> #if __rtems__
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> #endif
>
> domathf();
>
> #if __rtems__
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> #endif
> exit( 0 );
> }
> diff --git a/testsuites/libtests/mathl/init.c b/testsuites/libtests/mathl/init.c
> index af5eb9b4a5..e8aa9c4217 100644
> --- a/testsuites/libtests/mathl/init.c
> +++ b/testsuites/libtests/mathl/init.c
> @@ -62,13 +62,15 @@ int main( void )
> {
> #if __rtems__
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> #endif
>
> domathl();
>
> #if __rtems__
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> #endif
> exit( 0 );
> }
> diff --git a/testsuites/libtests/md501/init.c b/testsuites/libtests/md501/init.c
> index 678dc0bc0b..9456b4a9f6 100644
> --- a/testsuites/libtests/md501/init.c
> +++ b/testsuites/libtests/md501/init.c
> @@ -233,11 +233,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/mghttpd01/init.c b/testsuites/libtests/mghttpd01/init.c
> index d3f18feb63..27f21e2103 100644
> --- a/testsuites/libtests/mghttpd01/init.c
> +++ b/testsuites/libtests/mghttpd01/init.c
> @@ -253,7 +253,8 @@ static void Init(rtems_task_argument arg)
> {
> int rv = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rv = rtems_bsdnet_initialize_network();
> rtems_test_assert(rv == 0);
> @@ -262,7 +263,8 @@ static void Init(rtems_task_argument arg)
>
> test_mongoose();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/monitor/init.c b/testsuites/libtests/monitor/init.c
> index 15112285d9..deb9a95994 100644
> --- a/testsuites/libtests/monitor/init.c
> +++ b/testsuites/libtests/monitor/init.c
> @@ -52,7 +52,8 @@ rtems_task Init(
> uint32_t index;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> @@ -89,7 +90,8 @@ rtems_task Init(
> status = rtems_task_delete( RTEMS_SELF );
> directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
> } else {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/monitor02/init.c b/testsuites/libtests/monitor02/init.c
> index 22818cc441..d803e03698 100644
> --- a/testsuites/libtests/monitor02/init.c
> +++ b/testsuites/libtests/monitor02/init.c
> @@ -40,7 +40,8 @@ rtems_task Init(
> char *argv[MAX_ARGS];
> char tmp[256];
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for (i=0; i < MAX_ARGS && Commands[i] ; i++) {
> strcpy( tmp, Commands[i] );
> @@ -49,6 +50,7 @@ rtems_task Init(
> rtems_shell_main_monitor(argc, argv);
> }
> }
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/mouse01/init.c b/testsuites/libtests/mouse01/init.c
> index f6efa4ed5b..22281a539e 100644
> --- a/testsuites/libtests/mouse01/init.c
> +++ b/testsuites/libtests/mouse01/init.c
> @@ -131,7 +131,8 @@ rtems_task Init(
> {
> bool more_data;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> open_it();
> register_it();
> @@ -144,7 +145,8 @@ rtems_task Init(
> receive_uid_message();
> } while (more_data);
> close_it();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/libtests/networking01/init.c b/testsuites/libtests/networking01/init.c
> index 02662345b2..adbd52a89e 100644
> --- a/testsuites/libtests/networking01/init.c
> +++ b/testsuites/libtests/networking01/init.c
> @@ -136,9 +136,11 @@ static void test(void)
>
> static rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> test();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/newlib01/init.c b/testsuites/libtests/newlib01/init.c
> index e9cf4d1f22..66fcc2059d 100644
> --- a/testsuites/libtests/newlib01/init.c
> +++ b/testsuites/libtests/newlib01/init.c
> @@ -291,11 +291,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/putenvtest/init.c b/testsuites/libtests/putenvtest/init.c
> index 74cd8de1a8..61f0e3bcee 100644
> --- a/testsuites/libtests/putenvtest/init.c
> +++ b/testsuites/libtests/putenvtest/init.c
> @@ -53,12 +53,14 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "putenv(\"FOO=BAR\") - expected to work" );
> putenv ("FOO=BAR");
> printf ("getenv(\"FOO\") ==> \"%s\"\n", getenv ("FOO"));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/pwdgrp01/init.c b/testsuites/libtests/pwdgrp01/init.c
> index 7e9f77a379..3fce9940ec 100644
> --- a/testsuites/libtests/pwdgrp01/init.c
> +++ b/testsuites/libtests/pwdgrp01/init.c
> @@ -149,11 +149,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/pwdgrp02/init.c b/testsuites/libtests/pwdgrp02/init.c
> index ec2bdf1c3e..8f8ceebfa5 100644
> --- a/testsuites/libtests/pwdgrp02/init.c
> +++ b/testsuites/libtests/pwdgrp02/init.c
> @@ -154,11 +154,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/rbheap01/init.c b/testsuites/libtests/rbheap01/init.c
> index 35114df805..fe2e851e87 100644
> --- a/testsuites/libtests/rbheap01/init.c
> +++ b/testsuites/libtests/rbheap01/init.c
> @@ -505,7 +505,8 @@ static void test_free_merge_left_or_right(bool left)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init_begin_greater_than_end();
> test_init_begin_greater_than_aligned_begin();
> @@ -524,7 +525,8 @@ static void Init(rtems_task_argument arg)
> test_free_merge_left_or_right(true);
> test_free_merge_left_or_right(false);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c
> index a3f2ee10ca..82923a0828 100644
> --- a/testsuites/libtests/rtmonuse/init.c
> +++ b/testsuites/libtests/rtmonuse/init.c
> @@ -37,7 +37,8 @@ rtems_task Init(
> rtems_id rmid;
> rtems_name period;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> period = rtems_build_name( 'I', 'G', 'N', 'R' );
> status = rtems_rate_monotonic_create( period, &rmid );
> diff --git a/testsuites/libtests/rtmonuse/task1.c b/testsuites/libtests/rtmonuse/task1.c
> index b0db7fe4be..7adce7f8c1 100644
> --- a/testsuites/libtests/rtmonuse/task1.c
> +++ b/testsuites/libtests/rtmonuse/task1.c
> @@ -122,7 +122,8 @@ rtems_task Task_1_through_5(
> rtems_rate_monotonic_report_statistics();
>
> puts( "" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/sha/init.c b/testsuites/libtests/sha/init.c
> index bc64edf5d1..35dee4e16c 100644
> --- a/testsuites/libtests/sha/init.c
> +++ b/testsuites/libtests/sha/init.c
> @@ -166,12 +166,14 @@ static void test_sha512(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_sha256();
> test_sha512();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/shell01/init.c b/testsuites/libtests/shell01/init.c
> index 57b4461a93..ccc48e32a0 100644
> --- a/testsuites/libtests/shell01/init.c
> +++ b/testsuites/libtests/shell01/init.c
> @@ -162,11 +162,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/sparsedisk01/init.c b/testsuites/libtests/sparsedisk01/init.c
> index dfb87ecdd5..2bf47cda24 100644
> --- a/testsuites/libtests/sparsedisk01/init.c
> +++ b/testsuites/libtests/sparsedisk01/init.c
> @@ -417,11 +417,13 @@ void test( void )
> static void Init( rtems_task_argument arg )
> {
> (void) arg;
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/spi01/init.c b/testsuites/libtests/spi01/init.c
> index 6f086d4ac6..1e395e7cd1 100644
> --- a/testsuites/libtests/spi01/init.c
> +++ b/testsuites/libtests/spi01/init.c
> @@ -260,11 +260,13 @@ static void Init(rtems_task_argument arg)
> {
> (void)arg;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c
> index 72e3c23731..97796507c6 100644
> --- a/testsuites/libtests/stackchk/init.c
> +++ b/testsuites/libtests/stackchk/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
> status = rtems_clock_set( &time );
> @@ -101,6 +102,7 @@ void Fatal_extension(
> } else if ( error != rtems_build_name( 'T', 'A', '1', ' ' ) ) {
> printk( "unexpected fatal error\n" );
> } else {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
> diff --git a/testsuites/libtests/stackchk01/init.c b/testsuites/libtests/stackchk01/init.c
> index 8e907e6d48..750e5e0e59 100644
> --- a/testsuites/libtests/stackchk01/init.c
> +++ b/testsuites/libtests/stackchk01/init.c
> @@ -25,13 +25,15 @@ rtems_task Init(
> {
> bool blown;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "stack_checker_is_blown - NOT BLOWN" );
> blown = rtems_stack_checker_is_blown();
> rtems_test_assert(!blown);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/stringto01/init.c b/testsuites/libtests/stringto01/init.c
> index eb2e79337a..28f4d87136 100644
> --- a/testsuites/libtests/stringto01/init.c
> +++ b/testsuites/libtests/stringto01/init.c
> @@ -145,7 +145,8 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> test_rtems_string_to_pointer();
> test_rtems_string_to_unsigned_char();
> test_rtems_string_to_int();
> @@ -157,7 +158,8 @@ rtems_task Init(
>
> test_rtems_string_to_float();
> test_rtems_string_to_double();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/syscall01/init.c b/testsuites/libtests/syscall01/init.c
> index e1c2369ca7..fccc8dcc5c 100644
> --- a/testsuites/libtests/syscall01/init.c
> +++ b/testsuites/libtests/syscall01/init.c
> @@ -248,7 +248,8 @@ static void Init(rtems_task_argument arg)
> rtems_status_code sc;
> int rv;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ctx->main_task = rtems_task_self();
>
> @@ -281,7 +282,8 @@ static void Init(rtems_task_argument arg)
> sc = rtems_task_delete(ctx->close_task);
> rtems_test_assert(sc == RTEMS_SUCCESSFUL);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/tar01/init.c b/testsuites/libtests/tar01/init.c
> index 73a5474940..21d5dd47a2 100644
> --- a/testsuites/libtests/tar01/init.c
> +++ b/testsuites/libtests/tar01/init.c
> @@ -289,7 +289,8 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_untar_from_memory();
> test_untar_from_file();
> @@ -297,7 +298,8 @@ rtems_task Init(
> test_untar_unzip_tgz();
> test_untar_unzip_txz();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
>
> diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c
> index 45dfa35a18..23d9736c76 100644
> --- a/testsuites/libtests/tar02/init.c
> +++ b/testsuites/libtests/tar02/init.c
> @@ -126,11 +126,13 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_tarfs_load();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
>
> diff --git a/testsuites/libtests/tar03/init.c b/testsuites/libtests/tar03/init.c
> index 142cdecfdf..1cd80b180f 100644
> --- a/testsuites/libtests/tar03/init.c
> +++ b/testsuites/libtests/tar03/init.c
> @@ -40,11 +40,13 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_tarfs_error();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c
> index 558f095449..8b95e4109c 100644
> --- a/testsuites/libtests/termios/init.c
> +++ b/testsuites/libtests/termios/init.c
> @@ -674,7 +674,8 @@ out:
> if( tcsetattr( fileno( stdin ), TCSADRAIN, &old) < 0 )
> perror("do_raw_input(): tcsetattr() failed: %s\n" );
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> }
>
>
> @@ -722,7 +723,8 @@ Init (rtems_task_argument ignored)
> char c ;
> struct termios orig_termios, test_termios;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_shell_wait_for_input(
> STDIN_FILENO,
> @@ -784,7 +786,8 @@ Init (rtems_task_argument ignored)
> }
> }
> } else {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c
> index 6f5e4f657c..5c14c0ec17 100644
> --- a/testsuites/libtests/termios01/init.c
> +++ b/testsuites/libtests/termios01/init.c
> @@ -849,7 +849,8 @@ static rtems_task Init(
> struct termios t;
> int index = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_termios_baud2index();
> test_termios_baud2number();
> @@ -997,7 +998,8 @@ static rtems_task Init(
> test_set_attributes_error();
> test_set_best_baud();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/termios02/init.c b/testsuites/libtests/termios02/init.c
> index fe16150513..246613d825 100644
> --- a/testsuites/libtests/termios02/init.c
> +++ b/testsuites/libtests/termios02/init.c
> @@ -30,7 +30,8 @@ rtems_task Init(
> char *term_name_p;
> char term_name[32];
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "tcdrain(12) - EBADF" );
> sc = tcdrain(12);
> @@ -138,7 +139,8 @@ rtems_task Init(
> rtems_test_assert( term_name_p == term_name );
> printf( "ctermid ==> %s\n", term_name_p );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
>
> diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c
> index 70ed74d84d..ecfae279d6 100644
> --- a/testsuites/libtests/termios03/init.c
> +++ b/testsuites/libtests/termios03/init.c
> @@ -125,7 +125,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> open_it();
>
> @@ -150,7 +151,8 @@ rtems_task Init(
> puts( "" );
> close_it();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/termios04/init.c b/testsuites/libtests/termios04/init.c
> index ad5bb1379d..bd020f3ac8 100644
> --- a/testsuites/libtests/termios04/init.c
> +++ b/testsuites/libtests/termios04/init.c
> @@ -117,7 +117,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> open_it();
>
> @@ -129,7 +130,8 @@ rtems_task Init(
>
> close_it();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c
> index c02b7a6194..34ee1885ba 100644
> --- a/testsuites/libtests/termios05/init.c
> +++ b/testsuites/libtests/termios05/init.c
> @@ -121,7 +121,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> open_it();
>
> @@ -140,7 +141,8 @@ rtems_task Init(
>
> close_it();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/termios06/init.c b/testsuites/libtests/termios06/init.c
> index 721643de99..d0a3ce8480 100644
> --- a/testsuites/libtests/termios06/init.c
> +++ b/testsuites/libtests/termios06/init.c
> @@ -189,7 +189,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> pppasyncattach();
> open_it();
> @@ -200,7 +201,8 @@ rtems_task Init(
> read_it();
> close_it();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/termios07/init.c b/testsuites/libtests/termios07/init.c
> index 2da5290ae5..37c4c3cd39 100644
> --- a/testsuites/libtests/termios07/init.c
> +++ b/testsuites/libtests/termios07/init.c
> @@ -130,7 +130,8 @@ rtems_task Init(
> {
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "rtems_termios_bufsize( 64, 64, 64 ) - OK" );
> sc = rtems_termios_bufsize ( 64, 64, 64 );
> @@ -156,7 +157,8 @@ rtems_task Init(
>
> close_it();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/termios08/init.c b/testsuites/libtests/termios08/init.c
> index ee5a5c1269..341808291c 100644
> --- a/testsuites/libtests/termios08/init.c
> +++ b/testsuites/libtests/termios08/init.c
> @@ -115,7 +115,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> open_it();
> change_lflag( "non-canonical", ICANON, 0 );
> @@ -143,7 +144,8 @@ rtems_task Init(
>
> close_it();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/libtests/termios09/init.c b/testsuites/libtests/termios09/init.c
> index 62138bc213..bbcff7ada1 100644
> --- a/testsuites/libtests/termios09/init.c
> +++ b/testsuites/libtests/termios09/init.c
> @@ -1151,7 +1151,8 @@ static void Init(rtems_task_argument arg)
> {
> test_context *ctx = &test_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> setup(ctx);
> test_igncr(ctx);
> @@ -1174,7 +1175,8 @@ static void Init(rtems_task_argument arg)
> test_write(ctx);
> test_tx_callback(ctx);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/libtests/top/init.c b/testsuites/libtests/top/init.c
> index 8a824ae194..7e7ab020d3 100644
> --- a/testsuites/libtests/top/init.c
> +++ b/testsuites/libtests/top/init.c
> @@ -63,7 +63,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_time_of_day time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_shell_wait_for_input(
> STDIN_FILENO,
> @@ -72,7 +73,8 @@ rtems_task Init(
> NULL
> );
> if ( status != RTEMS_SUCCESSFUL ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/top/task1.c b/testsuites/libtests/top/task1.c
> index c9e62dffb6..0b022ca396 100644
> --- a/testsuites/libtests/top/task1.c
> +++ b/testsuites/libtests/top/task1.c
> @@ -80,6 +80,7 @@ rtems_task Task_1(
> }
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/top/task2.c b/testsuites/libtests/top/task2.c
> index 5435d5b66a..fe95d36a2d 100644
> --- a/testsuites/libtests/top/task2.c
> +++ b/testsuites/libtests/top/task2.c
> @@ -29,6 +29,7 @@ rtems_task Task_2(
> )
> {
> rtems_cpu_usage_top();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/libtests/tztest/init.c b/testsuites/libtests/tztest/init.c
> index f3085078ed..dfff1d1d56 100644
> --- a/testsuites/libtests/tztest/init.c
> +++ b/testsuites/libtests/tztest/init.c
> @@ -56,7 +56,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 3, 14, 2007, 15, 9, 26, 5 );
> status = rtems_clock_set( &time );
> @@ -68,7 +69,8 @@ rtems_task Init(
>
> tztester();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/libtests/uid01/init.c b/testsuites/libtests/uid01/init.c
> index 99d11f0ed4..729ff852c0 100644
> --- a/testsuites/libtests/uid01/init.c
> +++ b/testsuites/libtests/uid01/init.c
> @@ -102,7 +102,8 @@ rtems_task Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> open_it();
> register_it();
> @@ -116,7 +117,8 @@ rtems_task Init(
> receive_uid_message();
>
> close_it();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/libtests/utf8proc01/init.c b/testsuites/libtests/utf8proc01/init.c
> index 50d75c6338..122fd31ad8 100644
> --- a/testsuites/libtests/utf8proc01/init.c
> +++ b/testsuites/libtests/utf8proc01/init.c
> @@ -250,11 +250,13 @@ static void test ( void )
>
> static void Init ( rtems_task_argument arg )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test ( );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit ( 0 );
> }
> diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h
> index 76e30f5392..82faa8b697 100644
> --- a/testsuites/psxtests/include/pmacros.h
> +++ b/testsuites/psxtests/include/pmacros.h
> @@ -20,7 +20,6 @@
> #include <unistd.h>
>
> #include <tmacros.h>
> -#include <buffer_test_io.h>
>
> /*
> * These help manipulate the "struct tm" form of time
> diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c
> index 2b2fafd0cd..a18f085a06 100644
> --- a/testsuites/psxtests/psx01/init.c
> +++ b/testsuites/psxtests/psx01/init.c
> @@ -32,7 +32,8 @@ void *POSIX_Init(
> pthread_t thread_id;
> struct utsname uts;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* print some system information */
>
> diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c
> index 3aa88fe882..3b9095cb89 100644
> --- a/testsuites/psxtests/psx01/task.c
> +++ b/testsuites/psxtests/psx01/task.c
> @@ -71,7 +71,8 @@ void *Task_1_through_3(
> status = pthread_equal( Init_id, (pthread_t) -1 );
> rtems_test_assert( !status );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c
> index 0d2ab06c7e..c3d939d8ef 100644
> --- a/testsuites/psxtests/psx02/init.c
> +++ b/testsuites/psxtests/psx02/init.c
> @@ -46,7 +46,8 @@ void *POSIX_Init(
> sigset_t mask;
> sigset_t pending_set;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -143,7 +144,8 @@ void *POSIX_Init(
>
> /* exit this thread */
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx02/task.c b/testsuites/psxtests/psx02/task.c
> index e62c338478..56cbb78a48 100644
> --- a/testsuites/psxtests/psx02/task.c
> +++ b/testsuites/psxtests/psx02/task.c
> @@ -39,7 +39,8 @@ void *Task_1_through_3(
> seconds = sleep( 1 );
> rtems_test_assert( !seconds );
> }
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c
> index 5c5383ccfc..86a30d826e 100644
> --- a/testsuites/psxtests/psx03/init.c
> +++ b/testsuites/psxtests/psx03/init.c
> @@ -48,7 +48,8 @@ void *POSIX_Init(
> int signo;
> siginfo_t siginfo;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -201,7 +202,8 @@ void *POSIX_Init(
>
> /* exit this thread */
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c
> index 76c76af55b..7521c3a4a6 100644
> --- a/testsuites/psxtests/psx04/init.c
> +++ b/testsuites/psxtests/psx04/init.c
> @@ -73,7 +73,8 @@ void *POSIX_Init(
> struct timespec timeout;
> siginfo_t info;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -582,7 +583,8 @@ void *POSIX_Init(
>
> /* exit this thread */
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c
> index 70e8d4a67d..39da48938a 100644
> --- a/testsuites/psxtests/psx05/init.c
> +++ b/testsuites/psxtests/psx05/init.c
> @@ -418,7 +418,8 @@ void *POSIX_Init(
>
> Mutex_bad_id = NULL;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_mutex_pshared_init();
> test_mutex_null();
> @@ -994,7 +995,8 @@ void *POSIX_Init(
> printf( "status recursive mutex :%d\n", status );
> rtems_test_assert( !status );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c
> index e077a28597..e4d38c83b1 100644
> --- a/testsuites/psxtests/psx06/init.c
> +++ b/testsuites/psxtests/psx06/init.c
> @@ -42,7 +42,8 @@ void *POSIX_Init(
> unsigned int remaining;
> uint32_t *key_data;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -119,7 +120,8 @@ void *POSIX_Init(
>
> printf( "Destructor invoked %d times\n", Destructor_invoked );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c
> index be5208b32f..0f6d47d6b8 100644
> --- a/testsuites/psxtests/psx07/init.c
> +++ b/testsuites/psxtests/psx07/init.c
> @@ -65,7 +65,8 @@ void *POSIX_Init(
> pthread_attr_t attr;
> pthread_attr_t destroyed_attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -641,7 +642,8 @@ void *POSIX_Init(
> status = pthread_join( Task2_id, NULL );
> posix_service_failed( status, " pthread_join");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c
> index 781ac1ed30..675ca521d2 100644
> --- a/testsuites/psxtests/psx08/init.c
> +++ b/testsuites/psxtests/psx08/init.c
> @@ -24,7 +24,8 @@ void *POSIX_Init(
> int status;
> void *return_pointer;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> diff --git a/testsuites/psxtests/psx08/task3.c b/testsuites/psxtests/psx08/task3.c
> index acbdb9951f..8d51fc1cfb 100644
> --- a/testsuites/psxtests/psx08/task3.c
> +++ b/testsuites/psxtests/psx08/task3.c
> @@ -46,7 +46,8 @@ void *Task_3(
> &Task2_id
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c
> index d9226c9abb..b912c25e9f 100644
> --- a/testsuites/psxtests/psx09/init.c
> +++ b/testsuites/psxtests/psx09/init.c
> @@ -96,7 +96,8 @@ void *POSIX_Init(
> time_t start;
> time_t now;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> CEILING_PRIORITY = sched_get_priority_max( SCHED_SPORADIC );
> HIGH_PRIORITY = sched_get_priority_max( SCHED_SPORADIC ) - 1;
> @@ -231,7 +232,8 @@ void *POSIX_Init(
> sprintf( buffer, " - new priority = %d", get_current_prio( pthread_self() ) );
> print_current_time( "Init: ", buffer );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c
> index ad4e60e385..d24ea78a91 100644
> --- a/testsuites/psxtests/psx10/init.c
> +++ b/testsuites/psxtests/psx10/init.c
> @@ -143,7 +143,8 @@ void *POSIX_Init(
> pthread_cond_t cond;
> struct timespec timeout;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_cond_null();
> test_cond_not_initialized();
> @@ -440,7 +441,8 @@ void *POSIX_Init(
> puts( "Init: sleep - switch to Task_3" );
> sleep( 1 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c
> index 9adde6e25b..af89f5bed5 100644
> --- a/testsuites/psxtests/psx11/init.c
> +++ b/testsuites/psxtests/psx11/init.c
> @@ -31,7 +31,8 @@ void *POSIX_Init(
> int priority_3;
> int priority_4;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -128,7 +129,8 @@ void *POSIX_Init(
> status = pthread_join( Task_id, NULL );
> rtems_test_assert( !status );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c
> index be0b8d6412..a75e8f445c 100644
> --- a/testsuites/psxtests/psx12/init.c
> +++ b/testsuites/psxtests/psx12/init.c
> @@ -121,7 +121,8 @@ static void *POSIX_Init( void *argument )
> struct sched_param schedparam;
> size_t i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ctx = &test_instance;
>
> @@ -224,7 +225,8 @@ static void *POSIX_Init( void *argument )
> rtems_test_assert( ctx->samples[ i ].low / SS_REPL_PERIOD_MS == i + 1 );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psx13/test.c b/testsuites/psxtests/psx13/test.c
> index fc50463e67..a13f8cab39 100644
> --- a/testsuites/psxtests/psx13/test.c
> +++ b/testsuites/psxtests/psx13/test.c
> @@ -649,7 +649,8 @@ int main(
> )
> #endif
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (InitFiles() == TRUE) {
> printf ("\nFiles initialized successfully.\n");
> @@ -718,7 +719,8 @@ int main(
> sync();
> printf ("Done.\n");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
>
> rtems_test_exit(0);
> diff --git a/testsuites/psxtests/psx14/init.c b/testsuites/psxtests/psx14/init.c
> index 070501f065..51ab40420a 100644
> --- a/testsuites/psxtests/psx14/init.c
> +++ b/testsuites/psxtests/psx14/init.c
> @@ -27,7 +27,8 @@ void *POSIX_Init(
> char *ptr;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ptr = rtems_object_get_name( pthread_self(), 128, name );
> printf( "rtems_object_get_name returned (%s) for init thread\n", ptr );
> @@ -62,7 +63,8 @@ void *POSIX_Init(
> );
>
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtests/psx15/init.c b/testsuites/psxtests/psx15/init.c
> index 74fbfb9a45..080b802d60 100644
> --- a/testsuites/psxtests/psx15/init.c
> +++ b/testsuites/psxtests/psx15/init.c
> @@ -68,7 +68,8 @@ void Init(rtems_task_argument arg)
> {
> rtems_status_code sc = RTEMS_SUCCESSFUL;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_task_create(
> rtems_build_name('T', 'S', 'K', '1'),
> @@ -96,7 +97,8 @@ void Init(rtems_task_argument arg)
> sc = rtems_task_start(task_0, suicide_task, 0);
> rtems_test_assert(sc == RTEMS_SUCCESSFUL);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> rtems_test_assert(false);
> diff --git a/testsuites/psxtests/psx16/init.c b/testsuites/psxtests/psx16/init.c
> index 8e20e6d376..e06a22ec4d 100644
> --- a/testsuites/psxtests/psx16/init.c
> +++ b/testsuites/psxtests/psx16/init.c
> @@ -42,7 +42,8 @@ void *POSIX_Init(void *argument)
> pthread_attr_t attr;
> void *join_return;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Index = 5;
>
> @@ -65,7 +66,8 @@ void *POSIX_Init(void *argument)
> rtems_test_assert( *(int *)join_return == 7 );
> puts( "Successfully joined with TestThread" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxaio01/init.c b/testsuites/psxtests/psxaio01/init.c
> index 283507f9cd..af53b02f6f 100644
> --- a/testsuites/psxtests/psxaio01/init.c
> +++ b/testsuites/psxtests/psxaio01/init.c
> @@ -69,7 +69,8 @@ POSIX_Init (void *argument)
> fd = open ("/tmp/aio_fildes", O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
> rtems_test_assert ( fd != -1);
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts (" Init: EBADF TESTS ");
>
> @@ -193,7 +194,8 @@ POSIX_Init (void *argument)
>
> free_aiocb (aiocbp);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> close (fd);
> rtems_test_exit (0);
> diff --git a/testsuites/psxtests/psxaio02/init.c b/testsuites/psxtests/psxaio02/init.c
> index 3c75a365b5..1a1cf7b331 100644
> --- a/testsuites/psxtests/psxaio02/init.c
> +++ b/testsuites/psxtests/psxaio02/init.c
> @@ -75,7 +75,8 @@ POSIX_Init (void *argument)
> status = mkdir ("/tmp", S_IRWXU);
> rtems_test_assert (!status);
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts ("Init: Open files");
>
> @@ -173,7 +174,8 @@ POSIX_Init (void *argument)
> status = aio_cancel (fd[5], aiocbp[6]);
> rtems_test_assert (status == AIO_ALLDONE);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> for (i = 0; i < FD_COUNT; i++)
> {
> diff --git a/testsuites/psxtests/psxaio03/init.c b/testsuites/psxtests/psxaio03/init.c
> index d8a13fa8e4..b9af6c54b7 100644
> --- a/testsuites/psxtests/psxaio03/init.c
> +++ b/testsuites/psxtests/psxaio03/init.c
> @@ -76,7 +76,8 @@ POSIX_Init (void *argument)
> status = mkdir ("/tmp", S_IRWXU);
> rtems_test_assert (!status);
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts (" Init: Open files ");
>
> @@ -129,7 +130,8 @@ POSIX_Init (void *argument)
> puts (" Init: going to sleep again for 5 sec ");
> sleep (5);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> for (i = 0; i < FD_COUNT; i++)
> {
> diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c
> index f9556faf07..948a5380ad 100644
> --- a/testsuites/psxtests/psxalarm01/init.c
> +++ b/testsuites/psxtests/psxalarm01/init.c
> @@ -47,7 +47,8 @@ void *POSIX_Init(
> sigset_t mask;
> struct timeval delta;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* install a signal handler for SIGALRM and unblock it */
>
> @@ -99,7 +100,8 @@ void *POSIX_Init(
> remaining = alarm( 0 );
> rtems_test_assert( remaining == 1 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxautoinit01/init.c b/testsuites/psxtests/psxautoinit01/init.c
> index f94879e60f..cc5ced8747 100644
> --- a/testsuites/psxtests/psxautoinit01/init.c
> +++ b/testsuites/psxtests/psxautoinit01/init.c
> @@ -29,7 +29,8 @@ void *POSIX_Init(
> pthread_mutex_t mutex2 = PTHREAD_MUTEX_INITIALIZER;
> int prioceiling;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* path using mutex get with interrupts disabled */
> puts( "Init - pthread_mutex_lock - auto initialize - OK" );
> @@ -55,7 +56,8 @@ void *POSIX_Init(
> sc = pthread_mutex_destroy( &mutex2 );
> fatal_posix_service_status( sc, 0, "mutex destroy OK" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxautoinit02/init.c b/testsuites/psxtests/psxautoinit02/init.c
> index d1a4d3a400..4e27ce6061 100644
> --- a/testsuites/psxtests/psxautoinit02/init.c
> +++ b/testsuites/psxtests/psxautoinit02/init.c
> @@ -33,7 +33,8 @@ void *POSIX_Init(
> pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
> struct timespec to;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - pthread_cond_broadcast - auto initialize - OK" );
> sc = pthread_cond_broadcast( &cond1 );
> @@ -89,7 +90,8 @@ void *POSIX_Init(
> sc = pthread_cond_destroy( &cond1 );
> fatal_posix_service_status( sc, 0, "cond destroy OK" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxbarrier01/test.c b/testsuites/psxtests/psxbarrier01/test.c
> index 4253b21057..3ef961b7d6 100644
> --- a/testsuites/psxtests/psxbarrier01/test.c
> +++ b/testsuites/psxtests/psxbarrier01/test.c
> @@ -116,7 +116,8 @@ int main(
> int p;
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*************** NULL POINTER CHECKS *****************/
> puts( "pthread_barrierattr_init( NULL ) -- EINVAL" );
> @@ -294,6 +295,7 @@ int main(
> test_barrier_invalid_copy();
>
> /*************** END OF TEST *****************/
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
> diff --git a/testsuites/psxtests/psxcancel/init.c b/testsuites/psxtests/psxcancel/init.c
> index afef141001..09983c1351 100644
> --- a/testsuites/psxtests/psxcancel/init.c
> +++ b/testsuites/psxtests/psxcancel/init.c
> @@ -144,7 +144,8 @@ static void resourceSnapshotCheck( void )
> int old;
> void *exit_value;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = sem_init( &masterSem, 0, 0 );
> rtems_test_assert( sc == 0 );
> @@ -244,7 +245,8 @@ static void resourceSnapshotCheck( void )
>
> resourceSnapshotCheck();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> #if defined(__rtems__)
> rtems_test_exit(EXIT_SUCCESS);
> diff --git a/testsuites/psxtests/psxcancel01/init.c b/testsuites/psxtests/psxcancel01/init.c
> index d87295ccd1..169e9015f4 100644
> --- a/testsuites/psxtests/psxcancel01/init.c
> +++ b/testsuites/psxtests/psxcancel01/init.c
> @@ -111,7 +111,8 @@ void *POSIX_Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_timer_create(
> rtems_build_name( 'T', 'M', '1', ' ' ),
> @@ -123,7 +124,8 @@ void *POSIX_Init(
> doit( SetState_duringISR_TSR, "pthread_setcancelstate" );
> doit( SetType_duringISR_TSR, "pthread_setcanceltype" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> return NULL; /* just so the compiler thinks we returned something */
> }
> diff --git a/testsuites/psxtests/psxchroot01/test.c b/testsuites/psxtests/psxchroot01/test.c
> index 27656ef131..85330c6cb7 100644
> --- a/testsuites/psxtests/psxchroot01/test.c
> +++ b/testsuites/psxtests/psxchroot01/test.c
> @@ -89,7 +89,8 @@ int main(
> #if !fileexists(/two/two.test) echo "SUCCESSFUL"
> */
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = mkdir( "/one", 0777);
> rtems_test_assert( status == 0 );
> @@ -141,6 +142,7 @@ int main(
> status = fileexists( "/two/two.test" );
> printf( "%s on /two/two.test\n", (!status) ? "SUCCESS" : "FAILURE" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxclassic01/init.c b/testsuites/psxtests/psxclassic01/init.c
> index 4711732dc7..e20bcfe031 100644
> --- a/testsuites/psxtests/psxclassic01/init.c
> +++ b/testsuites/psxtests/psxclassic01/init.c
> @@ -196,7 +196,8 @@ static rtems_task Init( rtems_task_argument arg )
> int status;
> void *retval;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> task_id = create_task();
>
> @@ -228,7 +229,8 @@ static rtems_task Init( rtems_task_argument arg )
> rtems_test_assert( status == 0 );
> rtems_test_assert( retval == (void *) 123 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxcleanup/psxcleanup.c b/testsuites/psxtests/psxcleanup/psxcleanup.c
> index 2af4aaf78d..0c22fc072c 100644
> --- a/testsuites/psxtests/psxcleanup/psxcleanup.c
> +++ b/testsuites/psxtests/psxcleanup/psxcleanup.c
> @@ -232,7 +232,8 @@ void *POSIX_Init(
> int status;
> lock_t l;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*************** INITIALIZE ***************/
> initialize_lock_t(&l);
> @@ -253,7 +254,8 @@ void *POSIX_Init(
> sleep(1);
>
> /*************** END OF TEST *****************/
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxcleanup01/init.c b/testsuites/psxtests/psxcleanup01/init.c
> index b5e833b911..c02f909608 100644
> --- a/testsuites/psxtests/psxcleanup01/init.c
> +++ b/testsuites/psxtests/psxcleanup01/init.c
> @@ -117,7 +117,8 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_restart_with_cleanup();
>
> @@ -127,7 +128,8 @@ void *POSIX_Init(
> puts( "Init - pthread_cleanup_pop - do not execute" );
> pthread_cleanup_pop(0);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxcleanup02/init.c b/testsuites/psxtests/psxcleanup02/init.c
> index 3c05fff99e..3e4e619487 100644
> --- a/testsuites/psxtests/psxcleanup02/init.c
> +++ b/testsuites/psxtests/psxcleanup02/init.c
> @@ -24,11 +24,13 @@ const char rtems_test_name[] = "PSXCLEANUP 2";
>
> static void *POSIX_Init(void *arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> main(0, NULL);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxclock/init.c b/testsuites/psxtests/psxclock/init.c
> index 40c224cec4..9f1cc114f6 100644
> --- a/testsuites/psxtests/psxclock/init.c
> +++ b/testsuites/psxtests/psxclock/init.c
> @@ -89,7 +89,8 @@ static rtems_task Init(
> struct tm tm;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> tm_build_time( &tm, TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
>
> @@ -300,7 +301,8 @@ static rtems_task Init(
> }
> #endif
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxclock01/init.c b/testsuites/psxtests/psxclock01/init.c
> index 123774e1c6..d7d3fe1da4 100644
> --- a/testsuites/psxtests/psxclock01/init.c
> +++ b/testsuites/psxtests/psxclock01/init.c
> @@ -20,7 +20,8 @@ void *POSIX_Init(void *argument)
> clock_t start, end;
> int diff = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> start = clock();
> end = 0;
> @@ -33,7 +34,8 @@ void *POSIX_Init(void *argument)
>
> printf("Spun for %d second\n", diff);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxclockrealtime01/init.c b/testsuites/psxtests/psxclockrealtime01/init.c
> index e8337068a2..15bd43c1cf 100644
> --- a/testsuites/psxtests/psxclockrealtime01/init.c
> +++ b/testsuites/psxtests/psxclockrealtime01/init.c
> @@ -575,9 +575,11 @@ const char rtems_test_name[] = "PSXCLOCKREALTIME 1";
>
> static void *POSIX_Init(void *arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> test(&test_instance);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxconcurrency01/init.c b/testsuites/psxtests/psxconcurrency01/init.c
> index 44aeb5f606..8a436f3137 100644
> --- a/testsuites/psxtests/psxconcurrency01/init.c
> +++ b/testsuites/psxtests/psxconcurrency01/init.c
> @@ -26,7 +26,8 @@ void *POSIX_Init(
> {
> int sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init: pthread_getconcurrency - initial value of 0" );
> sc = pthread_getconcurrency();
> @@ -40,7 +41,8 @@ void *POSIX_Init(
> sc = pthread_getconcurrency();
> rtems_test_assert( sc == 2 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxcond01/init.c b/testsuites/psxtests/psxcond01/init.c
> index 69dc5458ca..5517ea1127 100644
> --- a/testsuites/psxtests/psxcond01/init.c
> +++ b/testsuites/psxtests/psxcond01/init.c
> @@ -58,7 +58,8 @@ void *POSIX_Init(
> int sc;
> pthread_t Thread;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - pthread_mutex_init - Mutex1 - OK" );
> sc = pthread_mutex_init( &Mutex1, NULL );
> @@ -83,7 +84,8 @@ void *POSIX_Init(
> sc = pthread_cond_wait( &Condition, &Mutex2 );
> fatal_posix_service_status( sc, EINVAL, "cond_wait EINVAL" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxcond02/init.c b/testsuites/psxtests/psxcond02/init.c
> index aa6d973083..6308b6d641 100644
> --- a/testsuites/psxtests/psxcond02/init.c
> +++ b/testsuites/psxtests/psxcond02/init.c
> @@ -80,13 +80,15 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_exercise_clock_attribute_errors();
>
> test_exercise_clock_attribute();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c
> index 91d6a7a917..9fdb2189ad 100644
> --- a/testsuites/psxtests/psxconfig01/init.c
> +++ b/testsuites/psxtests/psxconfig01/init.c
> @@ -248,7 +248,8 @@ static rtems_task Init(rtems_task_argument argument)
> int i = 0;
> pthread_key_t key;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> memset(posix_name, 'P', sizeof(posix_name) - 1);
>
> @@ -488,7 +489,8 @@ static rtems_task Init(rtems_task_argument argument)
> printf("object creation done\n");
> print_info();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxdevctl01/test.c b/testsuites/psxtests/psxdevctl01/test.c
> index 0fe9d9460b..627cfa1a6c 100644
> --- a/testsuites/psxtests/psxdevctl01/test.c
> +++ b/testsuites/psxtests/psxdevctl01/test.c
> @@ -54,7 +54,8 @@ int main(
> size_t nbyte;
> int dev_info;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "posix_devctl() FIONBIO on stdin return dev_info -- EBADF" );
> fd = 0;
> @@ -75,6 +76,7 @@ int main(
> rtems_test_assert( status == -1 );
> rtems_test_assert( errno == EBADF );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
> diff --git a/testsuites/psxtests/psxeintr_join/init.c b/testsuites/psxtests/psxeintr_join/init.c
> index 725a198c95..9286dc5983 100644
> --- a/testsuites/psxtests/psxeintr_join/init.c
> +++ b/testsuites/psxtests/psxeintr_join/init.c
> @@ -87,7 +87,8 @@ void *POSIX_Init( void *arg )
> pthread_t mainThread;
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> status = sem_init( &GC_suspend_ack_sem, 0, 0);
> rtems_test_assert( status == 0 );
>
> @@ -116,7 +117,8 @@ void *POSIX_Init( void *arg )
> pthread_join( newThread, NULL );
> puts( "Back from pthread_join" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtests/psxenosys/init.c b/testsuites/psxtests/psxenosys/init.c
> index e0927446f9..4c6395947e 100644
> --- a/testsuites/psxtests/psxenosys/init.c
> +++ b/testsuites/psxtests/psxenosys/init.c
> @@ -53,7 +53,8 @@ void *POSIX_Init(
> {
> int sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "lio_listio -- ENOSYS" );
> sc = lio_listio( 0, NULL, 0, NULL );
> @@ -138,7 +139,8 @@ void *POSIX_Init(
> rtems_test_exit( 0 );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c
> index 38caa3f36a..85e5b9ac61 100644
> --- a/testsuites/psxtests/psxfatal_support/init.c
> +++ b/testsuites/psxtests/psxfatal_support/init.c
> @@ -24,7 +24,8 @@ static void print_test_begin_message(void)
>
> if (!done) {
> done = true;
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> }
> }
>
> @@ -94,6 +95,7 @@ void Fatal_extension(
> && !always_set_to_false
> && error == FATAL_ERROR_EXPECTED_ERROR
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
> diff --git a/testsuites/psxtests/psxfchx01/init.c b/testsuites/psxtests/psxfchx01/init.c
> index 82065ca9b2..2aa7f75c01 100644
> --- a/testsuites/psxtests/psxfchx01/init.c
> +++ b/testsuites/psxtests/psxfchx01/init.c
> @@ -31,7 +31,8 @@ rtems_task Init(
> int status = 0;
> int fd = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /****************************************************
> * fchdir tests
> @@ -211,7 +212,8 @@ rtems_task Init(
>
> puts( "End of fchown tests" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/psxtests/psxfile01/test.c b/testsuites/psxtests/psxfile01/test.c
> index 4f53c1de8a..68eb41b0ad 100644
> --- a/testsuites/psxtests/psxfile01/test.c
> +++ b/testsuites/psxtests/psxfile01/test.c
> @@ -159,7 +159,8 @@ int main(
> rtems_status_code rtems_status;
> rtems_time_of_day time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Grab the maximum size of an in-memory file.
> @@ -645,7 +646,8 @@ since new path is not valid");
>
> test_case_reopen_append();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/psxtests/psxfile02/init.c b/testsuites/psxtests/psxfile02/init.c
> index 7736185f35..1069d9ab64 100644
> --- a/testsuites/psxtests/psxfile02/init.c
> +++ b/testsuites/psxtests/psxfile02/init.c
> @@ -119,7 +119,8 @@ rtems_task Init(
> int status;
> int fd;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Simple open case where the file is created.
> @@ -141,7 +142,8 @@ rtems_task Init(
> puts("");
> do_with_fd( 1000, "a too large file descriptor" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxfilelock01/init.c b/testsuites/psxtests/psxfilelock01/init.c
> index 533e6f6488..644b43706c 100644
> --- a/testsuites/psxtests/psxfilelock01/init.c
> +++ b/testsuites/psxtests/psxfilelock01/init.c
> @@ -27,7 +27,8 @@ rtems_task Init(
> FILE *fd;
> int sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Open /testfile" );
> fd = fopen( "/testfile", "w+" );
> @@ -47,7 +48,8 @@ rtems_task Init(
> puts( "funlockfile /testfile" );
> funlockfile( fd );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxgetattrnp01/init.c b/testsuites/psxtests/psxgetattrnp01/init.c
> index 3c7c886e8d..3cae89a578 100644
> --- a/testsuites/psxtests/psxgetattrnp01/init.c
> +++ b/testsuites/psxtests/psxgetattrnp01/init.c
> @@ -188,7 +188,8 @@ void *POSIX_Init(
> struct sched_param param;
> cpu_set_t set;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Initialize thread id */
> Init_id = pthread_self();
> @@ -266,7 +267,8 @@ void *POSIX_Init(
> rtems_test_assert( !sc );
> #endif
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> return NULL; /* just so the compiler thinks we returned something */
> }
> @@ -275,9 +277,11 @@ void *POSIX_Init(
> void *ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts( " pthread_getattr_np NOT supported" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> return NULL; /* just so the compiler thinks we returned something */
> }
> diff --git a/testsuites/psxtests/psxgetrusage01/init.c b/testsuites/psxtests/psxgetrusage01/init.c
> index 8cf4946879..6661e1b5f5 100644
> --- a/testsuites/psxtests/psxgetrusage01/init.c
> +++ b/testsuites/psxtests/psxgetrusage01/init.c
> @@ -45,7 +45,8 @@ rtems_task Init(
> int sc;
> struct rusage usage;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "getrusage( RUSAGE_SELF, NULL ) -- EFAULT" );
> sc = getrusage( RUSAGE_SELF, NULL );
> @@ -77,7 +78,8 @@ rtems_task Init(
> rtems_test_assert( usage.ru_utime.tv_sec == usage.ru_stime.tv_sec );
> rtems_test_assert( usage.ru_utime.tv_usec == usage.ru_stime.tv_usec );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxglobalcon01/init.cc b/testsuites/psxtests/psxglobalcon01/init.cc
> index 154bf0d4fb..a18d466b92 100644
> --- a/testsuites/psxtests/psxglobalcon01/init.cc
> +++ b/testsuites/psxtests/psxglobalcon01/init.cc
> @@ -36,11 +36,13 @@ static A a;
>
> static void *POSIX_Init(void *argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_test_assert(a.i == 1);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxglobalcon02/init.cc b/testsuites/psxtests/psxglobalcon02/init.cc
> index 0ce5bdcea0..13bb1f1f32 100644
> --- a/testsuites/psxtests/psxglobalcon02/init.cc
> +++ b/testsuites/psxtests/psxglobalcon02/init.cc
> @@ -38,7 +38,8 @@ static bool rtems_init_done;
>
> extern "C" void Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_test_assert(a.i == 1);
>
> @@ -53,7 +54,8 @@ static void *POSIX_Init(void *argument)
> rtems_test_assert(rtems_init_done);
> rtems_test_assert(a.i == 1);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxid01/init.c b/testsuites/psxtests/psxid01/init.c
> index 6935db7189..4196c1bd25 100644
> --- a/testsuites/psxtests/psxid01/init.c
> +++ b/testsuites/psxtests/psxid01/init.c
> @@ -184,7 +184,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_gid();
> puts( "" );
> @@ -197,7 +198,8 @@ rtems_task Init(
>
> test_getlogin();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psximfs01/init.c b/testsuites/psxtests/psximfs01/init.c
> index 5a8845f1c6..31dfdcf151 100644
> --- a/testsuites/psxtests/psximfs01/init.c
> +++ b/testsuites/psxtests/psximfs01/init.c
> @@ -220,7 +220,8 @@ rtems_task Init(
> char buf [1];
> ssize_t n;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for (i=0 ; i<sizeof(Buffer) ; i++ )
> Buffer[i] = (uint8_t) i;
> @@ -262,7 +263,8 @@ rtems_task Init(
> close_it();
> unlink_it();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psximfs02/init.c b/testsuites/psxtests/psximfs02/init.c
> index 0383762e5c..7fe220aeb7 100644
> --- a/testsuites/psxtests/psximfs02/init.c
> +++ b/testsuites/psxtests/psximfs02/init.c
> @@ -55,7 +55,8 @@ rtems_task Init(
> int i;
> struct stat stat_buf;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Creating directory /dir00" );
> status = mkdir( "/dir00", S_IRWXU );
> @@ -194,7 +195,8 @@ rtems_task Init(
> status = chown( "/fifo", 0, 0 );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxintrcritical01/init.c b/testsuites/psxtests/psxintrcritical01/init.c
> index 9830c41b71..376fac8e39 100644
> --- a/testsuites/psxtests/psxintrcritical01/init.c
> +++ b/testsuites/psxtests/psxintrcritical01/init.c
> @@ -54,7 +54,8 @@ rtems_task Init(
> {
> int sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Trying to generate timer fire from ISR while firing" );
> puts( "Init - Variation is: " TEST_STRING );
> @@ -76,7 +77,8 @@ rtems_task Init(
>
> interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxitimer/init.c b/testsuites/psxtests/psxitimer/init.c
> index 8292b6ebe7..93179939bf 100644
> --- a/testsuites/psxtests/psxitimer/init.c
> +++ b/testsuites/psxtests/psxitimer/init.c
> @@ -28,7 +28,8 @@ void *POSIX_Init(
> struct itimerval itimer;
> struct itimerval otimer;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* test getitimer stub */
> puts( "getitimer -- bad which - EINVAL " );
> @@ -76,7 +77,8 @@ void *POSIX_Init(
> status = setitimer( ITIMER_PROF, &itimer, &otimer );
> rtems_test_assert( status == -1 && errno == ENOSYS );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c
> index 6b8f57eccc..f2aa515105 100644
> --- a/testsuites/psxtests/psxkey01/init.c
> +++ b/testsuites/psxtests/psxkey01/init.c
> @@ -30,7 +30,8 @@ rtems_task Init(rtems_task_argument argument)
> {
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* get id of this thread */
>
> @@ -43,6 +44,7 @@ rtems_task Init(rtems_task_argument argument)
> status = pthread_key_create( &Key_id[0], Key_destructor );
> fatal_directive_check_status_only( status, 0, "OK" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c
> index 6c6a3a0be5..ce62444340 100644
> --- a/testsuites/psxtests/psxkey02/init.c
> +++ b/testsuites/psxtests/psxkey02/init.c
> @@ -32,7 +32,8 @@ rtems_task Init(rtems_task_argument ignored)
> void *greedy;
> void *value;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> greedy = rtems_workspace_greedy_allocate( NULL, 0 );
> rtems_resource_snapshot_take( &snapshot );
> @@ -73,7 +74,8 @@ rtems_task Init(rtems_task_argument ignored)
>
> rtems_workspace_greedy_free( greedy );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c
> index 6d57b28b86..e04ef69530 100644
> --- a/testsuites/psxtests/psxkey03/init.c
> +++ b/testsuites/psxtests/psxkey03/init.c
> @@ -52,7 +52,8 @@ rtems_task Init(rtems_task_argument ignored)
> int sc;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Key with NULL destructor
> @@ -118,7 +119,8 @@ rtems_task Init(rtems_task_argument ignored)
> sc = pthread_key_delete( Key );
> rtems_test_assert( sc == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey04/init.c b/testsuites/psxtests/psxkey04/init.c
> index 34e52c8aab..bc7b0a4ff4 100644
> --- a/testsuites/psxtests/psxkey04/init.c
> +++ b/testsuites/psxtests/psxkey04/init.c
> @@ -74,7 +74,8 @@ rtems_task Init( rtems_task_argument ignored )
> rtems_status_code rc;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - pthread_key_create - OK" );
> sc = pthread_key_create( &Key, NULL );
> @@ -117,7 +118,8 @@ rtems_task Init( rtems_task_argument ignored )
> sc = pthread_key_delete( Key );
> rtems_test_assert( sc == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey05/init.c b/testsuites/psxtests/psxkey05/init.c
> index e849e7bae5..206131d78d 100644
> --- a/testsuites/psxtests/psxkey05/init.c
> +++ b/testsuites/psxtests/psxkey05/init.c
> @@ -28,7 +28,8 @@ rtems_task Init( rtems_task_argument ignored )
> int sc, *value;
> int Data_array[2] = {1, 2};
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - pthread key1 create - OK" );
> sc = pthread_key_create( &key1, NULL );
> @@ -70,7 +71,8 @@ rtems_task Init( rtems_task_argument ignored )
> sc = pthread_key_delete( key2 );
> rtems_test_assert( sc == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey06/init.c b/testsuites/psxtests/psxkey06/init.c
> index 2b64c471c7..357a9784cd 100644
> --- a/testsuites/psxtests/psxkey06/init.c
> +++ b/testsuites/psxtests/psxkey06/init.c
> @@ -140,7 +140,8 @@ static rtems_task Init( rtems_task_argument ignored )
> int sc;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Thread_Master = rtems_task_self();
>
> @@ -221,7 +222,8 @@ static rtems_task Init( rtems_task_argument ignored )
> sc = pthread_key_delete( key3 );
> rtems_test_assert( sc == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey07/init.c b/testsuites/psxtests/psxkey07/init.c
> index ffe4d5ada4..5c8bfb3300 100644
> --- a/testsuites/psxtests/psxkey07/init.c
> +++ b/testsuites/psxtests/psxkey07/init.c
> @@ -69,7 +69,8 @@ rtems_task Init(rtems_task_argument argument)
>
> all_thread_created = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Mutex 1 create - OK" );
> sc = pthread_mutex_init( &mutex1, NULL );
> @@ -184,7 +185,8 @@ rtems_task Init(rtems_task_argument argument)
> sc = pthread_cond_destroy( &set_condition_var );
> rtems_test_assert( !sc );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey08/init.c b/testsuites/psxtests/psxkey08/init.c
> index 3b8bdae001..40bee72067 100644
> --- a/testsuites/psxtests/psxkey08/init.c
> +++ b/testsuites/psxtests/psxkey08/init.c
> @@ -66,7 +66,8 @@ static rtems_task Init(rtems_task_argument arg)
>
> all_thread_created = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> rtems_resource_snapshot_take(&snapshot);
>
> puts( "Init - Semaphore 1 create - OK" );
> @@ -160,7 +161,8 @@ static rtems_task Init(rtems_task_argument arg)
> rtems_test_assert( sc == RTEMS_SUCCESSFUL );
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey09/init.c b/testsuites/psxtests/psxkey09/init.c
> index 472e90c907..e27e1eaf0b 100644
> --- a/testsuites/psxtests/psxkey09/init.c
> +++ b/testsuites/psxtests/psxkey09/init.c
> @@ -54,7 +54,8 @@ rtems_task Init( rtems_task_argument ignored )
> int sc;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - pthread key create with destructor - OK" );
> sc = pthread_key_create( &key, destructor );
> @@ -87,7 +88,8 @@ rtems_task Init( rtems_task_argument ignored )
> sc = pthread_key_delete( key );
> rtems_test_assert( sc == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxkey10/init.c b/testsuites/psxtests/psxkey10/init.c
> index 6273f1d899..9b1429f786 100644
> --- a/testsuites/psxtests/psxkey10/init.c
> +++ b/testsuites/psxtests/psxkey10/init.c
> @@ -59,7 +59,8 @@ rtems_task Init( rtems_task_argument ignored )
> int sc;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - pthread key create with destructor - OK" );
> sc = pthread_key_create( &key, destructor );
> @@ -92,7 +93,8 @@ rtems_task Init( rtems_task_argument ignored )
> /* sc = pthread_key_delete( key ); */
> /* rtems_test_assert( sc == 0 ); */
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxmmap01/init.c b/testsuites/psxtests/psxmmap01/init.c
> index e3e8b9ac60..6a0999423a 100644
> --- a/testsuites/psxtests/psxmmap01/init.c
> +++ b/testsuites/psxtests/psxmmap01/init.c
> @@ -310,7 +310,8 @@ void *POSIX_Init(
> {
> int rv;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rv = IMFS_make_generic_node(
> &test_driver_name[0],
> @@ -337,7 +338,8 @@ void *POSIX_Init(
> puts( "Init: mmap - /dev/zero shared" );
> mmap_dev_zero_shared();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> return 0;
> diff --git a/testsuites/psxtests/psxmount/test.c b/testsuites/psxtests/psxmount/test.c
> index 57f43db9a8..4e3060f1e2 100644
> --- a/testsuites/psxtests/psxmount/test.c
> +++ b/testsuites/psxtests/psxmount/test.c
> @@ -92,7 +92,8 @@ int main(
> static const char my_link [] = "/c/y/my_link";
> static const char mount_point [] = "/c/y/my_mount_point";
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Change directory to the root and create files under
> @@ -468,6 +469,7 @@ int main(
> rtems_test_assert( status == -1 );
> rtems_test_assert( errno == ENOENT );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c
> index 3f34d39cef..7a079ea28e 100644
> --- a/testsuites/psxtests/psxmsgq01/init.c
> +++ b/testsuites/psxtests/psxmsgq01/init.c
> @@ -1339,7 +1339,8 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> validate_mq_open_error_codes( );
> open_test_queues();
> @@ -1359,7 +1360,8 @@ void *POSIX_Init(
> verify_mq_receive();
> verify_mq_send();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c
> index 290663d22d..0af08c169e 100644
> --- a/testsuites/psxtests/psxmsgq02/init.c
> +++ b/testsuites/psxtests/psxmsgq02/init.c
> @@ -37,7 +37,8 @@ void *POSIX_Init(
> struct mq_attr attr;
> mqd_t mq;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
>
> /* set the time of day, and print our buffer in multiple ways */
> @@ -57,7 +58,8 @@ void *POSIX_Init(
> mq = mq_open( Get_Longest_Name(), O_CREAT, 0x777, &attr );
> fatal_posix_service_status_errno(mq, ENOMEM, "no workspace available");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxmsgq03/init.c b/testsuites/psxtests/psxmsgq03/init.c
> index 14644420c8..2bb6456ba9 100644
> --- a/testsuites/psxtests/psxmsgq03/init.c
> +++ b/testsuites/psxtests/psxmsgq03/init.c
> @@ -52,7 +52,8 @@ void *POSIX_Init(
> rtems_id timer;
> rtems_status_code rc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> attr.mq_maxmsg = 1;
> attr.mq_msgsize = sizeof(int);
> @@ -108,7 +109,8 @@ void *POSIX_Init(
>
> puts( "Init - mq_send from ISR returned correct status" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxmsgq04/init.c b/testsuites/psxtests/psxmsgq04/init.c
> index 07bd5ef87b..f8cf3fc931 100644
> --- a/testsuites/psxtests/psxmsgq04/init.c
> +++ b/testsuites/psxtests/psxmsgq04/init.c
> @@ -40,7 +40,8 @@ void *POSIX_Init(
> bool sb;
> const char *name;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> attr.mq_maxmsg = 1;
> attr.mq_msgsize = sizeof(int);
> @@ -116,7 +117,8 @@ void *POSIX_Init(
> perror( "mq_close failed" );
> rtems_test_assert( sc == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxmutexattr01/init.c b/testsuites/psxtests/psxmutexattr01/init.c
> index b65eeefccd..fd73e3f5a5 100644
> --- a/testsuites/psxtests/psxmutexattr01/init.c
> +++ b/testsuites/psxtests/psxmutexattr01/init.c
> @@ -47,7 +47,8 @@ void *POSIX_Init(
> int type;
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> #if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
> puts( "Init - pthread_mutexattr_gettype - attr NULL - EINVAL" );
> @@ -105,7 +106,8 @@ void *POSIX_Init(
> puts( "POSIX Mutex Attribute Type Not Supported in Tools" );
> #endif
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxobj01/init.c b/testsuites/psxtests/psxobj01/init.c
> index ca1fbc52ee..c17ff04345 100644
> --- a/testsuites/psxtests/psxobj01/init.c
> +++ b/testsuites/psxtests/psxobj01/init.c
> @@ -36,7 +36,8 @@ rtems_task Init(
> size_t name_len;
> bool bc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* very fake object class to test with */
> _Objects_Initialize_information(
> @@ -83,7 +84,8 @@ rtems_task Init(
> bc = _Objects_Set_name( &TestClass, &_Thread_Get_executing()->Object, name );
> rtems_test_assert( bc == false );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxonce01/init.c b/testsuites/psxtests/psxonce01/init.c
> index 1c90769d38..57346afb45 100644
> --- a/testsuites/psxtests/psxonce01/init.c
> +++ b/testsuites/psxtests/psxonce01/init.c
> @@ -40,7 +40,8 @@ rtems_task Init(rtems_task_argument argument)
> int status;
> pthread_once_t once = PTHREAD_ONCE_INIT;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init: pthread_once - EINVAL (NULL once_control)" );
> status = pthread_once( NULL, Test_init_routine );
> @@ -66,6 +67,7 @@ rtems_task Init(rtems_task_argument argument)
> status = pthread_once( &nesting_once, Test_init_routine_nesting );
> rtems_test_assert( !status );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/psxtests/psxpasswd01/init.c b/testsuites/psxtests/psxpasswd01/init.c
> index 2845a47a2d..52e13067cf 100644
> --- a/testsuites/psxtests/psxpasswd01/init.c
> +++ b/testsuites/psxtests/psxpasswd01/init.c
> @@ -69,7 +69,8 @@ rtems_task Init(
> struct passwd *pw;
> struct group *gr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* getpwent */
> puts( "Init - getpwent() -- OK, result should be NULL" );
> @@ -171,7 +172,8 @@ rtems_task Init(
> puts( "Init - endgrent() -- OK" );
> endgrent();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/psxtests/psxpasswd02/init.c b/testsuites/psxtests/psxpasswd02/init.c
> index dc2fa3c189..936b286392 100644
> --- a/testsuites/psxtests/psxpasswd02/init.c
> +++ b/testsuites/psxtests/psxpasswd02/init.c
> @@ -78,7 +78,8 @@ rtems_task Init(
>
> FILE *fp = NULL;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Creating /etc" );
> status = mkdir( "/etc", 0777 );
> @@ -213,7 +214,8 @@ rtems_task Init(
> rtems_test_assert( !gr );
> rtems_test_assert( errno == EINVAL );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/psxtests/psxpipe01/init.c b/testsuites/psxtests/psxpipe01/init.c
> index 6ed4ee2390..1d26e6f6e7 100644
> --- a/testsuites/psxtests/psxpipe01/init.c
> +++ b/testsuites/psxtests/psxpipe01/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> int status = 0;
> void *opaque = NULL;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - attempt to create pipe -- expect EFAULT" );
> status = pipe( NULL );
> @@ -93,7 +94,8 @@ rtems_task Init(
> status |= unlink( "/file01" );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/psxtests/psxrdwrv/test.c b/testsuites/psxtests/psxrdwrv/test.c
> index d9582d8d01..9a87f1fe40 100644
> --- a/testsuites/psxtests/psxrdwrv/test.c
> +++ b/testsuites/psxtests/psxrdwrv/test.c
> @@ -429,7 +429,8 @@ int main(
> )
> #endif
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if ( fillPatternBuffer() != TRUE ) {
> puts("Error filling pattern buffer" );
> @@ -446,6 +447,7 @@ int main(
> }
>
> unlink(TESTFILE);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxreaddir/test.c b/testsuites/psxtests/psxreaddir/test.c
> index c79393160e..bd40369855 100644
> --- a/testsuites/psxtests/psxreaddir/test.c
> +++ b/testsuites/psxtests/psxreaddir/test.c
> @@ -255,7 +255,8 @@ int main(
> struct stat s;
>
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf( "\nchdir to the root directory\n" );
> status = chdir( "/" );
> @@ -533,6 +534,7 @@ int main(
> rtems_test_assert ( status == 0 );
>
> test_across_mount();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxrwlock01/test.c b/testsuites/psxtests/psxrwlock01/test.c
> index 6c85c03893..75088818dd 100644
> --- a/testsuites/psxtests/psxrwlock01/test.c
> +++ b/testsuites/psxtests/psxrwlock01/test.c
> @@ -333,7 +333,8 @@ int main(
> int i;
> struct timespec abstime;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_rwlock_pshared_init();
> test_rwlock_null();
> @@ -707,6 +708,7 @@ int main(
> rtems_test_assert( status == 0 );
>
> /*************** END OF TEST *****************/
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
> diff --git a/testsuites/psxtests/psxsem01/init.c b/testsuites/psxtests/psxsem01/init.c
> index dfc2ed5670..25f4705245 100644
> --- a/testsuites/psxtests/psxsem01/init.c
> +++ b/testsuites/psxtests/psxsem01/init.c
> @@ -340,7 +340,8 @@ void *POSIX_Init(
> struct timespec waittime;
> char failure_msg[80];
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init: sem_init - SUCCESSFUL" );
> status = sem_init(&sem2, 1, 1);
> @@ -611,7 +612,8 @@ void *POSIX_Init(
>
> /* Try adding in unlinking before closing... (can we still open?) */
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxshm01/init.c b/testsuites/psxtests/psxshm01/init.c
> index 4636f9a0af..e14efa9516 100644
> --- a/testsuites/psxtests/psxshm01/init.c
> +++ b/testsuites/psxtests/psxshm01/init.c
> @@ -41,7 +41,8 @@ void *POSIX_Init(
> int err;
> char *name = "/shm";
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init: shm_open" );
> fd = shm_open( name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR );
> @@ -87,7 +88,8 @@ void *POSIX_Init(
> rtems_test_assert( err != -1 );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> return 0;
> diff --git a/testsuites/psxtests/psxshm02/init.c b/testsuites/psxtests/psxshm02/init.c
> index 071f4c4da8..d78c35c98e 100644
> --- a/testsuites/psxtests/psxshm02/init.c
> +++ b/testsuites/psxtests/psxshm02/init.c
> @@ -41,7 +41,8 @@ void *POSIX_Init(
> int err;
> char *name = "/shm";
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init: shm_open" );
> fd = shm_open( name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR );
> @@ -87,7 +88,8 @@ void *POSIX_Init(
> rtems_test_assert( err != -1 );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> return 0;
> diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c
> index 511dd2d637..45ab7da199 100644
> --- a/testsuites/psxtests/psxsignal01/init.c
> +++ b/testsuites/psxtests/psxsignal01/init.c
> @@ -106,7 +106,8 @@ void *POSIX_Init(
> sighandler_t newHandler;
> rtems_interval start, end;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -235,7 +236,8 @@ void *POSIX_Init(
> Signal_occurred = 0;
>
> puts("*** Validate unexpected program termination ***");
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> _POSIX_signals_Abnormal_termination_handler( SIGUSR1 );
> status = sleep( 1 );
>
> diff --git a/testsuites/psxtests/psxsignal02/init.c b/testsuites/psxtests/psxsignal02/init.c
> index 1f9afc9fca..00b61cbbbe 100644
> --- a/testsuites/psxtests/psxsignal02/init.c
> +++ b/testsuites/psxtests/psxsignal02/init.c
> @@ -136,7 +136,8 @@ void *POSIX_Init(
> struct sigaction act;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Signal_occurred = false;
>
> @@ -184,7 +185,8 @@ void *POSIX_Init(
> /* we are just scheduling the signal, not delivering it */
> rtems_test_assert( Signal_occurred == false );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c
> index b51ff36313..541930a4d1 100644
> --- a/testsuites/psxtests/psxsignal03/init.c
> +++ b/testsuites/psxtests/psxsignal03/init.c
> @@ -163,7 +163,8 @@ void *POSIX_Init(
> bool falseArg = false;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts( "Init - Variation is: " TEST_STRING );
>
> Signal_occurred = false;
> @@ -214,7 +215,8 @@ void *POSIX_Init(
> /* we are just sigwait'ing the signal, not delivering it */
> rtems_test_assert( Signal_occurred == true );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxsignal05/init.c b/testsuites/psxtests/psxsignal05/init.c
> index 40db63e4a1..298464b2ef 100644
> --- a/testsuites/psxtests/psxsignal05/init.c
> +++ b/testsuites/psxtests/psxsignal05/init.c
> @@ -60,7 +60,8 @@ void *POSIX_Init(
> siginfo_t info;
> bool bc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> act.sa_handler = NULL;
> act.sa_sigaction = Signal_handler;
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> );
> rtems_test_assert( bc );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxsignal06/init.c b/testsuites/psxtests/psxsignal06/init.c
> index 650a0fa6c5..78349d357a 100644
> --- a/testsuites/psxtests/psxsignal06/init.c
> +++ b/testsuites/psxtests/psxsignal06/init.c
> @@ -77,7 +77,8 @@ void *POSIX_Init(void *argument)
> {
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init: pthread_cond_init - OK" );
> status = pthread_cond_init( &CondVarId, NULL );
> @@ -113,7 +114,8 @@ void *POSIX_Init(void *argument)
>
>
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxspin01/test.c b/testsuites/psxtests/psxspin01/test.c
> index e27db73d78..17124c9655 100644
> --- a/testsuites/psxtests/psxspin01/test.c
> +++ b/testsuites/psxtests/psxspin01/test.c
> @@ -48,7 +48,8 @@ int main(
> pthread_spinlock_t spinlock2;
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ) -- OK" );
> status = pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE );
> @@ -132,6 +133,7 @@ int main(
> status = pthread_spin_destroy( &spinlock );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
> diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c
> index 762e3950f9..6379be4ce3 100644
> --- a/testsuites/psxtests/psxstack01/init.c
> +++ b/testsuites/psxtests/psxstack01/init.c
> @@ -59,7 +59,8 @@ void *POSIX_Init(
> pthread_attr_t attr;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Allocate stack from heap" );
> Stack_Low = malloc(PTHREAD_MINIMUM_STACK_SIZE);
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> sc = nanosleep( &delay_request, NULL );
> rtems_test_assert( !sc );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxstack02/init.c b/testsuites/psxtests/psxstack02/init.c
> index 4fc1476812..26bdfdeccb 100644
> --- a/testsuites/psxtests/psxstack02/init.c
> +++ b/testsuites/psxtests/psxstack02/init.c
> @@ -60,7 +60,8 @@ void *POSIX_Init(void *argument)
> pthread_attr_t attr;
> struct timespec delay_request;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Allocate stack from heap" );
> Stack_Low = malloc(PTHREAD_MINIMUM_STACK_SIZE);
> @@ -87,7 +88,8 @@ void *POSIX_Init(void *argument)
> puts( "pthread_set_stack not supported - SKIPPING TEST CASE" );
> #endif
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c
> index 09ebb9613e..c3d28ab112 100644
> --- a/testsuites/psxtests/psxstat/test.c
> +++ b/testsuites/psxtests/psxstat/test.c
> @@ -827,7 +827,8 @@ int main(
> rtems_time_of_day time;
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
> sc = rtems_clock_set( &time );
> @@ -948,6 +949,7 @@ int main(
>
> test_statvfs();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxstrsignal01/init.c b/testsuites/psxtests/psxstrsignal01/init.c
> index 6c3a37cb52..1c3e383a97 100644
> --- a/testsuites/psxtests/psxstrsignal01/init.c
> +++ b/testsuites/psxtests/psxstrsignal01/init.c
> @@ -93,13 +93,15 @@ void *POSIX_Init(
> void *unused
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> do_test();
> puts("");
> do_test_rt();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxsysconf/init.c b/testsuites/psxtests/psxsysconf/init.c
> index 2dd9018722..b61a891809 100644
> --- a/testsuites/psxtests/psxsysconf/init.c
> +++ b/testsuites/psxtests/psxsysconf/init.c
> @@ -27,7 +27,8 @@ void *POSIX_Init(
> {
> long sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "sysconf -- bad configuration parameter - negative" );
> sc = sysconf( -1 );
> @@ -90,7 +91,8 @@ void *POSIX_Init(
> rtems_test_exit(0);
> #endif
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxthreadname01/init.c b/testsuites/psxtests/psxthreadname01/init.c
> index 20bac2333d..83578e7d67 100644
> --- a/testsuites/psxtests/psxthreadname01/init.c
> +++ b/testsuites/psxtests/psxthreadname01/init.c
> @@ -77,11 +77,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtests/psxtime/test.c b/testsuites/psxtests/psxtime/test.c
> index 8331bef6b0..5f27e73474 100644
> --- a/testsuites/psxtests/psxtime/test.c
> +++ b/testsuites/psxtests/psxtime/test.c
> @@ -212,7 +212,8 @@ int main(
> int i;
> int sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "gettimeofday( NULL, NULL ) - EFAULT" );
> sc = gettimeofday( NULL, NULL );
> @@ -231,6 +232,7 @@ int main(
> i++;
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxtimer01/psxtimer.c b/testsuites/psxtests/psxtimer01/psxtimer.c
> index 032e9f8e6c..b73f1749dc 100644
> --- a/testsuites/psxtests/psxtimer01/psxtimer.c
> +++ b/testsuites/psxtests/psxtimer01/psxtimer.c
> @@ -343,7 +343,8 @@ void *POSIX_Init (
> struct sched_param sch_param; /* schedule parameters */
> struct periodic_params params_a, params_b, params_c, params_c1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> data.updated = FALSE;
>
> @@ -457,6 +458,7 @@ void *POSIX_Init (
>
> sleep(5);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit (0);
> }
> diff --git a/testsuites/psxtests/psxtimer02/psxtimer.c b/testsuites/psxtests/psxtimer02/psxtimer.c
> index e4d6d7d332..d0892554ad 100644
> --- a/testsuites/psxtests/psxtimer02/psxtimer.c
> +++ b/testsuites/psxtests/psxtimer02/psxtimer.c
> @@ -52,7 +52,8 @@ void *POSIX_Init (
> event.sigev_notify = SIGEV_SIGNAL;
> event.sigev_signo = SIGUSR1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "timer_create - bad clock id - EINVAL" );
> status = timer_create( (timer_t) -1, &event, &timer );
> @@ -127,6 +128,7 @@ void *POSIX_Init (
> status = timer_delete( timer );
> fatal_posix_service_status_errno( status, EINVAL, "bad id" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit (0);
> }
> diff --git a/testsuites/psxtests/psxtimes01/init.c b/testsuites/psxtests/psxtimes01/init.c
> index 7e191d0a15..1f83d4f238 100644
> --- a/testsuites/psxtests/psxtimes01/init.c
> +++ b/testsuites/psxtests/psxtimes01/init.c
> @@ -36,7 +36,8 @@ rtems_task Init(
> struct tms end_tm;
> int interval = 5;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "times( NULL ) -- EFAULT" );
> sc = times( NULL );
> @@ -71,7 +72,8 @@ rtems_task Init(
> rtems_test_assert( end_tm.tms_cutime == 0 );
> rtems_test_assert( end_tm.tms_cstime == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c
> index 7a4fb21b99..307d92da73 100644
> --- a/testsuites/psxtests/psxualarm/init.c
> +++ b/testsuites/psxtests/psxualarm/init.c
> @@ -39,7 +39,8 @@ void *POSIX_Init(
> struct sigaction act;
> sigset_t mask;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* set the time of day, and print our buffer in multiple ways */
>
> @@ -101,7 +102,8 @@ void *POSIX_Init(
> result = ualarm( 0, 0 );
> rtems_test_assert( result == 1000000 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
>
> return NULL; /* just so the compiler thinks we returned something */
> diff --git a/testsuites/psxtests/psxusleep/init.c b/testsuites/psxtests/psxusleep/init.c
> index 84eedd98dc..0c226b962b 100644
> --- a/testsuites/psxtests/psxusleep/init.c
> +++ b/testsuites/psxtests/psxusleep/init.c
> @@ -29,7 +29,8 @@ rtems_task Init(
> useconds_t remaining;
> int sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> tm_build_time( &tm, TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
>
> @@ -59,7 +60,8 @@ rtems_task Init(
>
> printf( ctime( &tv.tv_sec ) );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c
> index 06d61e3c98..4a1a274fad 100644
> --- a/testsuites/psxtmtests/psxtmbarrier01/init.c
> +++ b/testsuites/psxtmtests/psxtmbarrier01/init.c
> @@ -73,14 +73,16 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* creating barrier with default properties */
> benchmark_pthread_barrier_init();
> /* destroying barrier */
> benchmark_pthread_barrier_destroy();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c
> index 22e9a56278..6404c540aa 100644
> --- a/testsuites/psxtmtests/psxtmbarrier02/init.c
> +++ b/testsuites/psxtmtests/psxtmbarrier02/init.c
> @@ -52,7 +52,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> pthread_t threadId;
> pthread_barrierattr_t attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c
> index 07df503311..4125e9e273 100644
> --- a/testsuites/psxtmtests/psxtmbarrier03/init.c
> +++ b/testsuites/psxtmtests/psxtmbarrier03/init.c
> @@ -45,7 +45,8 @@ void *POSIX_Init(
> pthread_t threadId;
> benchmark_timer_t end_time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> rtems_test_assert( status == 0 );
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c
> index 5d4885c193..69c3c62008 100644
> --- a/testsuites/psxtmtests/psxtmbarrier04/init.c
> +++ b/testsuites/psxtmtests/psxtmbarrier04/init.c
> @@ -45,7 +45,8 @@ void *Blocker(
> 0,
> 0
> );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> }
> @@ -59,7 +60,8 @@ void *POSIX_Init(
> int policy;
> struct sched_param param;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> rtems_test_assert( status == 0 );
> diff --git a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
> index c0dab16b9d..83b02cf881 100644
> --- a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
> +++ b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
> @@ -32,7 +32,8 @@ void *POSIX_Init(
> sleepTime.tv_sec = 0;
> sleepTime.tv_nsec = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> benchmark_timer_initialize();
> clock_nanosleep( CLOCK_REALTIME, 0, &sleepTime, (struct timespec *) NULL );
> @@ -40,7 +41,8 @@ void *POSIX_Init(
>
> put_time( "nanosleep: yield", end_time, 1, 0, 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
> index 77d4dabc34..bb733f358b 100644
> --- a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
> +++ b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
> @@ -42,7 +42,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -77,7 +78,8 @@ void *POSIX_Init(
> remainder.tv_sec = 0;
> remainder.tv_nsec = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
> index 12e2db96fc..b21afb54e8 100644
> --- a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
> +++ b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
> @@ -42,7 +42,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -82,7 +83,8 @@ void *POSIX_Init(
> remainder.tv_sec = 0;
> remainder.tv_nsec = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c
> index 35fdaed194..845cb4fc2b 100644
> --- a/testsuites/psxtmtests/psxtmcond01/init.c
> +++ b/testsuites/psxtmtests/psxtmcond01/init.c
> @@ -70,12 +70,14 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> benchmark_create_cond_var();
> benchmark_destroy_cond_var();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c
> index ec5a2e9572..2f9ccdc200 100644
> --- a/testsuites/psxtmtests/psxtmcond02/init.c
> +++ b/testsuites/psxtmtests/psxtmcond02/init.c
> @@ -50,13 +50,15 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> pthread_cond_init(&CondID, NULL);
>
> benchmark_signal();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmcond03/init.c b/testsuites/psxtmtests/psxtmcond03/init.c
> index 2f351ad372..22fd53b615 100644
> --- a/testsuites/psxtmtests/psxtmcond03/init.c
> +++ b/testsuites/psxtmtests/psxtmcond03/init.c
> @@ -56,7 +56,8 @@ void *POSIX_Init(
> struct sched_param param;
> int policy;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> rtems_test_assert( status == 0 );
> @@ -94,7 +95,8 @@ void *POSIX_Init(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c
> index b45b24f697..6783190c13 100644
> --- a/testsuites/psxtmtests/psxtmcond04/init.c
> +++ b/testsuites/psxtmtests/psxtmcond04/init.c
> @@ -56,7 +56,8 @@ void *Blocker(
> 0,
> 0
> );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> return NULL;
> }
> @@ -68,7 +69,8 @@ void *POSIX_Init(
> int status;
> pthread_t threadId;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> rtems_test_assert( status == 0 );
> diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c
> index 7791768fa2..a6fa931554 100644
> --- a/testsuites/psxtmtests/psxtmcond05/init.c
> +++ b/testsuites/psxtmtests/psxtmcond05/init.c
> @@ -49,13 +49,15 @@ void *POSIX_Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> pthread_cond_init(&CondID, NULL);
>
> benchmark_broadcast();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmcond06/init.c b/testsuites/psxtmtests/psxtmcond06/init.c
> index 53d7e29ac9..5bf458a773 100644
> --- a/testsuites/psxtmtests/psxtmcond06/init.c
> +++ b/testsuites/psxtmtests/psxtmcond06/init.c
> @@ -60,7 +60,8 @@ void *POSIX_Init(
> struct sched_param param;
> int policy;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Setup variables */
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> @@ -111,7 +112,8 @@ void *POSIX_Init(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtmtests/psxtmcond07/init.c b/testsuites/psxtmtests/psxtmcond07/init.c
> index 305082f371..f7794f98c1 100644
> --- a/testsuites/psxtmtests/psxtmcond07/init.c
> +++ b/testsuites/psxtmtests/psxtmcond07/init.c
> @@ -52,7 +52,8 @@ void *Blocker(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> return NULL;
>
> @@ -68,7 +69,8 @@ void *POSIX_Init(
> pthread_attr_t attr;
> struct sched_param param;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Setup variables */
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c
> index 6cce4545f7..8691b906c0 100644
> --- a/testsuites/psxtmtests/psxtmcond08/init.c
> +++ b/testsuites/psxtmtests/psxtmcond08/init.c
> @@ -62,7 +62,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -127,7 +128,8 @@ void *POSIX_Init(
> int rc;
> struct timeval tp;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rc = gettimeofday(&tp, NULL);
> rtems_test_assert( rc == 0 );
> diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c
> index fc5b8174b0..3a869a594a 100644
> --- a/testsuites/psxtmtests/psxtmkey01/init.c
> +++ b/testsuites/psxtmtests/psxtmkey01/init.c
> @@ -67,7 +67,8 @@ static void benchmark_pthread_key_delete(void)
> void *POSIX_Init(void *argument)
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*key creation, using NULL destructor*/
> benchmark_pthread_key_create();
> @@ -75,7 +76,8 @@ void *POSIX_Init(void *argument)
> /* key deletion*/
> benchmark_pthread_key_delete();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c
> index 268bbfe3a3..348d82263f 100644
> --- a/testsuites/psxtmtests/psxtmkey02/init.c
> +++ b/testsuites/psxtmtests/psxtmkey02/init.c
> @@ -72,7 +72,8 @@ void *POSIX_Init(
> {
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* create the key */
> status = pthread_key_create( &Key, NULL );
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> status = pthread_key_delete( Key );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c
> index ac5ab402a8..d730bb96f1 100644
> --- a/testsuites/psxtmtests/psxtmmq01/init.c
> +++ b/testsuites/psxtmtests/psxtmmq01/init.c
> @@ -258,7 +258,8 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> /* create the first message queue READWRITE */
> benchmark_mq_open(1);
> /* send message using first queue */
> @@ -289,7 +290,8 @@ void *POSIX_Init(
> /* closing the first queue */
> benchmark_mq_close(1);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c
> index 3356113014..f36ffce03f 100644
> --- a/testsuites/psxtmtests/psxtmmutex01/init.c
> +++ b/testsuites/psxtmtests/psxtmmutex01/init.c
> @@ -67,12 +67,14 @@ void *POSIX_Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_mutex_create();
> test_mutex_destroy();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c
> index 34d5713252..2cd6e497be 100644
> --- a/testsuites/psxtmtests/psxtmmutex02/init.c
> +++ b/testsuites/psxtmtests/psxtmmutex02/init.c
> @@ -52,7 +52,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> int status;
> pthread_t threadId;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c
> index bda72ac80e..f889d414be 100644
> --- a/testsuites/psxtmtests/psxtmmutex03/init.c
> +++ b/testsuites/psxtmtests/psxtmmutex03/init.c
> @@ -135,7 +135,8 @@ void *POSIX_Init(
> {
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Create the single Mutex used in all the test case
> @@ -162,7 +163,8 @@ void *POSIX_Init(
> status = pthread_mutex_destroy( &MutexId );
> rtems_test_assert( !status );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c
> index ce439c5eb3..d44ce284c5 100644
> --- a/testsuites/psxtmtests/psxtmmutex04/init.c
> +++ b/testsuites/psxtmtests/psxtmmutex04/init.c
> @@ -52,7 +52,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> int status;
> pthread_t threadId;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c
> index 64f1a5f9fd..5408098f08 100644
> --- a/testsuites/psxtmtests/psxtmmutex05/init.c
> +++ b/testsuites/psxtmtests/psxtmmutex05/init.c
> @@ -46,7 +46,8 @@ void *POSIX_Init(
> pthread_t threadId;
> benchmark_timer_t end_time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> rtems_test_assert( status == 0 );
> @@ -84,7 +85,8 @@ void *POSIX_Init(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c
> index 9314e2d56b..e758f29f2b 100644
> --- a/testsuites/psxtmtests/psxtmmutex06/init.c
> +++ b/testsuites/psxtmtests/psxtmmutex06/init.c
> @@ -48,7 +48,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> return NULL;
> }
> @@ -82,7 +83,8 @@ void *POSIX_Init(
> pthread_attr_t attr;
> struct sched_param param;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Deliberately create the mutex BEFORE the threads. This way the
> diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c
> index b86fe419de..7b76edba22 100644
> --- a/testsuites/psxtmtests/psxtmmutex07/init.c
> +++ b/testsuites/psxtmtests/psxtmmutex07/init.c
> @@ -72,7 +72,8 @@ void *POSIX_Init(
> {
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> /* create mutex*/
> status = pthread_mutex_init( &MutexId, NULL );
> rtems_test_assert( status == 0 );
> @@ -85,7 +86,8 @@ void *POSIX_Init(
> status = pthread_mutex_destroy( &MutexId );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c
> index 24a34ee7fa..8287e0c6fc 100644
> --- a/testsuites/psxtmtests/psxtmnanosleep01/init.c
> +++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c
> @@ -30,7 +30,8 @@ void *POSIX_Init(
> sleepTime.tv_sec = 0;
> sleepTime.tv_nsec = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> benchmark_timer_initialize();
> nanosleep( &sleepTime, (struct timespec *) NULL );
> @@ -38,7 +39,8 @@ void *POSIX_Init(
>
> put_time( "nanosleep: yield", end_time, 1, 0, 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c
> index 97138f0426..ab6590eb4f 100644
> --- a/testsuites/psxtmtests/psxtmnanosleep02/init.c
> +++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c
> @@ -40,7 +40,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -75,7 +76,8 @@ void *POSIX_Init(
> remainder.tv_sec = 0;
> remainder.tv_nsec = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c
> index 4b791e4652..dbf7b2c4ed 100644
> --- a/testsuites/psxtmtests/psxtmrwlock01/init.c
> +++ b/testsuites/psxtmtests/psxtmrwlock01/init.c
> @@ -226,7 +226,8 @@ void *POSIX_Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* initializing rwlock */
> benchmark_pthread_rwlock_init();
> @@ -261,7 +262,8 @@ void *POSIX_Init(
> /* destroying rwlock */
> benchmark_pthread_rwlock_destroy();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c
> index c284b06a95..0d9f14ace8 100644
> --- a/testsuites/psxtmtests/psxtmrwlock02/init.c
> +++ b/testsuites/psxtmtests/psxtmrwlock02/init.c
> @@ -52,7 +52,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -87,7 +88,8 @@ void *POSIX_Init(
> pthread_t threadId;
> pthread_rwlockattr_t attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c
> index da5a721565..7729986731 100644
> --- a/testsuites/psxtmtests/psxtmrwlock03/init.c
> +++ b/testsuites/psxtmtests/psxtmrwlock03/init.c
> @@ -53,7 +53,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -89,7 +90,8 @@ void *POSIX_Init(
> pthread_t threadId;
> pthread_rwlockattr_t attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmrwlock04/init.c b/testsuites/psxtmtests/psxtmrwlock04/init.c
> index c707b00023..c0d0579505 100644
> --- a/testsuites/psxtmtests/psxtmrwlock04/init.c
> +++ b/testsuites/psxtmtests/psxtmrwlock04/init.c
> @@ -52,7 +52,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -88,7 +89,8 @@ void *POSIX_Init(
> pthread_t threadId;
> pthread_rwlockattr_t attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c
> index d42ad8f5a0..05f3bb001f 100644
> --- a/testsuites/psxtmtests/psxtmrwlock05/init.c
> +++ b/testsuites/psxtmtests/psxtmrwlock05/init.c
> @@ -53,7 +53,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -90,7 +91,8 @@ void *POSIX_Init(
> pthread_t threadId;
> pthread_rwlockattr_t attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c
> index 818f2a0e40..ec02467a2f 100644
> --- a/testsuites/psxtmtests/psxtmrwlock06/init.c
> +++ b/testsuites/psxtmtests/psxtmrwlock06/init.c
> @@ -47,7 +47,8 @@ void *POSIX_Init(
> benchmark_timer_t end_time;
> pthread_rwlockattr_t attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> rtems_test_assert( status == 0 );
> @@ -89,7 +90,8 @@ void *POSIX_Init(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c
> index 17634e8c26..8212611f76 100644
> --- a/testsuites/psxtmtests/psxtmrwlock07/init.c
> +++ b/testsuites/psxtmtests/psxtmrwlock07/init.c
> @@ -49,7 +49,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> return NULL;
> }
> @@ -86,7 +87,8 @@ void *POSIX_Init(
> struct sched_param param;
> pthread_rwlockattr_t rw_attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Deliberately create the lock BEFORE the threads. This way the
> diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c
> index 4409b89b81..3335e5d2cf 100644
> --- a/testsuites/psxtmtests/psxtmsem01/init.c
> +++ b/testsuites/psxtmtests/psxtmsem01/init.c
> @@ -166,7 +166,8 @@ static void benchmark_sem_close_second(void)
> void *POSIX_Init(void *argument)
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* creating unnamed semaphore */
> benchmark_sem_init();
> @@ -189,7 +190,8 @@ void *POSIX_Init(void *argument)
> benchmark_sem_close(false);
> benchmark_sem_unlink("sem_unlink: deletes semaphore");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmsem02/init.c b/testsuites/psxtmtests/psxtmsem02/init.c
> index 4f1f4026d9..3026f55cad 100644
> --- a/testsuites/psxtmtests/psxtmsem02/init.c
> +++ b/testsuites/psxtmtests/psxtmsem02/init.c
> @@ -127,7 +127,8 @@ static void benchmark_sem_trywait_not_available(void)
> void *POSIX_Init(void *argument)
> {
> int status;
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* create the semaphore */
> status = sem_init( &sem1, 0, 1 );
> @@ -144,7 +145,8 @@ void *POSIX_Init(void *argument)
> /* try to lock the semaphore, not available */
> benchmark_sem_trywait_not_available();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> /*Destroying the semaphore*/
> status = sem_destroy(&sem1);
> diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c
> index 5696145008..231e1658ef 100644
> --- a/testsuites/psxtmtests/psxtmsem03/init.c
> +++ b/testsuites/psxtmtests/psxtmsem03/init.c
> @@ -56,7 +56,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -87,7 +88,8 @@ void *POSIX_Init(
> int status;
> pthread_t threadId;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c
> index 7f9f46ea05..d8629837d1 100644
> --- a/testsuites/psxtmtests/psxtmsem04/init.c
> +++ b/testsuites/psxtmtests/psxtmsem04/init.c
> @@ -48,7 +48,8 @@ void *POSIX_Init(void *argument)
> pthread_t threadId;
> benchmark_timer_t end_time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = pthread_create( &threadId, NULL, Blocker, NULL );
> rtems_test_assert( status == 0 );
> @@ -87,7 +88,8 @@ void *POSIX_Init(void *argument)
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
>
> return NULL;
> diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c
> index 0d02d5491b..8de19ce953 100644
> --- a/testsuites/psxtmtests/psxtmsem05/init.c
> +++ b/testsuites/psxtmtests/psxtmsem05/init.c
> @@ -53,7 +53,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> return NULL;
> }
> @@ -89,7 +90,8 @@ void *POSIX_Init(
> pthread_attr_t attr;
> struct sched_param param;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Deliberately create the semaphore BEFORE the threads. This way the
> diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c
> index 3ce4e58aa6..9e09d78fc5 100644
> --- a/testsuites/psxtmtests/psxtmsleep01/init.c
> +++ b/testsuites/psxtmtests/psxtmsleep01/init.c
> @@ -28,7 +28,8 @@ void *POSIX_Init(
> {
> benchmark_timer_t end_time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> benchmark_timer_initialize();
> sleep(0);
> @@ -42,7 +43,8 @@ void *POSIX_Init(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c
> index ffc87e2070..98a710aba2 100644
> --- a/testsuites/psxtmtests/psxtmsleep02/init.c
> +++ b/testsuites/psxtmtests/psxtmsleep02/init.c
> @@ -40,7 +40,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> return NULL;
> @@ -62,7 +63,8 @@ void *POSIX_Init(
> int status;
> pthread_t threadId;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c
> index 8ed89862fc..a6238b194b 100644
> --- a/testsuites/psxtmtests/psxtmthread01/init.c
> +++ b/testsuites/psxtmtests/psxtmthread01/init.c
> @@ -49,7 +49,8 @@ void *POSIX_Init(
> void *argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_time_test_measure_operation(
> "pthread_create: no preempt",
> @@ -60,7 +61,8 @@ void *POSIX_Init(
> );
>
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c
> index e7cfd7d724..b61f6b979b 100644
> --- a/testsuites/psxtmtests/psxtmthread02/init.c
> +++ b/testsuites/psxtmtests/psxtmthread02/init.c
> @@ -71,11 +71,13 @@ void *POSIX_Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> benchmark_pthread_create();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c
> index 76146b9c04..61f1aef89a 100644
> --- a/testsuites/psxtmtests/psxtmthread03/init.c
> +++ b/testsuites/psxtmtests/psxtmthread03/init.c
> @@ -50,7 +50,8 @@ void *Low(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> return NULL;
> }
> @@ -79,7 +80,8 @@ void *POSIX_Init(
> int status;
> pthread_t threadId;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
> status = pthread_create( &threadId, NULL, Middle, NULL );
> diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c
> index ed8e4bb9b4..c009411559 100644
> --- a/testsuites/psxtmtests/psxtmthread04/init.c
> +++ b/testsuites/psxtmtests/psxtmthread04/init.c
> @@ -77,12 +77,14 @@ void *POSIX_Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> benchmark_pthread_getschedparam();
> benchmark_pthread_setschedparam();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/psxtmtests/psxtmthread05/init.c b/testsuites/psxtmtests/psxtmthread05/init.c
> index 4203e4b951..6fc306efa4 100644
> --- a/testsuites/psxtmtests/psxtmthread05/init.c
> +++ b/testsuites/psxtmtests/psxtmthread05/init.c
> @@ -67,7 +67,8 @@ void *test_thread(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> //Empty thread used in pthread_create().
> return NULL;
> @@ -78,7 +79,8 @@ void *POSIX_Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> benchmark_pthread_setschedparam();
>
> rtems_test_assert( 1 );
> diff --git a/testsuites/psxtmtests/psxtmthread06/init.c b/testsuites/psxtmtests/psxtmthread06/init.c
> index 7499d98df1..ffa9dc06b1 100644
> --- a/testsuites/psxtmtests/psxtmthread06/init.c
> +++ b/testsuites/psxtmtests/psxtmthread06/init.c
> @@ -68,7 +68,8 @@ void *test_thread(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> //Empty thread used in pthread_create().
> return NULL;
> @@ -79,7 +80,8 @@ void *POSIX_Init(
> )
> {
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> benchmark_pthread_setschedparam();
>
> rtems_test_assert( 1 );
> diff --git a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
> index 3538003a4a..d3bd178891 100644
> --- a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
> +++ b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
> @@ -36,7 +36,8 @@ rtems_task Init( rtems_task_argument ignored )
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sem_attr = RTEMS_INHERIT_PRIORITY | RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY;
>
> @@ -143,7 +144,8 @@ rtems_task Task01( rtems_task_argument ignored )
> tswitch_overhead, /* Overhead of loop and task switches */
> tobtain_overhead
> );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/rhealstone/rhilatency/ilatency.c b/testsuites/rhealstone/rhilatency/ilatency.c
> index 27aa26eeaa..073bd9aa60 100644
> --- a/testsuites/rhealstone/rhilatency/ilatency.c
> +++ b/testsuites/rhealstone/rhilatency/ilatency.c
> @@ -59,7 +59,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (
> _Scheduler_Table[ 0 ].Operations.initialize
> @@ -113,7 +114,8 @@ rtems_task Task_1(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/rhealstone/rhmlatency/mlatency.c b/testsuites/rhealstone/rhmlatency/mlatency.c
> index 89d4d8d1ef..cdd1104968 100644
> --- a/testsuites/rhealstone/rhmlatency/mlatency.c
> +++ b/testsuites/rhealstone/rhmlatency/mlatency.c
> @@ -37,7 +37,8 @@ void Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_message_queue_create(
> rtems_build_name( 'M', 'Q', '1', ' ' ),
> @@ -139,7 +140,8 @@ rtems_task Task02( rtems_task_argument ignored )
> treceive_overhead /* Overhead of recieve call and task switch */
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/rhealstone/rhsemshuffle/semshuffle.c b/testsuites/rhealstone/rhsemshuffle/semshuffle.c
> index 0d1bf9c091..04fb00d673 100644
> --- a/testsuites/rhealstone/rhsemshuffle/semshuffle.c
> +++ b/testsuites/rhealstone/rhsemshuffle/semshuffle.c
> @@ -34,7 +34,8 @@ rtems_task Init( rtems_task_argument ignored )
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sem_attr = RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY;
>
> @@ -150,7 +151,8 @@ rtems_task Task02( rtems_task_argument ignored )
> tswitch_overhead, /* Overhead of loop and task switches */
> 0
> );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> }
> diff --git a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
> index 490f4dcada..441c814b1f 100644
> --- a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
> +++ b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
> @@ -65,7 +65,8 @@ rtems_task Task02( rtems_task_argument ignored )
> tswitch_overhead /* Overhead of task switch back to TA01 */
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -73,7 +74,8 @@ rtems_task Init( rtems_task_argument ignored )
> {
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[0] = rtems_build_name( 'T','A','0','1' );
> status = rtems_task_create(
> diff --git a/testsuites/rhealstone/rhtaskswitch/taskswitch.c b/testsuites/rhealstone/rhtaskswitch/taskswitch.c
> index 0806a67b9e..105f10cea6 100644
> --- a/testsuites/rhealstone/rhtaskswitch/taskswitch.c
> +++ b/testsuites/rhealstone/rhtaskswitch/taskswitch.c
> @@ -42,7 +42,8 @@ rtems_task Task02( rtems_task_argument ignored )
> dir_overhead /* Overhead of rtems_task_wake_after directive */
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -67,7 +68,8 @@ rtems_task Init( rtems_task_argument ignored )
> {
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[0] = rtems_build_name( 'T','A','0','1' );
> status = rtems_task_create(
> diff --git a/testsuites/samples/base_mp/apptask.c b/testsuites/samples/base_mp/apptask.c
> index e54e08afe8..ccdc87aeeb 100644
> --- a/testsuites/samples/base_mp/apptask.c
> +++ b/testsuites/samples/base_mp/apptask.c
> @@ -36,6 +36,7 @@ rtems_task Application_task(
> (void) status;
> printf( "This task was invoked with the node argument (%" PRIdrtems_task_argument ")\n", node );
> printf( "This task has the id of 0x%" PRIxrtems_id "\n", tid );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
> diff --git a/testsuites/samples/base_mp/init.c b/testsuites/samples/base_mp/init.c
> index 901dc83a9b..b2da5cbc17 100644
> --- a/testsuites/samples/base_mp/init.c
> +++ b/testsuites/samples/base_mp/init.c
> @@ -30,7 +30,8 @@ rtems_task Init(
> rtems_id tid;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> printf( "Creating and starting an application task\n" );
> task_name = rtems_build_name( 'T', 'A', '1', ' ' );
> status = rtems_task_create( task_name, 1, RTEMS_MINIMUM_STACK_SIZE,
> diff --git a/testsuites/samples/base_sp/apptask.c b/testsuites/samples/base_sp/apptask.c
> index f450f71467..81f0cfa521 100644
> --- a/testsuites/samples/base_sp/apptask.c
> +++ b/testsuites/samples/base_sp/apptask.c
> @@ -42,6 +42,7 @@ rtems_task Application_task(
> "and has id of 0x%" PRIxrtems_id "\n", a, tid
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
> diff --git a/testsuites/samples/base_sp/init.c b/testsuites/samples/base_sp/init.c
> index b1cb4d90a6..7c780a0c5c 100644
> --- a/testsuites/samples/base_sp/init.c
> +++ b/testsuites/samples/base_sp/init.c
> @@ -31,7 +31,8 @@ rtems_task Init(
> rtems_id tid;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> printf( "Creating and starting an application task\n" );
>
> task_name = rtems_build_name( 'T', 'A', '1', ' ' );
> diff --git a/testsuites/samples/capture/init.c b/testsuites/samples/capture/init.c
> index e87a7beae6..8761790945 100644
> --- a/testsuites/samples/capture/init.c
> +++ b/testsuites/samples/capture/init.c
> @@ -42,7 +42,8 @@ rtems_task Init(
> rtems_mode old_mode;
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_shell_wait_for_input(
> STDIN_FILENO,
> @@ -69,7 +70,8 @@ rtems_task Init(
>
> rtems_task_delete (RTEMS_SELF);
> } else {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> }
> diff --git a/testsuites/samples/cdtest/main.cc b/testsuites/samples/cdtest/main.cc
> index 7aeb884354..8e96e5e108 100644
> --- a/testsuites/samples/cdtest/main.cc
> +++ b/testsuites/samples/cdtest/main.cc
> @@ -47,14 +47,16 @@ static int num_inst = 0;
> static void check_begin_of_test(void)
> {
> if ( num_inst == 0 ) {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> }
> }
>
> static void check_end_of_test(void)
> {
> if ( num_inst == 0 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c
> index 433266a99f..4e24efa9f2 100644
> --- a/testsuites/samples/fileio/init.c
> +++ b/testsuites/samples/fileio/init.c
> @@ -1234,7 +1234,8 @@ Init (rtems_task_argument ignored)
> rtems_id Task_id;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> crypt_add_format(&crypt_md5_format);
> crypt_add_format(&crypt_sha512_format);
> @@ -1261,7 +1262,8 @@ Init (rtems_task_argument ignored)
> status = rtems_task_delete( RTEMS_SELF );
> directive_failed( status, "delete" );
> } else {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/samples/hello/init.c b/testsuites/samples/hello/init.c
> index 34ded37c55..163c2bee6f 100644
> --- a/testsuites/samples/hello/init.c
> +++ b/testsuites/samples/hello/init.c
> @@ -21,9 +21,11 @@ static rtems_task Init(
> )
> {
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> printf( "Hello World\n" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/samples/loopback/init.c b/testsuites/samples/loopback/init.c
> index d537731bba..de410d218d 100644
> --- a/testsuites/samples/loopback/init.c
> +++ b/testsuites/samples/loopback/init.c
> @@ -231,7 +231,8 @@ Init (rtems_task_argument ignored)
> {
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf("\"Network\" initializing!\n");
> rtems_bsdnet_initialize_network();
> @@ -259,6 +260,7 @@ Init (rtems_task_argument ignored)
> spawnTask(clientTask, 120, 6);
>
> rtems_task_wake_after(500);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
> diff --git a/testsuites/samples/nsecs/init.c b/testsuites/samples/nsecs/init.c
> index 59995f1da8..8460f2f347 100644
> --- a/testsuites/samples/nsecs/init.c
> +++ b/testsuites/samples/nsecs/init.c
> @@ -64,7 +64,8 @@ rtems_task Init(
> rtems_time_of_day time;
> int index;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> time.year = 2007;
> time.month = 03;
> @@ -140,7 +141,8 @@ rtems_task Init(
>
> sleep(1);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c
> index f2420baaf6..f8b62d7838 100644
> --- a/testsuites/samples/paranoia/init.c
> +++ b/testsuites/samples/paranoia/init.c
> @@ -36,8 +36,10 @@ rtems_task Init(
> #endif
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> paranoia(1, args);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/samples/pppd/init.c b/testsuites/samples/pppd/init.c
> index 6e04c344de..249abd82c3 100644
> --- a/testsuites/samples/pppd/init.c
> +++ b/testsuites/samples/pppd/init.c
> @@ -40,7 +40,8 @@ rtems_task Init(rtems_task_argument argument)
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_shell_wait_for_input(
> STDIN_FILENO,
> @@ -49,7 +50,8 @@ rtems_task Init(rtems_task_argument argument)
> NULL
> );
> if (status != RTEMS_SUCCESSFUL) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
>
> diff --git a/testsuites/samples/ticker/init.c b/testsuites/samples/ticker/init.c
> index 3f3cbd8359..38bd117fd3 100644
> --- a/testsuites/samples/ticker/init.c
> +++ b/testsuites/samples/ticker/init.c
> @@ -30,7 +30,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_time_of_day time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> time.year = 1988;
> time.month = 12;
> diff --git a/testsuites/samples/ticker/tasks.c b/testsuites/samples/ticker/tasks.c
> index 12e806884d..e5ac24cbab 100644
> --- a/testsuites/samples/ticker/tasks.c
> +++ b/testsuites/samples/ticker/tasks.c
> @@ -37,7 +37,8 @@ rtems_task Test_task(
> for ( ; ; ) {
> status = rtems_clock_get_tod( &time );
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> put_name( Task_name[ task_index ], FALSE );
> diff --git a/testsuites/samples/unlimited/init.c b/testsuites/samples/unlimited/init.c
> index 002a9736e4..387fac01fd 100644
> --- a/testsuites/samples/unlimited/init.c
> +++ b/testsuites/samples/unlimited/init.c
> @@ -30,7 +30,8 @@ rtems_task Init(
> rtems_mode old_mode;
> uint32_t task;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* lower the task priority to allow created tasks to execute */
>
> @@ -49,7 +50,8 @@ rtems_task Init(
> test2();
> test3();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
>
> diff --git a/testsuites/smptests/smp01/init.c b/testsuites/smptests/smp01/init.c
> index c77a192071..08f63f5dab 100644
> --- a/testsuites/smptests/smp01/init.c
> +++ b/testsuites/smptests/smp01/init.c
> @@ -43,7 +43,8 @@ rtems_task Init(
> */
> Loop();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> locked_print_initialize();
>
> @@ -83,7 +84,8 @@ rtems_task Init(
> allDone = false;
> }
> if (allDone) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> }
> diff --git a/testsuites/smptests/smp02/init.c b/testsuites/smptests/smp02/init.c
> index e70eca3182..1ff4de31d4 100644
> --- a/testsuites/smptests/smp02/init.c
> +++ b/testsuites/smptests/smp02/init.c
> @@ -21,7 +21,8 @@ const char rtems_test_name[] = "SMP 2";
>
> static void success(void)
> {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -36,7 +37,8 @@ rtems_task Init(
> rtems_status_code status;
> char str[80];
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> locked_print_initialize();
>
> diff --git a/testsuites/smptests/smp03/init.c b/testsuites/smptests/smp03/init.c
> index 03eddb0eaa..cf869bfbf7 100644
> --- a/testsuites/smptests/smp03/init.c
> +++ b/testsuites/smptests/smp03/init.c
> @@ -21,7 +21,8 @@ const char rtems_test_name[] = "SMP 3";
>
> static void success(void)
> {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -53,7 +54,8 @@ rtems_task Init(
>
> Loop();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> locked_print_initialize();
>
> diff --git a/testsuites/smptests/smp05/init.c b/testsuites/smptests/smp05/init.c
> index 7988861983..c9fa7b3c97 100644
> --- a/testsuites/smptests/smp05/init.c
> +++ b/testsuites/smptests/smp05/init.c
> @@ -27,7 +27,8 @@ rtems_task Test_task(
>
> static void success(void)
> {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -50,7 +51,8 @@ rtems_task Init(
> rtems_status_code status;
>
> locked_print_initialize();
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if ( rtems_get_processor_count() == 1 ) {
> success();
> diff --git a/testsuites/smptests/smp07/init.c b/testsuites/smptests/smp07/init.c
> index 1e356edc93..84d0a5ea23 100644
> --- a/testsuites/smptests/smp07/init.c
> +++ b/testsuites/smptests/smp07/init.c
> @@ -30,7 +30,8 @@ rtems_task Test_task(
>
> static void success(void)
> {
> - TEST_END( );
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -98,7 +99,8 @@ rtems_task Init(
> rtems_id Timer;
>
> locked_print_initialize();
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if ( rtems_get_processor_count() == 1 ) {
> success();
> diff --git a/testsuites/smptests/smp08/init.c b/testsuites/smptests/smp08/init.c
> index 85003929f5..f274a869d6 100644
> --- a/testsuites/smptests/smp08/init.c
> +++ b/testsuites/smptests/smp08/init.c
> @@ -47,7 +47,8 @@ rtems_task Init(
> char ch[4];
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> locked_print_initialize();
>
> diff --git a/testsuites/smptests/smp08/tasks.c b/testsuites/smptests/smp08/tasks.c
> index 40a097d034..8fbabc60f3 100644
> --- a/testsuites/smptests/smp08/tasks.c
> +++ b/testsuites/smptests/smp08/tasks.c
> @@ -35,7 +35,8 @@ rtems_task Test_task(
> status = rtems_clock_get_tod( &time );
> rtems_test_assert( status == RTEMS_SUCCESSFUL );
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/smptests/smp09/init.c b/testsuites/smptests/smp09/init.c
> index 5ebc855c9f..a7f4a60494 100644
> --- a/testsuites/smptests/smp09/init.c
> +++ b/testsuites/smptests/smp09/init.c
> @@ -46,7 +46,8 @@ rtems_task Init(
> rtems_id id;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> locked_print_initialize();
>
> @@ -79,7 +80,8 @@ rtems_task Init(
>
> rtems_cpu_usage_report();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c
> index 46b86eed17..f979a149a9 100644
> --- a/testsuites/smptests/smpaffinity01/init.c
> +++ b/testsuites/smptests/smpaffinity01/init.c
> @@ -210,7 +210,8 @@ static void Init(rtems_task_argument arg)
> {
> int sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Initialize thread id */
> sc = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &Init_id );
> @@ -220,7 +221,8 @@ static void Init(rtems_task_argument arg)
> Validate_getaffinity_errors();
> Validate_affinity();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpatomic01/init.c b/testsuites/smptests/smpatomic01/init.c
> index 593bd02d73..67a9a488e3 100644
> --- a/testsuites/smptests/smpatomic01/init.c
> +++ b/testsuites/smptests/smpatomic01/init.c
> @@ -811,7 +811,8 @@ static void Init(rtems_task_argument arg)
> {
> smpatomic01_context *ctx = &test_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_test_parallel(
> &ctx->base,
> @@ -820,7 +821,8 @@ static void Init(rtems_task_argument arg)
> RTEMS_ARRAY_SIZE(test_jobs)
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpcache01/init.c b/testsuites/smptests/smpcache01/init.c
> index c3e58685b2..35dcfe29e7 100644
> --- a/testsuites/smptests/smpcache01/init.c
> +++ b/testsuites/smptests/smpcache01/init.c
> @@ -280,11 +280,13 @@ static void test_smp_cache_manager( void )
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_smp_cache_manager();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c
> index 259a8869bb..802677e0fa 100644
> --- a/testsuites/smptests/smpcapture01/init.c
> +++ b/testsuites/smptests/smpcapture01/init.c
> @@ -196,7 +196,8 @@ static void Init(rtems_task_argument arg)
> rtems_name to_name = rtems_build_name('I', 'D', 'L', 'E');;
> uint32_t i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_capture_open (5000, NULL);
> rtems_test_assert(sc == RTEMS_SUCCESSFUL);
> @@ -244,7 +245,8 @@ static void Init(rtems_task_argument arg)
> rtems_capture_print_trace_records ( 22, false );
> rtems_capture_print_trace_records ( 22, false );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpcapture02/init.c b/testsuites/smptests/smpcapture02/init.c
> index 9fc820ef6f..9caf4607c1 100644
> --- a/testsuites/smptests/smpcapture02/init.c
> +++ b/testsuites/smptests/smpcapture02/init.c
> @@ -298,7 +298,8 @@ static void Init(rtems_task_argument arg)
> rtems_name name;
> #endif
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Get the number of processors that we are using. */
> cpu_count = rtems_get_processor_count();
> @@ -420,7 +421,8 @@ static void Init(rtems_task_argument arg)
> rtems_capture_release(cpu, read);
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c
> index 8e0d93063c..776390ee1e 100644
> --- a/testsuites/smptests/smpclock01/init.c
> +++ b/testsuites/smptests/smpclock01/init.c
> @@ -157,7 +157,8 @@ static void Init(rtems_task_argument arg)
> {
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -167,7 +168,8 @@ static void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c
> index f20d395697..1f28d97ea5 100644
> --- a/testsuites/smptests/smpfatal01/init.c
> +++ b/testsuites/smptests/smpfatal01/init.c
> @@ -63,7 +63,8 @@ static void fatal_extension(
> assert(state == PER_CPU_STATE_SHUTDOWN);
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> @@ -80,7 +81,8 @@ static rtems_status_code test_driver_init(
> uint32_t cpu_count = rtems_get_processor_count();
> uint32_t cpu;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> assert(rtems_configuration_get_maximum_processors() == MAX_CPUS);
>
> @@ -108,7 +110,8 @@ static rtems_status_code test_driver_init(
>
> per_cpu->state = PER_CPU_STATE_SHUTDOWN;
> } else {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c
> index a16261d1da..128c013e8a 100644
> --- a/testsuites/smptests/smpfatal02/init.c
> +++ b/testsuites/smptests/smpfatal02/init.c
> @@ -65,7 +65,8 @@ static void fatal_extension(
> assert(state == PER_CPU_STATE_SHUTDOWN);
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> } else if ( source == RTEMS_FATAL_SOURCE_SMP ) {
> assert(self != main_cpu);
> assert(code == SMP_FATAL_SHUTDOWN);
> @@ -84,7 +85,8 @@ static rtems_status_code test_driver_init(
> uint32_t cpu_count = rtems_get_processor_count();
> uint32_t cpu;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> assert(rtems_configuration_get_maximum_processors() == MAX_CPUS);
>
> @@ -109,7 +111,8 @@ static rtems_status_code test_driver_init(
> if (cpu_count > 1) {
> rtems_fatal(RTEMS_FATAL_SOURCE_APPLICATION, 0xdeadbeef);
> } else {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/smptests/smpfatal03/init.c b/testsuites/smptests/smpfatal03/init.c
> index 26cc03482b..dca391821c 100644
> --- a/testsuites/smptests/smpfatal03/init.c
> +++ b/testsuites/smptests/smpfatal03/init.c
> @@ -36,7 +36,8 @@ static void Init( rtems_task_argument arg )
> rtems_id timer_id;
> rtems_id sem_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_semaphore_create(
> rtems_build_name('M', 'R', 'S', 'P'),
> @@ -75,7 +76,8 @@ static void fatal_extension(
> && !always_set_to_false
> && code == INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_STICKY_FROM_BAD_STATE
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c
> index 5599e790c4..5a084f3e28 100644
> --- a/testsuites/smptests/smpfatal04/init.c
> +++ b/testsuites/smptests/smpfatal04/init.c
> @@ -37,7 +37,8 @@ static void fatal_extension(
> rtems_fatal_code code
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (
> source == RTEMS_FATAL_SOURCE_SMP
> @@ -50,7 +51,8 @@ static void fatal_extension(
> sc = rtems_scheduler_ident_by_processor(0, &id);
> assert(sc == RTEMS_INCORRECT_STATE);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c
> index b850f922e4..a1e7e3d4d7 100644
> --- a/testsuites/smptests/smpfatal05/init.c
> +++ b/testsuites/smptests/smpfatal05/init.c
> @@ -37,14 +37,16 @@ static void fatal_extension(
> rtems_fatal_code code
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (
> source == RTEMS_FATAL_SOURCE_SMP
> && !always_set_to_false
> && code == SMP_FATAL_MANDATORY_PROCESSOR_NOT_PRESENT
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/smptests/smpfatal06/init.c b/testsuites/smptests/smpfatal06/init.c
> index e18ed2ae74..6a10548cd6 100644
> --- a/testsuites/smptests/smpfatal06/init.c
> +++ b/testsuites/smptests/smpfatal06/init.c
> @@ -26,7 +26,8 @@ static void Init(rtems_task_argument arg)
> {
> rtems_interrupt_level level;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_interrupt_local_disable(level);
> (void) level;
> @@ -44,7 +45,8 @@ static void fatal_extension(
> && !always_set_to_false
> && code == INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c
> index b4400136bb..8a81e2db3e 100644
> --- a/testsuites/smptests/smpfatal08/init.c
> +++ b/testsuites/smptests/smpfatal08/init.c
> @@ -94,14 +94,16 @@ static void fatal_extension(
> rtems_fatal_code code
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (
> source == RTEMS_FATAL_SOURCE_SMP
> && !always_set_to_false
> && code == SMP_FATAL_START_OF_MANDATORY_PROCESSOR_FAILED
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/smptests/smpipi01/init.c b/testsuites/smptests/smpipi01/init.c
> index 9a995c09bd..27a3482408 100644
> --- a/testsuites/smptests/smpipi01/init.c
> +++ b/testsuites/smptests/smpipi01/init.c
> @@ -191,11 +191,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpload01/init.c b/testsuites/smptests/smpload01/init.c
> index da4c91d875..39ccfa1377 100644
> --- a/testsuites/smptests/smpload01/init.c
> +++ b/testsuites/smptests/smpload01/init.c
> @@ -379,11 +379,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smplock01/init.c b/testsuites/smptests/smplock01/init.c
> index 796b0e02dc..504f0e3411 100644
> --- a/testsuites/smptests/smplock01/init.c
> +++ b/testsuites/smptests/smplock01/init.c
> @@ -749,11 +749,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpmigration01/init.c b/testsuites/smptests/smpmigration01/init.c
> index fffeff1871..b04f0241dd 100644
> --- a/testsuites/smptests/smpmigration01/init.c
> +++ b/testsuites/smptests/smpmigration01/init.c
> @@ -224,13 +224,15 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (rtems_get_processor_count() >= 2) {
> test();
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c
> index 2a022d7dea..41f66fe802 100644
> --- a/testsuites/smptests/smpmigration02/init.c
> +++ b/testsuites/smptests/smpmigration02/init.c
> @@ -264,7 +264,8 @@ static void Init(rtems_task_argument arg)
> test_context *ctx = &test_instance;
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -274,7 +275,8 @@ static void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpmrsp01/init.c b/testsuites/smptests/smpmrsp01/init.c
> index b81877114f..173fd51938 100644
> --- a/testsuites/smptests/smpmrsp01/init.c
> +++ b/testsuites/smptests/smpmrsp01/init.c
> @@ -1730,7 +1730,8 @@ static void Init(rtems_task_argument arg)
> uint32_t cpu_count = rtems_get_processor_count();
> uint32_t cpu_index;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -1766,7 +1767,8 @@ static void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpmutex01/init.c b/testsuites/smptests/smpmutex01/init.c
> index 7f64415f89..0f471e555a 100644
> --- a/testsuites/smptests/smpmutex01/init.c
> +++ b/testsuites/smptests/smpmutex01/init.c
> @@ -930,13 +930,15 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (rtems_get_processor_count() >= PART_COUNT) {
> test();
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpmutex02/init.c b/testsuites/smptests/smpmutex02/init.c
> index 7f8d331ef7..04b6bd43d1 100644
> --- a/testsuites/smptests/smpmutex02/init.c
> +++ b/testsuites/smptests/smpmutex02/init.c
> @@ -301,7 +301,8 @@ static void Init(rtems_task_argument arg)
> test_context *ctx;
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> rtems_resource_snapshot_take(&snapshot);
> ctx = &test_instance;
>
> @@ -310,7 +311,8 @@ static void Init(rtems_task_argument arg)
> tear_down(ctx);
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c
> index 0ae6ee9f8f..dc15c9850d 100644
> --- a/testsuites/smptests/smppsxaffinity01/init.c
> +++ b/testsuites/smptests/smppsxaffinity01/init.c
> @@ -138,7 +138,8 @@ void *POSIX_Init(
> void *ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Initialize thread id */
> Init_id = pthread_self();
> @@ -147,7 +148,8 @@ void *POSIX_Init(
> Validate_attrgetaffinity_errors();
> Validate_attr();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> @@ -156,9 +158,11 @@ void *POSIX_Init(
> void *ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts( " POSIX Affinity Methods NOT Supported");
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c
> index 12f91124b3..e3a91181f9 100644
> --- a/testsuites/smptests/smppsxaffinity02/init.c
> +++ b/testsuites/smptests/smppsxaffinity02/init.c
> @@ -204,7 +204,8 @@ void *POSIX_Init(
> void *ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Initialize thread id */
> Init_id = pthread_self();
> @@ -213,7 +214,8 @@ void *POSIX_Init(
> Validate_getaffinity_errors();
> Validate_affinity();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> @@ -222,9 +224,11 @@ void *POSIX_Init(
> void *ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts( " Affinity NOT Supported");
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smppsxmutex01/init.c b/testsuites/smptests/smppsxmutex01/init.c
> index a85cc698d7..0213ab41fe 100644
> --- a/testsuites/smptests/smppsxmutex01/init.c
> +++ b/testsuites/smptests/smppsxmutex01/init.c
> @@ -141,7 +141,8 @@ static void *POSIX_Init(void *arg)
> {
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -149,7 +150,8 @@ static void *POSIX_Init(void *arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smppsxsignal01/init.c b/testsuites/smptests/smppsxsignal01/init.c
> index 695eeb7b80..44db257ba6 100644
> --- a/testsuites/smptests/smppsxsignal01/init.c
> +++ b/testsuites/smptests/smppsxsignal01/init.c
> @@ -163,13 +163,15 @@ static void test(void)
>
> static void *POSIX_Init(void *arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (rtems_get_processor_count() >= 2) {
> test();
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschedaffinity01/init.c b/testsuites/smptests/smpschedaffinity01/init.c
> index 2d4585f3a4..80ff9d40ed 100644
> --- a/testsuites/smptests/smpschedaffinity01/init.c
> +++ b/testsuites/smptests/smpschedaffinity01/init.c
> @@ -144,11 +144,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschedaffinity02/init.c b/testsuites/smptests/smpschedaffinity02/init.c
> index 57fb0b8117..e12020764c 100644
> --- a/testsuites/smptests/smpschedaffinity02/init.c
> +++ b/testsuites/smptests/smpschedaffinity02/init.c
> @@ -198,11 +198,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschedaffinity03/init.c b/testsuites/smptests/smpschedaffinity03/init.c
> index 629fa5d3f1..db3da0401f 100644
> --- a/testsuites/smptests/smpschedaffinity03/init.c
> +++ b/testsuites/smptests/smpschedaffinity03/init.c
> @@ -72,11 +72,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschedaffinity04/init.c b/testsuites/smptests/smpschedaffinity04/init.c
> index 9fb291f1f5..97b257e32b 100644
> --- a/testsuites/smptests/smpschedaffinity04/init.c
> +++ b/testsuites/smptests/smpschedaffinity04/init.c
> @@ -153,11 +153,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c
> index 4c8faaae1c..e5ef25e472 100644
> --- a/testsuites/smptests/smpschedaffinity05/init.c
> +++ b/testsuites/smptests/smpschedaffinity05/init.c
> @@ -213,11 +213,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschededf01/init.c b/testsuites/smptests/smpschededf01/init.c
> index bf9b93c26d..478747579b 100644
> --- a/testsuites/smptests/smpschededf01/init.c
> +++ b/testsuites/smptests/smpschededf01/init.c
> @@ -121,11 +121,13 @@ static void Init(rtems_task_argument arg)
> {
> test_context *ctx = &test_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test(ctx);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschededf02/init.c b/testsuites/smptests/smpschededf02/init.c
> index 03556bdd2b..13c5759cdf 100644
> --- a/testsuites/smptests/smpschededf02/init.c
> +++ b/testsuites/smptests/smpschededf02/init.c
> @@ -350,7 +350,8 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (rtems_get_processor_count() == CPU_COUNT) {
> test();
> @@ -358,7 +359,8 @@ static void Init(rtems_task_argument arg)
> puts("warning: wrong processor count to run the test");
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschededf03/init.c b/testsuites/smptests/smpschededf03/init.c
> index 2e46fdb333..074bc83236 100644
> --- a/testsuites/smptests/smpschededf03/init.c
> +++ b/testsuites/smptests/smpschededf03/init.c
> @@ -134,9 +134,11 @@ static void test(test_context *ctx)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> test(&test_instance);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpschedsem01/init.c b/testsuites/smptests/smpschedsem01/init.c
> index 1aadc4704a..763392c910 100644
> --- a/testsuites/smptests/smpschedsem01/init.c
> +++ b/testsuites/smptests/smpschedsem01/init.c
> @@ -64,11 +64,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpscheduler01/init.c b/testsuites/smptests/smpscheduler01/init.c
> index a33805b72a..e0e22ef6a3 100644
> --- a/testsuites/smptests/smpscheduler01/init.c
> +++ b/testsuites/smptests/smpscheduler01/init.c
> @@ -185,11 +185,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c
> index c64e3d3b4c..abe46d8fdb 100644
> --- a/testsuites/smptests/smpscheduler02/init.c
> +++ b/testsuites/smptests/smpscheduler02/init.c
> @@ -410,7 +410,8 @@ static void Init(rtems_task_argument arg)
> {
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -418,7 +419,8 @@ static void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpscheduler03/test.c b/testsuites/smptests/smpscheduler03/test.c
> index 3f6b9e3fd8..70c539c33e 100644
> --- a/testsuites/smptests/smpscheduler03/test.c
> +++ b/testsuites/smptests/smpscheduler03/test.c
> @@ -548,7 +548,8 @@ void Init(rtems_task_argument arg)
> rtems_status_code sc;
> rtems_id task_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -572,6 +573,7 @@ void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c
> index f31925f1a2..7a5124ff9d 100644
> --- a/testsuites/smptests/smpscheduler04/init.c
> +++ b/testsuites/smptests/smpscheduler04/init.c
> @@ -167,11 +167,13 @@ static void Init(rtems_task_argument arg)
> {
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> rtems_resource_snapshot_take(&snapshot);
> test(&test_instance);
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpsignal01/init.c b/testsuites/smptests/smpsignal01/init.c
> index 966b68ff93..ed789122c6 100644
> --- a/testsuites/smptests/smpsignal01/init.c
> +++ b/testsuites/smptests/smpsignal01/init.c
> @@ -217,7 +217,8 @@ static void Init(rtems_task_argument arg)
> {
> test_context *ctx = &ctx_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ctx->consumer = rtems_task_self();
> ctx->consumer_processor = rtems_get_current_processor();
> @@ -228,7 +229,8 @@ static void Init(rtems_task_argument arg)
> test_two_processors(ctx);
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpstrongapa01/init.c b/testsuites/smptests/smpstrongapa01/init.c
> index aae3ffa56e..99e879e7a8 100644
> --- a/testsuites/smptests/smpstrongapa01/init.c
> +++ b/testsuites/smptests/smpstrongapa01/init.c
> @@ -312,7 +312,8 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (rtems_get_processor_count() == CPU_COUNT) {
> test();
> @@ -320,7 +321,8 @@ static void Init(rtems_task_argument arg)
> puts("warning: wrong processor count to run the test");
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpswitchextension01/init.c b/testsuites/smptests/smpswitchextension01/init.c
> index 31c64dc49a..ae0e5ae22c 100644
> --- a/testsuites/smptests/smpswitchextension01/init.c
> +++ b/testsuites/smptests/smpswitchextension01/init.c
> @@ -223,13 +223,15 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (rtems_get_processor_count() >= 2) {
> test();
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpthreadlife01/init.c b/testsuites/smptests/smpthreadlife01/init.c
> index 489dd954aa..0476f3f634 100644
> --- a/testsuites/smptests/smpthreadlife01/init.c
> +++ b/testsuites/smptests/smpthreadlife01/init.c
> @@ -486,7 +486,8 @@ static void test_operation_with_delete_in_progress(test_op op)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (rtems_get_processor_count() >= CPU_COUNT) {
> test_restart();
> @@ -499,7 +500,8 @@ static void Init(rtems_task_argument arg)
> test_operation_with_delete_in_progress(TEST_OP_EVENT_SYSTEM);
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c
> index ef4ea9b71f..f741e6fb0b 100644
> --- a/testsuites/smptests/smpunsupported01/init.c
> +++ b/testsuites/smptests/smpunsupported01/init.c
> @@ -61,11 +61,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/smptests/smpwakeafter01/init.c b/testsuites/smptests/smpwakeafter01/init.c
> index b259e3b5fc..0f97c0cb65 100644
> --- a/testsuites/smptests/smpwakeafter01/init.c
> +++ b/testsuites/smptests/smpwakeafter01/init.c
> @@ -137,7 +137,8 @@ static void Init(rtems_task_argument arg)
> {
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -145,7 +146,8 @@ static void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp01/init.c b/testsuites/sptests/sp01/init.c
> index 4d73804dbb..1ad32d5bac 100644
> --- a/testsuites/sptests/sp01/init.c
> +++ b/testsuites/sptests/sp01/init.c
> @@ -24,7 +24,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
> status = rtems_clock_set( &time );
> diff --git a/testsuites/sptests/sp01/task1.c b/testsuites/sptests/sp01/task1.c
> index dcf2ba068c..51b37cfe2f 100644
> --- a/testsuites/sptests/sp01/task1.c
> +++ b/testsuites/sptests/sp01/task1.c
> @@ -32,7 +32,8 @@ rtems_task Task_1_through_3(
> directive_failed( status, "rtems_clock_get_tod" );
>
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c
> index d7ff317497..54620dd6b7 100644
> --- a/testsuites/sptests/sp02/init.c
> +++ b/testsuites/sptests/sp02/init.c
> @@ -23,7 +23,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id preempt_task_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'P', 'R', 'M', 'T' ),
> diff --git a/testsuites/sptests/sp02/task1.c b/testsuites/sptests/sp02/task1.c
> index 6abed245a7..1fd475be0e 100644
> --- a/testsuites/sptests/sp02/task1.c
> +++ b/testsuites/sptests/sp02/task1.c
> @@ -63,6 +63,7 @@ rtems_task Task_1(
> status = rtems_task_wake_after( 5 * rtems_clock_get_ticks_per_second() );
> directive_failed( status, "rtems_task_wake_after" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp03/init.c b/testsuites/sptests/sp03/init.c
> index 1f02eb666d..ae4b87ca69 100644
> --- a/testsuites/sptests/sp03/init.c
> +++ b/testsuites/sptests/sp03/init.c
> @@ -23,7 +23,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'T', 'A', '1', ' ' ),
> diff --git a/testsuites/sptests/sp03/task2.c b/testsuites/sptests/sp03/task2.c
> index 9e33c2bf4b..7bce73e544 100644
> --- a/testsuites/sptests/sp03/task2.c
> +++ b/testsuites/sptests/sp03/task2.c
> @@ -32,7 +32,8 @@ rtems_task Task_2(
> directive_failed( status, "rtems_clock_get_tod" );
>
> if ( time.second >= 17 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp04/init.c b/testsuites/sptests/sp04/init.c
> index e7bc79393d..724460d394 100644
> --- a/testsuites/sptests/sp04/init.c
> +++ b/testsuites/sptests/sp04/init.c
> @@ -46,7 +46,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_time_of_day time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> build_time( &time, 12, 31, 1988, 9, 15, 0, 0 );
>
> status = rtems_clock_set( &time );
> diff --git a/testsuites/sptests/sp04/task1.c b/testsuites/sptests/sp04/task1.c
> index eac1bf6d51..f3dc42b0b9 100644
> --- a/testsuites/sptests/sp04/task1.c
> +++ b/testsuites/sptests/sp04/task1.c
> @@ -216,7 +216,8 @@ rtems_task Task_1(
>
> test_no_preempt();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit (0);
> }
> }
> diff --git a/testsuites/sptests/sp05/init.c b/testsuites/sptests/sp05/init.c
> index 7d95ee9775..3db21de875 100644
> --- a/testsuites/sptests/sp05/init.c
> +++ b/testsuites/sptests/sp05/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp05/task1.c b/testsuites/sptests/sp05/task1.c
> index b529768c7e..39bbcb084d 100644
> --- a/testsuites/sptests/sp05/task1.c
> +++ b/testsuites/sptests/sp05/task1.c
> @@ -74,6 +74,7 @@ rtems_task Task_1(
> directive_failed( status, "rtems_task_resume" );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp06/init.c b/testsuites/sptests/sp06/init.c
> index e8379ae8f9..0e62ff6307 100644
> --- a/testsuites/sptests/sp06/init.c
> +++ b/testsuites/sptests/sp06/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_task_priority previous_priority;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp06/task1.c b/testsuites/sptests/sp06/task1.c
> index cc66000c45..1ce39ada05 100644
> --- a/testsuites/sptests/sp06/task1.c
> +++ b/testsuites/sptests/sp06/task1.c
> @@ -34,7 +34,8 @@ rtems_task Task_1(
> pass = argument + 1;
>
> if ( pass == 5 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
> index d5b606d12a..48a981f06b 100644
> --- a/testsuites/sptests/sp07/init.c
> +++ b/testsuites/sptests/sp07/init.c
> @@ -68,7 +68,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Extension_name[ 1 ] = rtems_build_name( 'E', 'X', 'T', '1' );
> Extension_name[ 2 ] = rtems_build_name( 'E', 'X', 'T', '2' );
> diff --git a/testsuites/sptests/sp07/taskexit.c b/testsuites/sptests/sp07/taskexit.c
> index 6066038d49..01238a1603 100644
> --- a/testsuites/sptests/sp07/taskexit.c
> +++ b/testsuites/sptests/sp07/taskexit.c
> @@ -29,6 +29,7 @@ void Task_exit_extension(
> put_name( Task_name[ task_number( running_task->Object.id ) ], TRUE );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c
> index 52f16cf094..f6e7f38444 100644
> --- a/testsuites/sptests/sp08/init.c
> +++ b/testsuites/sptests/sp08/init.c
> @@ -33,7 +33,8 @@ rtems_task Init(
> rtems_mode previous_mode;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* BEGINNING OF RTEMS_ASR */
>
> @@ -287,7 +288,8 @@ rtems_task Init(
>
> /* END OF TEST BEING IN A SYSTEM STATE OTHER THAN UP */
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp11/init.c b/testsuites/sptests/sp11/init.c
> index ee3f2e82e7..e3ce54a8ab 100644
> --- a/testsuites/sptests/sp11/init.c
> +++ b/testsuites/sptests/sp11/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp11/task1.c b/testsuites/sptests/sp11/task1.c
> index 60e569374c..72bb706858 100644
> --- a/testsuites/sptests/sp11/task1.c
> +++ b/testsuites/sptests/sp11/task1.c
> @@ -442,6 +442,7 @@ rtems_test_pause();
> fatal_directive_status( status, RTEMS_UNSATISFIED, "rtems_event_receive" );
> /***** *****/
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c
> index 0b9200440b..880dd29f4b 100644
> --- a/testsuites/sptests/sp12/init.c
> +++ b/testsuites/sptests/sp12/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp12/task5.c b/testsuites/sptests/sp12/task5.c
> index a8dfa333fc..08ce1b0799 100644
> --- a/testsuites/sptests/sp12/task5.c
> +++ b/testsuites/sptests/sp12/task5.c
> @@ -51,6 +51,7 @@ rtems_task Task5(
> );
> puts( "TA5 - SM1 deleted by TA1" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c
> index ffa2d1285d..5343b7869c 100644
> --- a/testsuites/sptests/sp13/init.c
> +++ b/testsuites/sptests/sp13/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
> index c27beda842..88b55617ac 100644
> --- a/testsuites/sptests/sp13/task1.c
> +++ b/testsuites/sptests/sp13/task1.c
> @@ -364,6 +364,7 @@ rtems_test_pause();
> directive_failed( status, "rtems_message_queue_delete" );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp14/init.c b/testsuites/sptests/sp14/init.c
> index b0cedc264e..86f70add76 100644
> --- a/testsuites/sptests/sp14/init.c
> +++ b/testsuites/sptests/sp14/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp14/task2.c b/testsuites/sptests/sp14/task2.c
> index da14dc8ce3..a0765211a4 100644
> --- a/testsuites/sptests/sp14/task2.c
> +++ b/testsuites/sptests/sp14/task2.c
> @@ -50,6 +50,7 @@ rtems_task Task_2(
> status = rtems_task_wake_after(2 * rtems_clock_get_ticks_per_second());
> directive_failed( status, "rtems_task_wake_after" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp15/init.c b/testsuites/sptests/sp15/init.c
> index dcf8f95ace..165b98efb6 100644
> --- a/testsuites/sptests/sp15/init.c
> +++ b/testsuites/sptests/sp15/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
>
> diff --git a/testsuites/sptests/sp15/task1.c b/testsuites/sptests/sp15/task1.c
> index 609d37fc2e..b68a51ea07 100644
> --- a/testsuites/sptests/sp15/task1.c
> +++ b/testsuites/sptests/sp15/task1.c
> @@ -125,6 +125,7 @@ rtems_task Task_1(
> status = rtems_partition_delete( ptid_2 );
> directive_failed( status, "rtems_partition_delete" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp16/init.c b/testsuites/sptests/sp16/init.c
> index 3b8543b7c0..2e734dc944 100644
> --- a/testsuites/sptests/sp16/init.c
> +++ b/testsuites/sptests/sp16/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp16/task1.c b/testsuites/sptests/sp16/task1.c
> index 2df450f653..79b45d55ab 100644
> --- a/testsuites/sptests/sp16/task1.c
> +++ b/testsuites/sptests/sp16/task1.c
> @@ -291,6 +291,7 @@ rtems_test_pause();
> status = rtems_region_delete( Region_id[ 4 ] );
> directive_failed( status, "rtems_region_delete" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp17/init.c b/testsuites/sptests/sp17/init.c
> index 4f7cba8142..a2efbd9367 100644
> --- a/testsuites/sptests/sp17/init.c
> +++ b/testsuites/sptests/sp17/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp17/task1.c b/testsuites/sptests/sp17/task1.c
> index d21c782ae0..7993580b49 100644
> --- a/testsuites/sptests/sp17/task1.c
> +++ b/testsuites/sptests/sp17/task1.c
> @@ -44,6 +44,7 @@ rtems_task Task_1(
>
> puts("TA1 - Got Back!!!");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c
> index 7a4bb14d26..9ac270733f 100644
> --- a/testsuites/sptests/sp18/init.c
> +++ b/testsuites/sptests/sp18/init.c
> @@ -31,7 +31,8 @@ rtems_task Init(
> rtems_resource_snapshot snapshot;
> void *greedy;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> greedy = rtems_workspace_greedy_allocate_all_except_largest( &stack_size );
> rtems_resource_snapshot_take( &snapshot );
> @@ -83,7 +84,8 @@ rtems_task Init(
>
> rtems_workspace_greedy_free( greedy );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp19/fptask.c b/testsuites/sptests/sp19/fptask.c
> index 3ff7340312..9b15cf7a51 100644
> --- a/testsuites/sptests/sp19/fptask.c
> +++ b/testsuites/sptests/sp19/fptask.c
> @@ -60,7 +60,8 @@ rtems_task FP_task(
> status = rtems_task_delete( Task_id[ 3 ] );
> directive_failed( status, "rtems_task_delete of TA3" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp19/init.c b/testsuites/sptests/sp19/init.c
> index f1b75c406a..1f110228a2 100644
> --- a/testsuites/sptests/sp19/init.c
> +++ b/testsuites/sptests/sp19/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c
> index 6b63b6a380..eb2c30fcc7 100644
> --- a/testsuites/sptests/sp20/init.c
> +++ b/testsuites/sptests/sp20/init.c
> @@ -38,7 +38,8 @@ static long buffers[ BUFFER_COUNT ][ BUFFER_SIZE / sizeof(long) ];
>
> void end_of_test( void )
> {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_printer_task_drain( &printer_task );
> rtems_test_exit( 0 );
> }
> @@ -59,7 +60,8 @@ rtems_task Init(
> error = rtems_print_printer_task( &rtems_test_printer, &printer_task );
> rtems_test_assert( error == 0 );
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
> index 8d81cb1049..3c343dd080 100644
> --- a/testsuites/sptests/sp2038/init.c
> +++ b/testsuites/sptests/sp2038/init.c
> @@ -317,14 +317,16 @@ static void test_every_day(void)
>
> rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_tod_to_seconds();
> test_every_day();
> test_problem_year();
> test_leap_year();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c
> index 0eb453c974..d8c277ccea 100644
> --- a/testsuites/sptests/sp21/init.c
> +++ b/testsuites/sptests/sp21/init.c
> @@ -254,7 +254,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> do_test_io_manager();
>
> @@ -262,7 +263,8 @@ rtems_task Init(
>
> do_test_zero_driver();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c
> index 23956e6c30..d9c90a56f0 100644
> --- a/testsuites/sptests/sp22/init.c
> +++ b/testsuites/sptests/sp22/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
>
> diff --git a/testsuites/sptests/sp22/task1.c b/testsuites/sptests/sp22/task1.c
> index 3910bb249e..b282379008 100644
> --- a/testsuites/sptests/sp22/task1.c
> +++ b/testsuites/sptests/sp22/task1.c
> @@ -160,6 +160,7 @@ rtems_task Task_1(
> status = rtems_timer_delete( tmid );
> directive_failed( status, "rtems_timer_delete" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp23/init.c b/testsuites/sptests/sp23/init.c
> index e0ee2f97a0..f5611f8451 100644
> --- a/testsuites/sptests/sp23/init.c
> +++ b/testsuites/sptests/sp23/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
>
> diff --git a/testsuites/sptests/sp23/task1.c b/testsuites/sptests/sp23/task1.c
> index 659eef11d8..e08b6b19c0 100644
> --- a/testsuites/sptests/sp23/task1.c
> +++ b/testsuites/sptests/sp23/task1.c
> @@ -92,6 +92,7 @@ rtems_task Task_1(
> directive_failed( status, "rtems_port_delete" );
> puts( "TA1 - rtems_port_delete - DP1" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp24/init.c b/testsuites/sptests/sp24/init.c
> index b0e7f15628..b752431768 100644
> --- a/testsuites/sptests/sp24/init.c
> +++ b/testsuites/sptests/sp24/init.c
> @@ -36,7 +36,8 @@ rtems_task Init(
> uint32_t index;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
>
> diff --git a/testsuites/sptests/sp24/task1.c b/testsuites/sptests/sp24/task1.c
> index 9a2de67f40..2f3d72929e 100644
> --- a/testsuites/sptests/sp24/task1.c
> +++ b/testsuites/sptests/sp24/task1.c
> @@ -46,7 +46,8 @@ rtems_task Task_1_through_3(
> directive_failed( status, "rtems_clock_get_tod failed" );
>
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp25/init.c b/testsuites/sptests/sp25/init.c
> index e744e5cfb6..e5604654d2 100644
> --- a/testsuites/sptests/sp25/init.c
> +++ b/testsuites/sptests/sp25/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
>
> diff --git a/testsuites/sptests/sp25/task1.c b/testsuites/sptests/sp25/task1.c
> index ae7e8b8d8e..75e3a29d71 100644
> --- a/testsuites/sptests/sp25/task1.c
> +++ b/testsuites/sptests/sp25/task1.c
> @@ -281,6 +281,7 @@ rtems_test_pause();
> puts( "TA1 - rtems_region_delete - walks heap if debug enabled" );
> rtems_region_delete(Region_id[ 1 ]);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp26/init.c b/testsuites/sptests/sp26/init.c
> index 0ac7157e7c..5f71ec1b45 100644
> --- a/testsuites/sptests/sp26/init.c
> +++ b/testsuites/sptests/sp26/init.c
> @@ -32,7 +32,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> task1();
> /* does not return */
> diff --git a/testsuites/sptests/sp26/task1.c b/testsuites/sptests/sp26/task1.c
> index 45aa08d7b3..4ac5fe4a11 100644
> --- a/testsuites/sptests/sp26/task1.c
> +++ b/testsuites/sptests/sp26/task1.c
> @@ -82,7 +82,8 @@ subTask2 (rtems_task_argument arg)
> printf ("subTask2 - Task 1 suspended? - should be 1: %d\n",
> isSuspended (taskId1));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c
> index b9522fd364..1b0b6c3b56 100644
> --- a/testsuites/sptests/sp27/init.c
> +++ b/testsuites/sptests/sp27/init.c
> @@ -117,10 +117,12 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts( "Testing " TEST_SEMAPHORE_TYPE " semaphore flush" );
> doTest();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
> index 6b96ab8792..4b7d6d93ed 100644
> --- a/testsuites/sptests/sp29/init.c
> +++ b/testsuites/sptests/sp29/init.c
> @@ -90,7 +90,8 @@ rtems_task Init (rtems_task_argument ignored)
> rtems_status_code sc;
> rtems_interval then, now;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts( "This test only prints on errors." );
>
> ticksPerSecond = rtems_clock_get_ticks_per_second();
> @@ -229,6 +230,7 @@ rtems_task Init (rtems_task_argument ignored)
> }
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit (0);
> }
> diff --git a/testsuites/sptests/sp30/init.c b/testsuites/sptests/sp30/init.c
> index 616e4cd2a4..aab232e979 100644
> --- a/testsuites/sptests/sp30/init.c
> +++ b/testsuites/sptests/sp30/init.c
> @@ -36,7 +36,8 @@ rtems_task Init(
> uint32_t index;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
>
> diff --git a/testsuites/sptests/sp30/task1.c b/testsuites/sptests/sp30/task1.c
> index da4b0d20e7..31704b02f7 100644
> --- a/testsuites/sptests/sp30/task1.c
> +++ b/testsuites/sptests/sp30/task1.c
> @@ -46,7 +46,8 @@ rtems_task Task_1_through_3(
> directive_failed( status, "rtems_clock_get_tod failed" );
>
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c
> index 020ec255be..72be6a6736 100644
> --- a/testsuites/sptests/sp31/init.c
> +++ b/testsuites/sptests/sp31/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
>
> diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c
> index c3f0ae13fc..28ffc515b0 100644
> --- a/testsuites/sptests/sp31/task1.c
> +++ b/testsuites/sptests/sp31/task1.c
> @@ -336,6 +336,7 @@ rtems_task Task_1(
> status = rtems_timer_delete( tmid );
> directive_failed( status, "rtems_timer_delete" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp32/init.c b/testsuites/sptests/sp32/init.c
> index 2432a14d2f..41913f307f 100644
> --- a/testsuites/sptests/sp32/init.c
> +++ b/testsuites/sptests/sp32/init.c
> @@ -28,7 +28,8 @@ rtems_task Init(
> rtems_id period_id;
> int loopy;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* create period */
> status = rtems_rate_monotonic_create(
> @@ -79,7 +80,8 @@ rtems_task Init(
> );
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c
> index 5470a9974d..aa8632c997 100644
> --- a/testsuites/sptests/sp33/init.c
> +++ b/testsuites/sptests/sp33/init.c
> @@ -76,7 +76,8 @@ rtems_task Init(
> rtems_id Tasks[CONFIGURE_MAXIMUM_TASKS-1];
> uint32_t i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Check bad argument cases */
> puts( "rtems_barrier_delete - bad id - INVALID_ID" );
> @@ -285,6 +286,7 @@ rtems_task Init(
> directive_failed(status, "rtems_task_wake_after");
>
> /* the end */
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c
> index c0e2dbf977..4510be35a2 100644
> --- a/testsuites/sptests/sp34/changepri.c
> +++ b/testsuites/sptests/sp34/changepri.c
> @@ -116,7 +116,8 @@ rtems_task Init(rtems_task_argument ignored)
> rtems_status_code status;
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Create synchronisation semaphore for LocalHwIsr -> Test Tasks */
> status = rtems_semaphore_create(
> @@ -174,7 +175,8 @@ rtems_task Init(rtems_task_argument ignored)
> }
>
> /* exit the test */
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c
> index 417462418a..330379bfc3 100644
> --- a/testsuites/sptests/sp35/priinv.c
> +++ b/testsuites/sptests/sp35/priinv.c
> @@ -260,7 +260,8 @@ void AccessLocalHw(void)
> printf(" AccessLocalHw returns to %s\n", CallerName());
> #if defined(TEST_EXIT_AFTER_ITERATIONS)
> if ( ++Iterations == 10 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
> #endif
> @@ -304,7 +305,8 @@ rtems_task Init(rtems_task_argument ignored)
> #endif
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Create synchronisation semaphore for LocalHwIsr -> Test Tasks */
> status = rtems_semaphore_create(
> diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c
> index 08d6285d3d..30ed9087da 100644
> --- a/testsuites/sptests/sp37/init.c
> +++ b/testsuites/sptests/sp37/init.c
> @@ -516,7 +516,8 @@ rtems_task Init(
> rtems_id timer;
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_isr_level();
> test_isr_locks();
> @@ -613,6 +614,7 @@ rtems_task Init(
>
> check_isr_worked( "body", isr_in_progress_body );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c
> index d77d5d2a1c..c1c6ac82e7 100644
> --- a/testsuites/sptests/sp38/init.c
> +++ b/testsuites/sptests/sp38/init.c
> @@ -57,7 +57,8 @@ rtems_task Init(
> rtems_interval start;
> rtems_interval now;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> main_task = rtems_task_self();
>
> @@ -95,6 +96,7 @@ rtems_task Init(
> }
>
> puts( "Signal sent from ISR has been processed" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
> index 37af04abd7..c4f3d4a6b6 100644
> --- a/testsuites/sptests/sp40/init.c
> +++ b/testsuites/sptests/sp40/init.c
> @@ -65,7 +65,8 @@ rtems_task Init(
> rtems_interrupt_level level;
> bool do_interrupt_context_test = true;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Ensure that this test works as expected */
> test_interrupt_context_enter( level );
> @@ -172,7 +173,8 @@ rtems_task Init(
> "rtems_io_unregister_driver"
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp41/init.c b/testsuites/sptests/sp41/init.c
> index 02fb5254d7..81ae030e76 100644
> --- a/testsuites/sptests/sp41/init.c
> +++ b/testsuites/sptests/sp41/init.c
> @@ -37,7 +37,8 @@ static rtems_task Init(
> void *tmp;
> int counter;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - overwrite internal value to trip case" );
> tmp = _Objects_Information_table[ OBJECTS_CLASSIC_API ][ 1 ];
> @@ -60,7 +61,8 @@ static rtems_task Init(
> puts( "Init - rtems_iterate_over_all_threads - iterator" );
> rtems_iterate_over_all_threads( iterator );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
> index 546cbebbf1..4ee72f1295 100644
> --- a/testsuites/sptests/sp42/init.c
> +++ b/testsuites/sptests/sp42/init.c
> @@ -173,7 +173,8 @@ static rtems_task Init(
> rtems_task_priority prio;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Master = rtems_task_self();
>
> @@ -214,7 +215,8 @@ static rtems_task Init(
> puts( "Exercising blocking discipline w/unblock in priority order" );
> do_test( RTEMS_PRIORITY, FALSE );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
> index a0025353ec..a03e34befd 100644
> --- a/testsuites/sptests/sp43/init.c
> +++ b/testsuites/sptests/sp43/init.c
> @@ -128,7 +128,8 @@ rtems_task Init(
> int part;
> rtems_object_api_class_information info;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf( "RTEMS Version: %s\n", rtems_get_version_string() );
>
> @@ -493,6 +494,7 @@ rtems_task Init(
> );
> fatal_directive_status( sc, RTEMS_INVALID_ID, "rtems_semaphore_obtain" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c
> index 7354618a5f..51330d1dd3 100644
> --- a/testsuites/sptests/sp44/init.c
> +++ b/testsuites/sptests/sp44/init.c
> @@ -64,7 +64,8 @@ rtems_task TaskAB_entry(rtems_task_argument me)
> );
>
> if ( ++iterations == 10 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
>
> @@ -77,7 +78,8 @@ rtems_task Init(rtems_task_argument ignored)
> {
> static rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Create Task A */
> status = rtems_task_create(
> diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c
> index da9e740208..90ec3b5124 100644
> --- a/testsuites/sptests/sp45/init.c
> +++ b/testsuites/sptests/sp45/init.c
> @@ -54,7 +54,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_timer_initiate_server(
> RTEMS_TIMER_SERVER_DEFAULT_PRIORITY,
> @@ -115,7 +116,8 @@ rtems_task Init(
> directive_failed( status, "rtems_timer_delete" );
>
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c
> index 9d58a96fd9..fdb2d11e24 100644
> --- a/testsuites/sptests/sp46/init.c
> +++ b/testsuites/sptests/sp46/init.c
> @@ -68,7 +68,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id task_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Initialize Tasks
> @@ -103,7 +104,8 @@ rtems_task Init(
> /*
> * Exit test
> */
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c
> index dba7b7e87b..8ae8afe064 100644
> --- a/testsuites/sptests/sp47/init.c
> +++ b/testsuites/sptests/sp47/init.c
> @@ -31,7 +31,8 @@ rtems_task test_asr(rtems_task_argument unused)
> } else
> puts( "Creating task with ASR disable mode honored" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -40,7 +41,8 @@ rtems_task Init(rtems_task_argument ignored)
> rtems_status_code sc;
> rtems_id ti;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> sc = rtems_task_create(
> rtems_build_name('t', 's', 't', '0'),
> 100,
> diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c
> index 3af65f5f12..2dd54f892f 100644
> --- a/testsuites/sptests/sp48/init.c
> +++ b/testsuites/sptests/sp48/init.c
> @@ -29,7 +29,8 @@ rtems_task Init(rtems_task_argument ignored)
> int i;
> int created;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf(
> "Largest C program heap block available: %zu\n",
> @@ -81,7 +82,8 @@ rtems_task Init(rtems_task_argument ignored)
> malloc_free_space()
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp49/init.c b/testsuites/sptests/sp49/init.c
> index d1f6f05216..d842bdadfc 100644
> --- a/testsuites/sptests/sp49/init.c
> +++ b/testsuites/sptests/sp49/init.c
> @@ -24,7 +24,8 @@ rtems_task Init(rtems_task_argument ignored)
> rtems_id q;
> uint32_t flushed;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Create Message Queue" );
> sc = rtems_message_queue_create(
> @@ -42,7 +43,8 @@ rtems_task Init(rtems_task_argument ignored)
>
> puts( "Flush returned INVALID_ID as expected" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c
> index 6852c4a28c..ae791c0467 100644
> --- a/testsuites/sptests/sp50/init.c
> +++ b/testsuites/sptests/sp50/init.c
> @@ -48,7 +48,8 @@ rtems_task Init(
> rtems_id timer1;
> struct timespec uptime;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_timer_initiate_server(
> 1,
> @@ -79,7 +80,8 @@ rtems_task Init(
> }
>
> if ( Fired >= 10 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> /* technically the following is a critical section */
> diff --git a/testsuites/sptests/sp51/init.c b/testsuites/sptests/sp51/init.c
> index d1c16d1b6f..d041845761 100644
> --- a/testsuites/sptests/sp51/init.c
> +++ b/testsuites/sptests/sp51/init.c
> @@ -59,7 +59,8 @@ rtems_task Init(
> rtems_status_code sc;
> rtems_id mutex;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Create semaphore - priority ceiling unlocked - invalid ceiling" );
> sc = rtems_semaphore_create(
> @@ -103,7 +104,8 @@ rtems_task Init(
>
> test_create_initially_locked_prio_inherit_sema();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/sp52/init.c b/testsuites/sptests/sp52/init.c
> index 801a0b8754..557d193679 100644
> --- a/testsuites/sptests/sp52/init.c
> +++ b/testsuites/sptests/sp52/init.c
> @@ -64,7 +64,8 @@ static rtems_task Init(
>
> rtems_time_of_day global_time;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* build timer name*/
> timer_name = rtems_build_name('T', 'M', '1', ' ');
> @@ -114,7 +115,8 @@ static rtems_task Init(
>
> puts( TSR_MODE " Timer fired after setting time forward -- OK");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c
> index cf7f4dbda4..8278ab1266 100644
> --- a/testsuites/sptests/sp54/init.c
> +++ b/testsuites/sptests/sp54/init.c
> @@ -32,7 +32,8 @@ static void *Init( uintptr_t ignored )
> * It is possible that since this thread prints and there is no idle
> * task, that the system could fail miserably. :(
> */
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - use valid id of API class with no objects" );
> status = rtems_task_set_priority(
> @@ -50,7 +51,8 @@ static void *Init( uintptr_t ignored )
> );
> fatal_directive_status( status, RTEMS_INVALID_NAME, "rtems_task_ident" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp55/init.c b/testsuites/sptests/sp55/init.c
> index b89aecdad6..5c415a76ef 100644
> --- a/testsuites/sptests/sp55/init.c
> +++ b/testsuites/sptests/sp55/init.c
> @@ -33,7 +33,8 @@ rtems_task Init(
> int msg = 1;
> uint32_t count = 20;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - rtems_message_queue_create - OK" );
> status = rtems_message_queue_create(
> @@ -61,7 +62,8 @@ rtems_task Init(
> status = rtems_message_queue_delete( id );
> directive_failed( status, "rtems_message_queue_delete" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp56/init.c b/testsuites/sptests/sp56/init.c
> index 5e0fde79ee..2021a06486 100644
> --- a/testsuites/sptests/sp56/init.c
> +++ b/testsuites/sptests/sp56/init.c
> @@ -52,7 +52,8 @@ rtems_task Init(
> rtems_id extension;
> rtems_id task_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - rtems_extension_create - OK" );
> status = rtems_extension_create(
> @@ -76,7 +77,8 @@ rtems_task Init(
> puts( "Init - rtems_extension_delete - OK" );
> status = rtems_extension_delete( extension );
> directive_failed( status, "rtems_extension_delete" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp57/init.c b/testsuites/sptests/sp57/init.c
> index 8d1573aede..9495558822 100644
> --- a/testsuites/sptests/sp57/init.c
> +++ b/testsuites/sptests/sp57/init.c
> @@ -46,7 +46,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id task_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - rtems_task_create - delay task - OK" );
> status = rtems_task_create(
> @@ -71,7 +72,8 @@ rtems_task Init(
> status = rtems_task_restart( task_id, 0 );
> directive_failed( status, "rtems_task_restart" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp58/init.c b/testsuites/sptests/sp58/init.c
> index f15a9229c4..2e131d5079 100644
> --- a/testsuites/sptests/sp58/init.c
> +++ b/testsuites/sptests/sp58/init.c
> @@ -66,12 +66,14 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> timespec_divide_by_zero();
> timespec_greater_than_lhs_sec_less();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp59/init.c b/testsuites/sptests/sp59/init.c
> index fc43a7c989..b27a4d0215 100644
> --- a/testsuites/sptests/sp59/init.c
> +++ b/testsuites/sptests/sp59/init.c
> @@ -55,7 +55,8 @@ rtems_task Init(
> void *address_1;
> rtems_task_priority priority;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> priority = RTEMS_MAXIMUM_PRIORITY / 4;
> priority = (priority * 3) + (priority / 2);
> @@ -112,7 +113,8 @@ rtems_task Init(
> status = rtems_task_wake_after( RTEMS_MILLISECONDS_TO_TICKS(1000) );
> directive_failed( status, "rtems_task_wake_after" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp60/init.c b/testsuites/sptests/sp60/init.c
> index 887747fd54..6ee45733b4 100644
> --- a/testsuites/sptests/sp60/init.c
> +++ b/testsuites/sptests/sp60/init.c
> @@ -26,7 +26,8 @@ rtems_task Init(
> rtems_id period1;
> rtems_id period2;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - rtems_rate_monotonic_create - first period" );
> sc = rtems_rate_monotonic_create(
> @@ -58,7 +59,8 @@ rtems_task Init(
> sc = rtems_rate_monotonic_period(period1, RTEMS_PERIOD_STATUS );
> fatal_directive_status(sc, RTEMS_TIMEOUT, "rtems_task_period status");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp62/init.c b/testsuites/sptests/sp62/init.c
> index e1ffc29747..7bd981c77e 100644
> --- a/testsuites/sptests/sp62/init.c
> +++ b/testsuites/sptests/sp62/init.c
> @@ -63,7 +63,8 @@ rtems_task Init(
> uintptr_t old_size;
> size_t first_alloc_size;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - rtems_task_create Blocker - OK" );
> sc = rtems_task_create(
> @@ -138,7 +139,8 @@ rtems_task Init(
> );
> rtems_test_assert( sc == RTEMS_SUCCESSFUL );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
> index c63917ac1c..5caba73e17 100644
> --- a/testsuites/sptests/sp63/init.c
> +++ b/testsuites/sptests/sp63/init.c
> @@ -126,7 +126,8 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_case_one();
>
> @@ -134,7 +135,8 @@ rtems_task Init(
>
> test_case_three();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp64/init.c b/testsuites/sptests/sp64/init.c
> index 0e1cdd131f..24b7580f20 100644
> --- a/testsuites/sptests/sp64/init.c
> +++ b/testsuites/sptests/sp64/init.c
> @@ -36,7 +36,8 @@ rtems_task Init(
> rtems_resource_snapshot snapshot;
> void *greedy;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Allocate one region -- so second auto extends" );
> sc = rtems_region_create(
> @@ -96,7 +97,8 @@ rtems_task Init(
> rtems_test_assert( ok );
> rtems_workspace_greedy_free( greedy );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c
> index a557ede775..fd0fbf2005 100644
> --- a/testsuites/sptests/sp65/init.c
> +++ b/testsuites/sptests/sp65/init.c
> @@ -46,7 +46,8 @@ rtems_task Init(
> int status;
> rtems_id Mutex_id, Task_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /*
> * Verify that an initially locked priority ceiling mutex elevates the
> @@ -111,7 +112,8 @@ rtems_task Init(
> status = rtems_semaphore_release( Mutex_id );
> directive_failed( status, "rtems_semaphore_release" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp67/init.c b/testsuites/sptests/sp67/init.c
> index 877f2d75d1..8134bb91d5 100644
> --- a/testsuites/sptests/sp67/init.c
> +++ b/testsuites/sptests/sp67/init.c
> @@ -48,7 +48,8 @@ rtems_task Init(
> rtems_id timer1;
> rtems_id timer2;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* build timer name*/
>
> @@ -107,7 +108,8 @@ rtems_task Init(
> rtems_test_exit(0);
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp68/init.c b/testsuites/sptests/sp68/init.c
> index 66f456cea6..111e341d78 100644
> --- a/testsuites/sptests/sp68/init.c
> +++ b/testsuites/sptests/sp68/init.c
> @@ -387,7 +387,8 @@ rtems_task Init(rtems_task_argument argument)
> void *new_region_item = NULL;
> size_t i = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> for (i = 0; i < TIMER_COUNT; ++i) {
> sc = rtems_timer_create(
> @@ -460,7 +461,8 @@ rtems_task Init(rtems_task_argument argument)
> ++rt;
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c
> index 6a5e139d34..d4a9bca8fa 100644
> --- a/testsuites/sptests/sp69/init.c
> +++ b/testsuites/sptests/sp69/init.c
> @@ -33,7 +33,8 @@ rtems_task Init(
>
> period_name = rtems_build_name('P','E','R','1');
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* create period */
> status = rtems_rate_monotonic_create(
> @@ -171,7 +172,8 @@ rtems_task Init(
> );
> rtems_test_assert( period_status.postponed_jobs_count == 3 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp70/init.c b/testsuites/sptests/sp70/init.c
> index becd7fb511..5be18ca2f0 100644
> --- a/testsuites/sptests/sp70/init.c
> +++ b/testsuites/sptests/sp70/init.c
> @@ -52,7 +52,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> create_helper( 1 );
> create_helper( 2 );
> @@ -71,7 +72,8 @@ rtems_task Init(
> create_helper( 4 );
> create_helper( 5 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c
> index 7e6a7e591f..3d0898de43 100644
> --- a/testsuites/sptests/sp71/init.c
> +++ b/testsuites/sptests/sp71/init.c
> @@ -29,7 +29,8 @@ rtems_task Init(
> rtems_id id;
> long created;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> created = 0;
> do {
> @@ -55,7 +56,8 @@ rtems_task Init(
>
> if ( (created + PER_ALLOCATION) > OBJECTS_ID_FINAL_INDEX ) {
> puts( "Test case hit" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> } else {
> puts( "Test case NOT hit" );
> }
> diff --git a/testsuites/sptests/sp72/init.c b/testsuites/sptests/sp72/init.c
> index 188498f923..61741a2d63 100644
> --- a/testsuites/sptests/sp72/init.c
> +++ b/testsuites/sptests/sp72/init.c
> @@ -45,7 +45,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id task_id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_semaphore_create(
> rtems_build_name( 'S', 'M', '1', ' ' ),
> @@ -77,7 +78,8 @@ rtems_task Init(
> status = rtems_task_delete( task_id );
> directive_failed( status, "rtems_task_delete" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sp73/init.c b/testsuites/sptests/sp73/init.c
> index b798f8403b..fe911f4334 100644
> --- a/testsuites/sptests/sp73/init.c
> +++ b/testsuites/sptests/sp73/init.c
> @@ -38,7 +38,8 @@ rtems_task Test_task(
> directive_failed( status, "get tod" );
>
> if ( time.second >= 15 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> put_name( Task_name[ task_index ], FALSE );
> @@ -58,7 +59,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_task_priority old;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> time.year = 1988;
> time.month = 12;
> diff --git a/testsuites/sptests/sp74/init.c b/testsuites/sptests/sp74/init.c
> index 2dd00861c7..cd4c010b26 100644
> --- a/testsuites/sptests/sp74/init.c
> +++ b/testsuites/sptests/sp74/init.c
> @@ -25,7 +25,8 @@ rtems_task Test_task(
> {
> puts( "Successfully yielded it to higher priority task" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -36,7 +37,8 @@ rtems_task Init(
> rtems_status_code status;
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Create TA1 at higher priority task" );
> status = rtems_task_create(
> diff --git a/testsuites/sptests/sp75/init.c b/testsuites/sptests/sp75/init.c
> index dafa775339..7d70d0cd3b 100644
> --- a/testsuites/sptests/sp75/init.c
> +++ b/testsuites/sptests/sp75/init.c
> @@ -27,7 +27,8 @@ rtems_task Init(
> rtems_id mutex;
> Per_CPU_Control *cpu_self;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_semaphore_create(
> rtems_build_name('M', 'U', 'T', 'X'),
> @@ -49,7 +50,8 @@ rtems_task Init(
> _Thread_Dispatch_enable(cpu_self);
> directive_failed(sc, "rtems_semaphore_obtain");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sp76/init.c b/testsuites/sptests/sp76/init.c
> index c7e451c32a..4001342b87 100644
> --- a/testsuites/sptests/sp76/init.c
> +++ b/testsuites/sptests/sp76/init.c
> @@ -28,7 +28,8 @@ static rtems_task High_task(
> put_name( name, FALSE );
> puts( " - Successfully yielded it to higher priority task" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -47,7 +48,8 @@ static rtems_task Init(
> rtems_id id;
> rtems_task_priority old;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &id );
> directive_failed( status, "task ident" );
> diff --git a/testsuites/sptests/sp77/init.c b/testsuites/sptests/sp77/init.c
> index 2c4a71a73c..33d1244014 100644
> --- a/testsuites/sptests/sp77/init.c
> +++ b/testsuites/sptests/sp77/init.c
> @@ -19,7 +19,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_status_code status;
> rtems_id id;
> @@ -34,7 +35,8 @@ rtems_task Init(
>
> fatal_directive_check_status_only(status , RTEMS_UNSATISFIED ,
> "attempt to create message queue return: ");
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spassoc01/init.c b/testsuites/sptests/spassoc01/init.c
> index 737cadb493..12de562e31 100644
> --- a/testsuites/sptests/spassoc01/init.c
> +++ b/testsuites/sptests/spassoc01/init.c
> @@ -125,7 +125,8 @@ rtems_task Init(
> )
> {
> name = malloc(40);
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - get local by name -- OK" );
> local = rtems_assoc_local_by_name( assoc_table, "zero" );
> @@ -278,7 +279,8 @@ rtems_task Init(
>
> test_assoc_32_to_string();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spatomic01/init.c b/testsuites/sptests/spatomic01/init.c
> index a37f3b3c32..bad8396551 100644
> --- a/testsuites/sptests/spatomic01/init.c
> +++ b/testsuites/sptests/spatomic01/init.c
> @@ -332,12 +332,14 @@ static void simple_tests(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_static_and_dynamic_initialization();
> simple_tests();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spcache01/init.c b/testsuites/sptests/spcache01/init.c
> index 09bb300ef3..2fff8757c4 100644
> --- a/testsuites/sptests/spcache01/init.c
> +++ b/testsuites/sptests/spcache01/init.c
> @@ -479,14 +479,16 @@ static void test_cache_coherent_alloc(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_data_flush_and_invalidate();
> test_timing();
> test_cache_aligned_alloc();
> test_cache_coherent_alloc();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spcbssched01/init.c b/testsuites/sptests/spcbssched01/init.c
> index be85bce85c..2676c36d12 100644
> --- a/testsuites/sptests/spcbssched01/init.c
> +++ b/testsuites/sptests/spcbssched01/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
> status = rtems_clock_set( &time );
> diff --git a/testsuites/sptests/spcbssched01/task1.c b/testsuites/sptests/spcbssched01/task1.c
> index f5d180831f..3a78c605a3 100644
> --- a/testsuites/sptests/spcbssched01/task1.c
> +++ b/testsuites/sptests/spcbssched01/task1.c
> @@ -41,7 +41,8 @@ rtems_task Task_1_through_3(
> directive_failed( status, "rtems_clock_get_tod" );
>
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/spcbssched02/init.c b/testsuites/sptests/spcbssched02/init.c
> index acaf7a723d..109943ccfb 100644
> --- a/testsuites/sptests/spcbssched02/init.c
> +++ b/testsuites/sptests/spcbssched02/init.c
> @@ -48,7 +48,8 @@ rtems_task Init(
> params1.budget = -1;
> params3.deadline = -1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name = rtems_build_name( 'P', 'T', '1', ' ' );
> Task_name2 = rtems_build_name( 'P', 'T', '2', ' ' );
> @@ -241,6 +242,7 @@ rtems_task Init(
> printf( "ERROR: CBS CLEANUP\n" );
>
> fflush(stdout);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spcbssched03/init.c b/testsuites/sptests/spcbssched03/init.c
> index 55549151b8..0c5eeddabf 100644
> --- a/testsuites/sptests/spcbssched03/init.c
> +++ b/testsuites/sptests/spcbssched03/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> uint32_t index;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_task_name();
>
> diff --git a/testsuites/sptests/spcbssched03/tasks_periodic.c b/testsuites/sptests/spcbssched03/tasks_periodic.c
> index aa68228145..9fca42b4a1 100644
> --- a/testsuites/sptests/spcbssched03/tasks_periodic.c
> +++ b/testsuites/sptests/spcbssched03/tasks_periodic.c
> @@ -155,6 +155,7 @@ rtems_task Tasks_Periodic(
> if ( rtems_cbs_cleanup() )
> printf( "ERROR: CBS CLEANUP\n" );
> fflush(stdout);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c
> index 51278d52f3..c29c6d51e4 100644
> --- a/testsuites/sptests/spchain/init.c
> +++ b/testsuites/sptests/spchain/init.c
> @@ -478,7 +478,8 @@ rtems_task Init(
> test_node node1, node2;
> int id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Initialize chain empty" );
> rtems_chain_initialize_empty( &chain1 );
> @@ -517,7 +518,8 @@ rtems_task Init(
> test_chain_insert_ordered();
> test_chain_iterator();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spclock_err01/init.c b/testsuites/sptests/spclock_err01/init.c
> index 087c8d4a05..79a248e5b3 100644
> --- a/testsuites/sptests/spclock_err01/init.c
> +++ b/testsuites/sptests/spclock_err01/init.c
> @@ -25,7 +25,8 @@ rtems_task Init(
> struct timeval tv;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "TA1 - rtems_clock_get_tod - RTEMS_INVALID_ADDRESS" );
> status = rtems_clock_get_tod( NULL );
> @@ -206,5 +207,6 @@ rtems_task Init(
> rtems_clock_get_tod( &time );
> print_time( "TA1 - current time - ", &time, "\n" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spclock_err02/init.c b/testsuites/sptests/spclock_err02/init.c
> index c879c4ce1f..c39b2e28a8 100644
> --- a/testsuites/sptests/spclock_err02/init.c
> +++ b/testsuites/sptests/spclock_err02/init.c
> @@ -23,7 +23,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_time_of_day time;
> rtems_status_code status;
> @@ -116,7 +117,8 @@ rtems_task Init(
> directive_failed( status, "rtems_clock_set" );
> print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
>
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> diff --git a/testsuites/sptests/spconsole01/init.c b/testsuites/sptests/spconsole01/init.c
> index 99cd7c6f0e..d3d4b06b78 100644
> --- a/testsuites/sptests/spconsole01/init.c
> +++ b/testsuites/sptests/spconsole01/init.c
> @@ -304,12 +304,14 @@ static void test(test_context *ctx)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_print_printer_fprintf_putc(&rtems_test_printer);
> test(&test_instance);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spcontext01/init.c b/testsuites/sptests/spcontext01/init.c
> index 7f874751f6..20a803b716 100644
> --- a/testsuites/sptests/spcontext01/init.c
> +++ b/testsuites/sptests/spcontext01/init.c
> @@ -255,7 +255,8 @@ static void Init(rtems_task_argument arg)
> int j;
> int k;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_context_is_executing();
>
> @@ -269,7 +270,8 @@ static void Init(rtems_task_argument arg)
> }
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spcoverage/init.c b/testsuites/sptests/spcoverage/init.c
> index 7c8e509d74..ff4112ebaa 100644
> --- a/testsuites/sptests/spcoverage/init.c
> +++ b/testsuites/sptests/spcoverage/init.c
> @@ -22,7 +22,8 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - If coverage enabled, call coverage marker methods" );
> #if defined(RTEMS_COVERAGE)
> @@ -30,7 +31,8 @@ rtems_task Init(
> end_coverage();
> #endif
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spcpucounter01/init.c b/testsuites/sptests/spcpucounter01/init.c
> index a9caf3f545..ea2c523681 100644
> --- a/testsuites/sptests/spcpucounter01/init.c
> +++ b/testsuites/sptests/spcpucounter01/init.c
> @@ -228,7 +228,8 @@ static void Init(rtems_task_argument arg)
> {
> test_context *ctx = &test_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_delay_nanoseconds(ctx);
> test_delay_ticks(ctx);
> @@ -236,7 +237,8 @@ static void Init(rtems_task_argument arg)
> test_converter();
> test_report(ctx);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c
> index b13be4913d..b0b99a1343 100644
> --- a/testsuites/sptests/spcpuset01/init.c
> +++ b/testsuites/sptests/spcpuset01/init.c
> @@ -136,7 +136,8 @@ rtems_task Init(
> {
> size_t i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_cpu_zero_case_1();
> test_cpu_fill_case_1();
> @@ -150,6 +151,7 @@ rtems_task Init(
>
> cpuset_logic_test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit( 0 );
> }
> diff --git a/testsuites/sptests/spedfsched01/init.c b/testsuites/sptests/spedfsched01/init.c
> index 04fc5ca79c..9f4114e682 100644
> --- a/testsuites/sptests/spedfsched01/init.c
> +++ b/testsuites/sptests/spedfsched01/init.c
> @@ -35,7 +35,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
> status = rtems_clock_set( &time );
> diff --git a/testsuites/sptests/spedfsched01/task1.c b/testsuites/sptests/spedfsched01/task1.c
> index f5d180831f..3a78c605a3 100644
> --- a/testsuites/sptests/spedfsched01/task1.c
> +++ b/testsuites/sptests/spedfsched01/task1.c
> @@ -41,7 +41,8 @@ rtems_task Task_1_through_3(
> directive_failed( status, "rtems_clock_get_tod" );
>
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/spedfsched02/init.c b/testsuites/sptests/spedfsched02/init.c
> index aa2798c251..98994ab7d6 100644
> --- a/testsuites/sptests/spedfsched02/init.c
> +++ b/testsuites/sptests/spedfsched02/init.c
> @@ -39,7 +39,8 @@ rtems_task Init(
>
> Priorities = Prio;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> diff --git a/testsuites/sptests/spedfsched02/task1.c b/testsuites/sptests/spedfsched02/task1.c
> index 8ced5f7f19..975f5d906a 100644
> --- a/testsuites/sptests/spedfsched02/task1.c
> +++ b/testsuites/sptests/spedfsched02/task1.c
> @@ -118,7 +118,8 @@ rtems_task Task_1_through_6(
> fflush( stdout );
>
> if ( pass == 10 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/spedfsched03/init.c b/testsuites/sptests/spedfsched03/init.c
> index 0c2425a37c..590415c65a 100644
> --- a/testsuites/sptests/spedfsched03/init.c
> +++ b/testsuites/sptests/spedfsched03/init.c
> @@ -34,7 +34,8 @@ rtems_task Init(
> uint32_t index;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> build_task_name();
>
> diff --git a/testsuites/sptests/spedfsched03/tasks_periodic.c b/testsuites/sptests/spedfsched03/tasks_periodic.c
> index 4418f2cd6e..526ba2605e 100644
> --- a/testsuites/sptests/spedfsched03/tasks_periodic.c
> +++ b/testsuites/sptests/spedfsched03/tasks_periodic.c
> @@ -79,6 +79,7 @@ rtems_task Tasks_Periodic(
> rtems_test_exit( 0 );
> }
> fflush(stdout);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spedfsched04/init.c b/testsuites/sptests/spedfsched04/init.c
> index 7efcd6809f..0714008789 100644
> --- a/testsuites/sptests/spedfsched04/init.c
> +++ b/testsuites/sptests/spedfsched04/init.c
> @@ -91,7 +91,8 @@ static rtems_task Task(
> directive_failed( status, "rate_monotonic_get_status" );
>
> if( tsk_counter[ argument ] == testnumber ){
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> status = rtems_rate_monotonic_delete( RM_period );
> directive_failed( status, "rtems_rate_monotonic_delete" );
> rtems_test_exit( 0 );
> @@ -118,7 +119,8 @@ static rtems_task Init(
> uint32_t index;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
>
> /* Create two tasks */
> diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c
> index b3b220bc66..b4e6c2fd1d 100644
> --- a/testsuites/sptests/sperror01/init.c
> +++ b/testsuites/sptests/sperror01/init.c
> @@ -33,7 +33,8 @@ static void fatal_extension(
> && !always_set_to_false
> && error == ENOMEM
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> @@ -41,7 +42,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> errno = -1;
> rtems_error(RTEMS_ERROR_ERRNO, "Dummy: Resources unavailable");
> diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c
> index 324e38d43d..017123726e 100644
> --- a/testsuites/sptests/sperror02/init.c
> +++ b/testsuites/sptests/sperror02/init.c
> @@ -33,7 +33,8 @@ static void fatal_extension(
> && !always_set_to_false
> && error == 1
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> @@ -41,7 +42,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> errno = ENOMEM;
> rtems_error(
> diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c
> index f4323a5001..907738bdee 100644
> --- a/testsuites/sptests/sperror03/init.c
> +++ b/testsuites/sptests/sperror03/init.c
> @@ -30,7 +30,8 @@ static void fatal_extension(
> && !always_set_to_false
> && error == 0
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> @@ -38,7 +39,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_panic(
> "Dummy panic\n"
> diff --git a/testsuites/sptests/spevent_err03/init.c b/testsuites/sptests/spevent_err03/init.c
> index b13960e16d..9a34652514 100644
> --- a/testsuites/sptests/spevent_err03/init.c
> +++ b/testsuites/sptests/spevent_err03/init.c
> @@ -26,7 +26,8 @@ rtems_task Init(
> time_t seconds;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_event_receive(
> RTEMS_EVENT_16,
> @@ -105,5 +106,6 @@ rtems_task Init(
> seconds = tv.tv_sec;
> printf( "TA1 - current time - %s\n", ctime(&seconds) );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/speventsystem01/init.c b/testsuites/sptests/speventsystem01/init.c
> index d262023c69..83f64b75aa 100644
> --- a/testsuites/sptests/speventsystem01/init.c
> +++ b/testsuites/sptests/speventsystem01/init.c
> @@ -112,7 +112,8 @@ static void test_get_pending_events(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_with_normal_and_system_event();
> test_with_timeout();
> @@ -120,7 +121,8 @@ static void Init(rtems_task_argument arg)
> test_with_invalid_address();
> test_get_pending_events();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/speventtransient01/init.c b/testsuites/sptests/speventtransient01/init.c
> index e8e35f171f..d0115bdb4c 100644
> --- a/testsuites/sptests/speventtransient01/init.c
> +++ b/testsuites/sptests/speventtransient01/init.c
> @@ -107,13 +107,15 @@ static void test_with_timeout(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_with_request_server();
> test_with_request_self();
> test_with_timeout();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spextensions01/init.c b/testsuites/sptests/spextensions01/init.c
> index 35fce4878e..acd19b64e3 100644
> --- a/testsuites/sptests/spextensions01/init.c
> +++ b/testsuites/sptests/spextensions01/init.c
> @@ -319,7 +319,8 @@ static void three_fatal(
> if (source == RTEMS_FATAL_SOURCE_EXIT) {
> assert_forward_order(3);
> assert(counter == 72);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> @@ -493,7 +494,8 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> diff --git a/testsuites/sptests/spfatal07/testcase.h b/testsuites/sptests/spfatal07/testcase.h
> index e84796324e..a320a338b1 100644
> --- a/testsuites/sptests/spfatal07/testcase.h
> +++ b/testsuites/sptests/spfatal07/testcase.h
> @@ -51,7 +51,8 @@ void force_error()
> "WARNING - Test not applicable on this target architecture.\n"
> "WARNING - Only applicable when CPU_ALLOCATE_INTERRUPT_STACK == TRUE.\n"
> );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> #endif
> }
> diff --git a/testsuites/sptests/spfatal16/testcase.h b/testsuites/sptests/spfatal16/testcase.h
> index 412f20e04a..1afe63016c 100644
> --- a/testsuites/sptests/spfatal16/testcase.h
> +++ b/testsuites/sptests/spfatal16/testcase.h
> @@ -24,6 +24,7 @@
> void force_error()
> {
> /* This fatal error depends on the Termios device configuration */
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c
> index 1848659d6a..bdbb71c370 100644
> --- a/testsuites/sptests/spfatal26/init.c
> +++ b/testsuites/sptests/spfatal26/init.c
> @@ -51,7 +51,8 @@ static void provoke_aligment_or_data_access_exception( void )
>
> static void Init( rtems_task_argument arg )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> provoke_aligment_or_data_access_exception();
>
> @@ -69,7 +70,8 @@ static void fatal_extension(
>
> rtems_exception_frame_print( (const rtems_exception_frame *) code );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
>
> #define CONFIGURE_INITIAL_EXTENSIONS \
> diff --git a/testsuites/sptests/spfatal30/init.c b/testsuites/sptests/spfatal30/init.c
> index a02bf062f4..52e33f8ae9 100644
> --- a/testsuites/sptests/spfatal30/init.c
> +++ b/testsuites/sptests/spfatal30/init.c
> @@ -31,14 +31,16 @@ static volatile double f = 1.0;
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> f *= 123.456;
>
> #ifdef EXPECT_ILLEGAL_USE_OF_FLOATING_POINT_UNIT
> rtems_test_assert(0);
> #else
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> #endif
> }
> @@ -55,7 +57,8 @@ static void fatal_extension(
> && !always_set_to_false
> && code == INTERNAL_ERROR_ILLEGAL_USE_OF_FLOATING_POINT_UNIT
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/sptests/spfatal31/init.c b/testsuites/sptests/spfatal31/init.c
> index 5aab6630dc..9ab6829252 100644
> --- a/testsuites/sptests/spfatal31/init.c
> +++ b/testsuites/sptests/spfatal31/init.c
> @@ -38,7 +38,8 @@ static void Init(rtems_task_argument arg)
> rtems_status_code sc;
> rtems_id id;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_timer_create(rtems_build_name('T', 'I', 'M', 'E'), &id);
> rtems_test_assert(sc == RTEMS_SUCCESSFUL);
> @@ -52,7 +53,8 @@ static void Init(rtems_task_argument arg)
> #ifdef EXPECT_ILLEGAL_USE_OF_FLOATING_POINT_UNIT
> rtems_test_assert(0);
> #else
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> #endif
> }
> @@ -69,7 +71,8 @@ static void fatal_extension(
> && !always_set_to_false
> && code == INTERNAL_ERROR_ILLEGAL_USE_OF_FLOATING_POINT_UNIT
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
> index f9b2ed37c1..6ad9a7ee0a 100644
> --- a/testsuites/sptests/spfatal_support/init.c
> +++ b/testsuites/sptests/spfatal_support/init.c
> @@ -22,7 +22,8 @@ static void print_test_begin_message(void)
>
> if (!done) {
> done = true;
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> }
> }
>
> @@ -100,6 +101,7 @@ void Fatal_extension(
> && !always_set_to_false
> && is_expected_error( error )
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
> diff --git a/testsuites/sptests/spfifo01/init.c b/testsuites/sptests/spfifo01/init.c
> index e38b23e039..bd0d75435d 100644
> --- a/testsuites/sptests/spfifo01/init.c
> +++ b/testsuites/sptests/spfifo01/init.c
> @@ -31,7 +31,8 @@ static void test_main(void)
> mode_t rwx = S_IRWXU | S_IRWXG | S_IRWXO;
> int status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts(
> "\nConfiguration: Pipes disabled.\n"
> @@ -49,7 +50,8 @@ static void test_main(void)
> rtems_test_assert(status == -1);
> rtems_test_assert(errno == ENOSYS);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
>
> rtems_task Init(rtems_task_argument not_used)
> diff --git a/testsuites/sptests/spfifo02/init.c b/testsuites/sptests/spfifo02/init.c
> index a1cb2a3a55..2fb2ec32e4 100644
> --- a/testsuites/sptests/spfifo02/init.c
> +++ b/testsuites/sptests/spfifo02/init.c
> @@ -144,7 +144,8 @@ rtems_task Init(
> int num_opens = 0;
> int index = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Creating all barriers" );
> create_all_barriers();
> @@ -198,7 +199,8 @@ rtems_task Init(
> ++index;
> } while ( index < NUM_OPEN_REQ - num_opens );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c
> index 4a2b7419d7..ca6df3cfd2 100644
> --- a/testsuites/sptests/spfifo03/init.c
> +++ b/testsuites/sptests/spfifo03/init.c
> @@ -114,7 +114,8 @@ void test_main(void) /* Also acts as the write task */
>
> rtems_test_assert( status == RTEMS_SUCCESSFUL );
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts("\nCreating a task name and a task");
> readTaskName = rtems_build_name('T','A','r',' ');
> @@ -191,7 +192,8 @@ void test_main(void) /* Also acts as the write task */
> status = rmdir("/tmp");
> rtems_test_assert(status == 0);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
>
> rtems_task Init(
> diff --git a/testsuites/sptests/spfifo04/init.c b/testsuites/sptests/spfifo04/init.c
> index 01c84e4df6..7a0d61bd7a 100644
> --- a/testsuites/sptests/spfifo04/init.c
> +++ b/testsuites/sptests/spfifo04/init.c
> @@ -41,7 +41,8 @@ rtems_task Init(
> int pipe_length = -1;
> int flag = 1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Creating /fifo" );
> status = mkfifo( "/fifo", 0777 );
> @@ -93,7 +94,8 @@ rtems_task Init(
> status = unlink( "/fifo" );
> rtems_test_assert( status == 0 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c
> index dc331808f1..5bbe3f50d3 100644
> --- a/testsuites/sptests/spfifo05/init.c
> +++ b/testsuites/sptests/spfifo05/init.c
> @@ -137,7 +137,8 @@ rtems_task Init(
> uint32_t released = 0;
> int flag = 1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> memset( sendBuf, '1', SEND_RCV_BUFSIZ - 30 );
> memset( sendBuf, '2', 29 );
> @@ -254,7 +255,8 @@ rtems_task Init(
> status = unlink("/fifo");
> rtems_test_assert(status == 0);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spfreechain01/init.c b/testsuites/sptests/spfreechain01/init.c
> index 60388101ea..d2725df3a7 100644
> --- a/testsuites/sptests/spfreechain01/init.c
> +++ b/testsuites/sptests/spfreechain01/init.c
> @@ -26,7 +26,8 @@ static rtems_task Init(rtems_task_argument ignored)
> Freechain_Control fc;
> test_node *node;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> _Freechain_Initialize(&fc, NULL, 0, sizeof(test_node));
> rtems_test_assert(_Chain_Is_empty(&fc.Free));
> @@ -53,7 +54,8 @@ static rtems_task Init(rtems_task_argument ignored)
> node = _Freechain_Get(&fc, NULL, 0, sizeof(test_node));
> rtems_test_assert(node->x == 1);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spglobalcon01/init.cc b/testsuites/sptests/spglobalcon01/init.cc
> index aee9d0a141..bf36b4f20f 100644
> --- a/testsuites/sptests/spglobalcon01/init.cc
> +++ b/testsuites/sptests/spglobalcon01/init.cc
> @@ -36,11 +36,13 @@ static A a;
>
> static void *idle_body(uintptr_t ignored)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_test_assert(a.i == 0);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
>
> return NULL;
> diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c
> index 261b7dcc76..1944c80158 100644
> --- a/testsuites/sptests/spheapprot/init.c
> +++ b/testsuites/sptests/spheapprot/init.c
> @@ -126,11 +126,13 @@ const char rtems_test_name[] = "SPHEAPPROT";
>
> static rtems_task Init(rtems_task_argument argument)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_heap_protection();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c
> index 4ee70b94fa..fc9b80ab17 100644
> --- a/testsuites/sptests/spinternalerror01/init.c
> +++ b/testsuites/sptests/spinternalerror01/init.c
> @@ -38,14 +38,16 @@ static void fatal_extension(
> Internal_errors_t error
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (
> source == FATAL_SOURCE
> && !always_set_to_false
> && error == FATAL_ERROR
> ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> }
>
> diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c
> index f1ef8f3826..a119723ed2 100644
> --- a/testsuites/sptests/spinternalerror02/init.c
> +++ b/testsuites/sptests/spinternalerror02/init.c
> @@ -74,13 +74,15 @@ static void test_status_text(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_internal_error_text();
> test_fatal_source_text();
> test_status_text();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spintr_err01/init.c b/testsuites/sptests/spintr_err01/init.c
> index 9bc39bf4dc..2f19de40d0 100644
> --- a/testsuites/sptests/spintr_err01/init.c
> +++ b/testsuites/sptests/spintr_err01/init.c
> @@ -20,7 +20,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> #if (CPU_SIMPLE_VECTORED_INTERRUPTS == FALSE)
> puts(
> "TA1 - rtems_interrupt_catch - "
> @@ -62,5 +63,6 @@ rtems_task Init(
> puts( "TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS" );
> #endif
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
> index 5c480b4bb3..ab63bb9e5c 100644
> --- a/testsuites/sptests/spintrcritical01/init.c
> +++ b/testsuites/sptests/spintrcritical01/init.c
> @@ -105,7 +105,8 @@ static rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> thread = _Thread_Get_executing();
>
> @@ -124,7 +125,8 @@ static rtems_task Init(
>
> if ( case_hit ) {
> puts( "Init - Case hit" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> } else
> puts( "Init - Case not hit - ran too long" );
>
> diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
> index 161f0502de..7922044e13 100644
> --- a/testsuites/sptests/spintrcritical06/init.c
> +++ b/testsuites/sptests/spintrcritical06/init.c
> @@ -90,7 +90,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Trying to generate semaphore release from ISR while blocking" );
> puts( "Init - There is no way for the test to know if it hits the case" );
> @@ -119,7 +120,8 @@ rtems_task Init(
>
> interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c
> index 559a1e421d..ea5852949d 100644
> --- a/testsuites/sptests/spintrcritical08/init.c
> +++ b/testsuites/sptests/spintrcritical08/init.c
> @@ -95,7 +95,8 @@ rtems_task Init(
> {
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Trying to generate period ending while blocking" );
>
> @@ -112,7 +113,8 @@ rtems_task Init(
>
> if ( case_hit ) {
> puts( "Init - It appears the case has been hit" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> } else
> puts( "Init - Case not hit - ran too long" );
> rtems_test_exit(0);
> diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c
> index dc5b985ce7..12b8301008 100644
> --- a/testsuites/sptests/spintrcritical09/init.c
> +++ b/testsuites/sptests/spintrcritical09/init.c
> @@ -72,7 +72,8 @@ static rtems_task Init(
> {
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> thread = _Thread_Get_executing();
>
> @@ -91,7 +92,8 @@ static rtems_task Init(
>
> if ( case_hit ) {
> puts( "Init - It appears the case has been hit" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> } else
> puts( "Init - Case not hit - ran too long" );
>
> diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c
> index bbdfb54f3f..266cc946fe 100644
> --- a/testsuites/sptests/spintrcritical10/init.c
> +++ b/testsuites/sptests/spintrcritical10/init.c
> @@ -334,7 +334,8 @@ static rtems_task Init(
> .thread = _Thread_Get_executing()
> };
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_timer_create(rtems_build_name('T', 'I', 'M', 'R'), &ctx.timer);
> rtems_test_assert(sc == RTEMS_SUCCESSFUL);
> @@ -343,7 +344,8 @@ static rtems_task Init(
> test_all_satisfy_before_timeout(&ctx);
> test_timeout_before_all_satisfy(&ctx);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c
> index fb0d320dea..258cdae0cb 100644
> --- a/testsuites/sptests/spintrcritical11/init.c
> +++ b/testsuites/sptests/spintrcritical11/init.c
> @@ -62,7 +62,8 @@ rtems_task Init(
> rtems_task_argument ignored
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Test may not be able to detect case is hit reliably" );
> puts( "Init - Trying to generate event send from ISR while blocking" );
> @@ -72,7 +73,8 @@ rtems_task Init(
>
> interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spintrcritical13/init.c b/testsuites/sptests/spintrcritical13/init.c
> index e284d3c33d..f76f3285ee 100644
> --- a/testsuites/sptests/spintrcritical13/init.c
> +++ b/testsuites/sptests/spintrcritical13/init.c
> @@ -70,7 +70,8 @@ rtems_task Init(
> {
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Trying to generate timer fire from ISR while firing" );
> puts( "Init - Variation is: " TEST_STRING );
> @@ -93,7 +94,8 @@ rtems_task Init(
>
> interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c
> index 6f2548ff6f..e79cc73bfc 100644
> --- a/testsuites/sptests/spintrcritical15/init.c
> +++ b/testsuites/sptests/spintrcritical15/init.c
> @@ -59,7 +59,8 @@ rtems_task Init(
> {
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts(
> "Init - Trying to generate timeout of a thread while another is blocking\n"
> "Init - on the same thread queue\n"
> @@ -92,7 +93,8 @@ rtems_task Init(
>
> interrupt_critical_section_test( test_body, NULL, NULL );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c
> index 1879cbd189..6954fd0906 100644
> --- a/testsuites/sptests/spintrcritical16/init.c
> +++ b/testsuites/sptests/spintrcritical16/init.c
> @@ -65,7 +65,8 @@ static rtems_task Init(
> {
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> puts(
> "Init - Trying to generate timeout of a thread that had its blocking\n"
> "Init - request satisfied while blocking but before time timeout"
> @@ -87,7 +88,8 @@ static rtems_task Init(
>
> if ( case_hit ) {
> puts( "Init - Case hit" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> } else
> puts( "Init - Case not hit - ran too long" );
>
> diff --git a/testsuites/sptests/spintrcritical18/init.c b/testsuites/sptests/spintrcritical18/init.c
> index d15ab80f19..56cc32d0ee 100644
> --- a/testsuites/sptests/spintrcritical18/init.c
> +++ b/testsuites/sptests/spintrcritical18/init.c
> @@ -109,7 +109,8 @@ static void Init( rtems_task_argument ignored )
> test_context *ctx = &global_ctx;
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sc = rtems_task_create(
> rtems_build_name( 'H', 'I', 'G', 'H' ),
> @@ -147,7 +148,8 @@ static void Init( rtems_task_argument ignored )
>
> interrupt_critical_section_test( test_body, ctx, active_high_priority_task );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spintrcritical20/init.c b/testsuites/sptests/spintrcritical20/init.c
> index f9c52809a9..0179f524bf 100644
> --- a/testsuites/sptests/spintrcritical20/init.c
> +++ b/testsuites/sptests/spintrcritical20/init.c
> @@ -114,7 +114,8 @@ static void Init(rtems_task_argument ignored)
> test_context *ctx = &ctx_instance;
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ctx->master_task = rtems_task_self();
>
> @@ -150,7 +151,8 @@ static void Init(rtems_task_argument ignored)
> rtems_test_assert(ctx->status_was_successful);
> rtems_test_assert(ctx->status_was_timeout);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spintrcritical21/init.c b/testsuites/sptests/spintrcritical21/init.c
> index faa48f717c..771c4e306d 100644
> --- a/testsuites/sptests/spintrcritical21/init.c
> +++ b/testsuites/sptests/spintrcritical21/init.c
> @@ -123,7 +123,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> main_task = rtems_task_self();
> main_thread = _Thread_Get_executing();
> @@ -175,6 +176,7 @@ rtems_task Init(
>
> rtems_test_assert( case_hit );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c
> index 0ffb8cf89c..4324684c2e 100644
> --- a/testsuites/sptests/spintrcritical22/init.c
> +++ b/testsuites/sptests/spintrcritical22/init.c
> @@ -99,7 +99,8 @@ static void Init(rtems_task_argument ignored)
> test_context *ctx = &ctx_instance;
> rtems_status_code sc;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ctx->main_task_control = _Thread_Get_executing();
>
> @@ -117,7 +118,8 @@ static void Init(rtems_task_argument ignored)
> interrupt_critical_section_test(test_body, ctx, release_semaphore);
> rtems_test_assert(ctx->done);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spintrcritical23/init.c b/testsuites/sptests/spintrcritical23/init.c
> index c0a159471c..acadb44ef1 100644
> --- a/testsuites/sptests/spintrcritical23/init.c
> +++ b/testsuites/sptests/spintrcritical23/init.c
> @@ -116,7 +116,8 @@ static void Init(rtems_task_argument arg)
> {
> test_context *ctx = &ctx_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_interrupt_lock_initialize(&ctx->lock, "Test");
> ctx->priority_task = 1;
> @@ -127,7 +128,8 @@ static void Init(rtems_task_argument arg)
> interrupt_critical_section_test(test_body, ctx, change_priority);
> rtems_test_assert(ctx->done);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spintrcritical24/init.c b/testsuites/sptests/spintrcritical24/init.c
> index 4c74ee5929..bc8ba8c191 100644
> --- a/testsuites/sptests/spintrcritical24/init.c
> +++ b/testsuites/sptests/spintrcritical24/init.c
> @@ -124,9 +124,11 @@ static void test(test_context *ctx)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> test(&test_instance);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/splinkersets01/init.c b/testsuites/sptests/splinkersets01/init.c
> index a567cb9449..cedff11d75 100644
> --- a/testsuites/sptests/splinkersets01/init.c
> +++ b/testsuites/sptests/splinkersets01/init.c
> @@ -254,12 +254,14 @@ static void test_content(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
> test_content();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spmkdir/init.c b/testsuites/sptests/spmkdir/init.c
> index d2d12657f4..9af5eab2f1 100644
> --- a/testsuites/sptests/spmkdir/init.c
> +++ b/testsuites/sptests/spmkdir/init.c
> @@ -56,7 +56,8 @@ static rtems_task Init(rtems_task_argument argument)
> mode_t omode = S_IRWXU | S_IRWXG | S_IRWXO;
> int rv = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "rtems_mkdir a - OK" );
> test_mkdir("a", omode, 0);
> @@ -99,7 +100,8 @@ static rtems_task Init(rtems_task_argument argument)
> test_mkdir("b", omode, -1);
> rtems_test_assert(errno == EEXIST);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/sptests/spmountmgr01/init.c b/testsuites/sptests/spmountmgr01/init.c
> index a55beace39..521e689b53 100644
> --- a/testsuites/sptests/spmountmgr01/init.c
> +++ b/testsuites/sptests/spmountmgr01/init.c
> @@ -42,7 +42,8 @@ rtems_task Init(
> int status = 0;
> void *greedy;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - allocating most of heap -- OK" );
> greedy = rtems_heap_greedy_allocate( NULL, 0 );
> @@ -116,7 +117,8 @@ rtems_task Init(
> rtems_test_assert( status == -1 );
> rtems_test_assert( errno == ENOENT );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spmrsp01/init.c b/testsuites/sptests/spmrsp01/init.c
> index c7b2ae27c2..e14fa9c0e2 100644
> --- a/testsuites/sptests/spmrsp01/init.c
> +++ b/testsuites/sptests/spmrsp01/init.c
> @@ -306,7 +306,8 @@ static void Init(rtems_task_argument arg)
> {
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -318,7 +319,8 @@ static void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spmsgq_err01/init.c b/testsuites/sptests/spmsgq_err01/init.c
> index 24537725dc..567f6d3f98 100644
> --- a/testsuites/sptests/spmsgq_err01/init.c
> +++ b/testsuites/sptests/spmsgq_err01/init.c
> @@ -26,7 +26,8 @@ rtems_task Init(
> size_t size;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> Queue_name[ 1 ] = rtems_build_name( 'M', 'Q', '1', ' ' );
> Queue_name[ 2 ] = rtems_build_name( 'M', 'Q', '2', ' ' );
>
> @@ -402,5 +403,6 @@ rtems_task Init(
> "TA1 - rtems_message_queue_broadcast - NULL count - RTEMS_INVALID_ADDRESS"
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spmsgq_err02/init.c b/testsuites/sptests/spmsgq_err02/init.c
> index 2ed5057007..96fdb91935 100644
> --- a/testsuites/sptests/spmsgq_err02/init.c
> +++ b/testsuites/sptests/spmsgq_err02/init.c
> @@ -25,7 +25,8 @@ rtems_task Init(
> long buffer[ 4 ];
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> Queue_name[ 1 ] = rtems_build_name( 'M', 'Q', '1', ' ' );
> Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
>
> @@ -152,5 +153,6 @@ rtems_task Init(
> status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
> directive_failed( status, "rtems_task_wake_after (yield)" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spmutex01/init.c b/testsuites/sptests/spmutex01/init.c
> index 8590dde00f..90e83d911d 100644
> --- a/testsuites/sptests/spmutex01/init.c
> +++ b/testsuites/sptests/spmutex01/init.c
> @@ -665,7 +665,8 @@ static void Init(rtems_task_argument arg)
> test_context *ctx = &test_instance;
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> rtems_resource_snapshot_take(&snapshot);
>
> set_up(ctx);
> @@ -683,7 +684,8 @@ static void Init(rtems_task_argument arg)
> tear_down(ctx);
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spnsext01/init.c b/testsuites/sptests/spnsext01/init.c
> index 86e8225c6f..7ce1b27d22 100644
> --- a/testsuites/sptests/spnsext01/init.c
> +++ b/testsuites/sptests/spnsext01/init.c
> @@ -32,7 +32,8 @@ static rtems_task Init(rtems_task_argument argument)
> struct timespec uptime;
> struct timespec new_uptime;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Align with clock tick */
> t0 = rtems_clock_get_ticks_since_boot();
> @@ -69,7 +70,8 @@ static rtems_task Init(rtems_task_argument argument)
> rtems_interrupt_lock_release(&lock, &lock_context);
> rtems_interrupt_lock_destroy(&lock);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c
> index 620185c1f3..4dbb9c02eb 100644
> --- a/testsuites/sptests/spobjgetnext/init.c
> +++ b/testsuites/sptests/spobjgetnext/init.c
> @@ -66,7 +66,8 @@ rtems_task Init(
> Objects_Information *info;
> Objects_Maximum active_count;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> info = &_RTEMS_tasks_Information.Objects;
> main_task = rtems_task_self();
> @@ -103,6 +104,7 @@ rtems_task Init(
> _Objects_Allocator_unlock();
> rtems_test_assert( active_count == 1 );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sppagesize/init.c b/testsuites/sptests/sppagesize/init.c
> index 1f2f1f1432..0e761c5c87 100644
> --- a/testsuites/sptests/sppagesize/init.c
> +++ b/testsuites/sptests/sppagesize/init.c
> @@ -25,12 +25,14 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_test_assert(PAGESIZE == PAGE_SIZE);
> rtems_test_assert(getpagesize() == PAGE_SIZE);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sppartition_err01/init.c b/testsuites/sptests/sppartition_err01/init.c
> index 39ee700daa..bb88989d21 100644
> --- a/testsuites/sptests/sppartition_err01/init.c
> +++ b/testsuites/sptests/sppartition_err01/init.c
> @@ -333,10 +333,12 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_partition_errors();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spport_err01/init.c b/testsuites/sptests/spport_err01/init.c
> index 20e66737b9..3b32447100 100644
> --- a/testsuites/sptests/spport_err01/init.c
> +++ b/testsuites/sptests/spport_err01/init.c
> @@ -23,7 +23,8 @@ rtems_task Init(
> void *converted;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> Port_name[ 1 ] = rtems_build_name( 'D', 'P', '1', ' ' );
> status = rtems_port_create(
> 0,
> @@ -148,5 +149,6 @@ rtems_task Init(
> );
> puts( "TA1 - rtems_port_external_to_internal - RTEMS_INVALID_ADDRESS" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c
> index 4ef28daf5d..805d024f06 100644
> --- a/testsuites/sptests/spprintk/init.c
> +++ b/testsuites/sptests/spprintk/init.c
> @@ -191,7 +191,8 @@ static rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> do_putk();
> putk("");
> @@ -202,7 +203,8 @@ static rtems_task Init(
> do_getchark();
> test_io_printf(&test_instance);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c
> index b6b6c14541..1bedd1e769 100644
> --- a/testsuites/sptests/spprivenv01/init.c
> +++ b/testsuites/sptests/spprivenv01/init.c
> @@ -49,7 +49,8 @@ rtems_task Init(
> rtems_name another_task_name;
> rtems_user_env_t *current_env;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - allocating most of heap -- OK" );
> opaque = rtems_heap_greedy_allocate( NULL, 0 );
> @@ -108,7 +109,8 @@ rtems_task Init(
> rtems_libio_use_global_env();
> rtems_test_assert( rtems_current_user_env == &rtems_global_user_env );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spprofiling01/init.c b/testsuites/sptests/spprofiling01/init.c
> index a0e3188e09..516bf8c5c9 100644
> --- a/testsuites/sptests/spprofiling01/init.c
> +++ b/testsuites/sptests/spprofiling01/init.c
> @@ -127,12 +127,14 @@ static void test_report_xml(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_iterate();
> test_report_xml();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spqreslib/init.c b/testsuites/sptests/spqreslib/init.c
> index d00b623043..0763c8c6cb 100644
> --- a/testsuites/sptests/spqreslib/init.c
> +++ b/testsuites/sptests/spqreslib/init.c
> @@ -50,7 +50,8 @@ rtems_task Init(
> params1.Q = -1;
> params3.P = -1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
>
> status = rtems_task_create(
> diff --git a/testsuites/sptests/spqreslib/task_periodic.c b/testsuites/sptests/spqreslib/task_periodic.c
> index b219514724..89c1b725d4 100644
> --- a/testsuites/sptests/spqreslib/task_periodic.c
> +++ b/testsuites/sptests/spqreslib/task_periodic.c
> @@ -131,6 +131,7 @@ rtems_task Task_Periodic(
> printf( "ERROR: QRES CLEANUP\n" );
>
> fflush(stdout);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spratemon_err01/init.c b/testsuites/sptests/spratemon_err01/init.c
> index ccc2361295..c569a96cc4 100644
> --- a/testsuites/sptests/spratemon_err01/init.c
> +++ b/testsuites/sptests/spratemon_err01/init.c
> @@ -22,7 +22,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> Task_name[ 4 ] = rtems_build_name( 'T', 'A', '4', ' ' );
> Period_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
>
> @@ -38,5 +39,6 @@ rtems_task Init(
> puts( "TA1 - rtems_task_create - 4 created - RTEMS_SUCCESSFUL" );
>
> Screen10();
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c
> index cbd6c8f9e1..91aca247d8 100644
> --- a/testsuites/sptests/sprbtree01/init.c
> +++ b/testsuites/sptests/sprbtree01/init.c
> @@ -1765,7 +1765,8 @@ rtems_task Init( rtems_task_argument ignored )
> int id;
> int i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - Initialize rbtree empty" );
> rtems_rbtree_initialize_empty( &rbtree1 );
> @@ -2300,7 +2301,8 @@ rtems_task Init( rtems_task_argument ignored )
> test_rbtree_insert_inline();
> test_rbtree_random_ops();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spregion_err01/init.c b/testsuites/sptests/spregion_err01/init.c
> index 6dd8db63cf..49c40a2133 100644
> --- a/testsuites/sptests/spregion_err01/init.c
> +++ b/testsuites/sptests/spregion_err01/init.c
> @@ -431,10 +431,12 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> region_error_tests();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sprmsched01/init.c b/testsuites/sptests/sprmsched01/init.c
> index 5efd9e2f6b..951730bdab 100644
> --- a/testsuites/sptests/sprmsched01/init.c
> +++ b/testsuites/sptests/sprmsched01/init.c
> @@ -92,7 +92,8 @@ static rtems_task Task(
> directive_failed( status, "rate_monotonic_get_status" );
>
> if( tsk_counter[ argument ] == testnumber ){
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> status = rtems_rate_monotonic_delete( RM_period );
> directive_failed( status, "rtems_rate_monotonic_delete" );
> rtems_test_exit( 0 );
> @@ -119,7 +120,8 @@ static rtems_task Init(
> uint32_t index;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* Create two tasks */
> for ( index = 0; index < RTEMS_ARRAY_SIZE(Task_name); ++index ){
> diff --git a/testsuites/sptests/sprmsched02/init.c b/testsuites/sptests/sprmsched02/init.c
> index 3834542622..4b9e21423b 100644
> --- a/testsuites/sptests/sprmsched02/init.c
> +++ b/testsuites/sptests/sprmsched02/init.c
> @@ -46,7 +46,8 @@ rtems_task Init(
>
> period_name = rtems_build_name('P','E','R','1');
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* create period */
> status = rtems_rate_monotonic_create(
> @@ -94,7 +95,8 @@ rtems_task Init(
>
> }
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c
> index fc03d0348d..e1c454f48e 100644
> --- a/testsuites/sptests/spscheduler01/init.c
> +++ b/testsuites/sptests/spscheduler01/init.c
> @@ -592,7 +592,8 @@ static void Init(rtems_task_argument arg)
> {
> rtems_resource_snapshot snapshot;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_resource_snapshot_take(&snapshot);
>
> @@ -607,7 +608,8 @@ static void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spsem01/init.c b/testsuites/sptests/spsem01/init.c
> index a84eead468..902553334a 100644
> --- a/testsuites/sptests/spsem01/init.c
> +++ b/testsuites/sptests/spsem01/init.c
> @@ -49,7 +49,8 @@ rtems_task Init(rtems_task_argument ignored)
> rtems_status_code status;
> rtems_attribute sem_attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sem_attr = RTEMS_INHERIT_PRIORITY | RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY;
>
> @@ -133,7 +134,8 @@ rtems_task Task01(rtems_task_argument ignored)
> printf("TA01: priority %d\n", getprio());
>
> printf("TA01: exiting\n");
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spsem02/init.c b/testsuites/sptests/spsem02/init.c
> index 99def724f4..2757394559 100644
> --- a/testsuites/sptests/spsem02/init.c
> +++ b/testsuites/sptests/spsem02/init.c
> @@ -50,7 +50,8 @@ rtems_task Init(rtems_task_argument ignored)
> rtems_status_code status;
> rtems_attribute sem_attr;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> sem_attr = RTEMS_INHERIT_PRIORITY | RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY;
>
> @@ -151,7 +152,8 @@ rtems_task Task01(rtems_task_argument ignored)
> printf("TA01: priority %d\n", getprio());
>
> printf("TA01: exiting\n");
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spsem03/init.c b/testsuites/sptests/spsem03/init.c
> index 780219d06e..e9ce2ba772 100644
> --- a/testsuites/sptests/spsem03/init.c
> +++ b/testsuites/sptests/spsem03/init.c
> @@ -111,7 +111,8 @@ static void Init(rtems_task_argument arg)
> {
> test_context *ctx = &test_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ctx->low = rtems_task_self();
>
> @@ -135,7 +136,8 @@ static void Init(rtems_task_argument arg)
> assert_prio(ctx->high, 1);
> assert_prio(ctx->inversion, 2);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spsem_err01/init.c b/testsuites/sptests/spsem_err01/init.c
> index 39a366b41a..f88dccda94 100644
> --- a/testsuites/sptests/spsem_err01/init.c
> +++ b/testsuites/sptests/spsem_err01/init.c
> @@ -24,7 +24,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Semaphore_name[ 1 ] = rtems_build_name( 'S', 'M', '1', ' ' );
> Semaphore_name[ 2 ] = rtems_build_name( 'S', 'M', '2', ' ' );
> @@ -268,5 +269,6 @@ rtems_task Init(
> );
> puts( "TA1 - rtems_semaphore_flush - RTEMS_INVALID_ID" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spsem_err02/init.c b/testsuites/sptests/spsem_err02/init.c
> index 4c0acb9039..ba1d948d5f 100644
> --- a/testsuites/sptests/spsem_err02/init.c
> +++ b/testsuites/sptests/spsem_err02/init.c
> @@ -22,7 +22,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Semaphore_name[ 1 ] = rtems_build_name( 'S', 'M', '1', ' ' );
> Semaphore_name[ 2 ] = rtems_build_name( 'S', 'M', '2', ' ' );
> @@ -154,5 +155,6 @@ rtems_task Init(
> status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
> directive_failed( status, "rtems_task_wake_after (yield)" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spsignal_err01/init.c b/testsuites/sptests/spsignal_err01/init.c
> index 6f8cd3ef60..c8eba42da6 100644
> --- a/testsuites/sptests/spsignal_err01/init.c
> +++ b/testsuites/sptests/spsignal_err01/init.c
> @@ -22,7 +22,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> /* send invalid id */
> status = rtems_signal_send( 100, RTEMS_SIGNAL_1 );
> fatal_directive_status(
> @@ -50,5 +51,6 @@ rtems_task Init(
> );
> puts( "TA1 - rtems_signal_send - RTEMS_NOT_DEFINED" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/spsimplesched01/init.c b/testsuites/sptests/spsimplesched01/init.c
> index 90af5c4462..c63051d75e 100644
> --- a/testsuites/sptests/spsimplesched01/init.c
> +++ b/testsuites/sptests/spsimplesched01/init.c
> @@ -42,7 +42,8 @@ rtems_task Test_task(
> status = rtems_clock_get_tod( &time );
> directive_failed( status, "clock get tod" );
> if ( time.second >= 35 ) {
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> put_name( Task_name[ task_index ], FALSE );
> @@ -62,7 +63,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_task_priority old;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> time.year = 1988;
> time.month = 12;
> diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c
> index f683a7dd90..a236f6b3bb 100644
> --- a/testsuites/sptests/spsimplesched02/init.c
> +++ b/testsuites/sptests/spsimplesched02/init.c
> @@ -78,7 +78,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = _Objects_Name_to_id_u32(
> &_Thread_Internal_information.Objects,
> @@ -136,7 +137,8 @@ rtems_task Init(
> ObtainRelease( true );
>
> /* End the Test */
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spsimplesched03/init.c b/testsuites/sptests/spsimplesched03/init.c
> index a5970ee8ab..ed00fe8cdd 100644
> --- a/testsuites/sptests/spsimplesched03/init.c
> +++ b/testsuites/sptests/spsimplesched03/init.c
> @@ -24,7 +24,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "INIT - rtems timer initiate server");
> status = rtems_timer_initiate_server(
> @@ -35,7 +36,8 @@ rtems_task Init(
> directive_failed( status, "Timer Initiate Server" );
>
> /* End the Test */
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c
> index c26ba06c70..4645ad4ae1 100644
> --- a/testsuites/sptests/spsize/init.c
> +++ b/testsuites/sptests/spsize/init.c
> @@ -42,9 +42,11 @@ rtems_task Init(
>
> setvbuf(stdout, 0, _IONBF, 0);
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> size_rtems( 1 );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> #if defined(HAVE_MENU)
> do {
> diff --git a/testsuites/sptests/spstdthreads01/init.c b/testsuites/sptests/spstdthreads01/init.c
> index 72c4a153e9..f3ac9fd1da 100644
> --- a/testsuites/sptests/spstdthreads01/init.c
> +++ b/testsuites/sptests/spstdthreads01/init.c
> @@ -400,11 +400,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c
> index ab9612c94a..225fe35e08 100644
> --- a/testsuites/sptests/spstkalloc/init.c
> +++ b/testsuites/sptests/spstkalloc/init.c
> @@ -48,7 +48,8 @@ rtems_task Init(
> rtems_id taskId;
> rtems_id taskId1;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - create task TA1 to use custom stack allocator - OK" );
> rc = rtems_task_create(
> @@ -76,7 +77,8 @@ rtems_task Init(
> rc = rtems_task_delete( taskId );
> directive_failed( rc, "rtems_task_delete of TA1" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c
> index d6812fb043..a83b6977d5 100644
> --- a/testsuites/sptests/spstkalloc02/init.c
> +++ b/testsuites/sptests/spstkalloc02/init.c
> @@ -74,7 +74,8 @@ static rtems_task Init(rtems_task_argument argument)
> rtems_id id = RTEMS_ID_NONE;
> int i = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> print_info();
>
> @@ -112,7 +113,8 @@ static rtems_task Init(rtems_task_argument argument)
>
> print_info();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spsysinit01/init.c b/testsuites/sptests/spsysinit01/init.c
> index 4b62302bd6..23a9117699 100644
> --- a/testsuites/sptests/spsysinit01/init.c
> +++ b/testsuites/sptests/spsysinit01/init.c
> @@ -213,7 +213,8 @@ LAST(RTEMS_SYSINIT_BSP_START)
> * Some BSPs initialize the printk() support in bsp_start(). So, print begin
> * of test after bsp_start().
> */
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> next_step(BSP_START_POST);
> }
> @@ -648,7 +649,8 @@ static void Init(rtems_task_argument arg)
> pthread_cleanup_pop(0);
> #endif /* RTEMS_POSIX_API */
> next_step(INIT_TASK);
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> exit(0);
> }
>
> diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c
> index 1e3d16a675..94af36c85e 100644
> --- a/testsuites/sptests/spsyslock01/init.c
> +++ b/testsuites/sptests/spsyslock01/init.c
> @@ -676,11 +676,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sptask_err01/init.c b/testsuites/sptests/sptask_err01/init.c
> index b57e751aa6..35cfb5f1e8 100644
> --- a/testsuites/sptests/sptask_err01/init.c
> +++ b/testsuites/sptests/sptask_err01/init.c
> @@ -22,7 +22,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
>
> @@ -53,5 +54,6 @@ rtems_task Init(
> );
> puts( "TA1 - rtems_task_delete TA2 - already deleted RTEMS_INVALID_ID" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/sptask_err02/init.c b/testsuites/sptests/sptask_err02/init.c
> index dfdaf396d0..60f1001443 100644
> --- a/testsuites/sptests/sptask_err02/init.c
> +++ b/testsuites/sptests/sptask_err02/init.c
> @@ -23,7 +23,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> /* wake when NULL param */
> status = rtems_task_wake_when( NULL );
> @@ -115,5 +116,6 @@ rtems_task Init(
> );
> puts( " - RTEMS_INVALID_CLOCK" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/sptask_err03/init.c b/testsuites/sptests/sptask_err03/init.c
> index d28a601418..964c99a78f 100644
> --- a/testsuites/sptests/sptask_err03/init.c
> +++ b/testsuites/sptests/sptask_err03/init.c
> @@ -24,7 +24,8 @@ rtems_task Init(
> rtems_status_code status;
> bool skipUnsatisfied;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> @@ -256,5 +257,6 @@ rtems_task Init(
> #endif
> puts( "TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> }
> diff --git a/testsuites/sptests/sptask_err04/init.c b/testsuites/sptests/sptask_err04/init.c
> index c9af611d27..4b51329eca 100644
> --- a/testsuites/sptests/sptask_err04/init.c
> +++ b/testsuites/sptests/sptask_err04/init.c
> @@ -24,7 +24,8 @@ rtems_task Init(
> {
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_id[ 0 ] = rtems_task_self();
>
> diff --git a/testsuites/sptests/sptask_err04/task1.c b/testsuites/sptests/sptask_err04/task1.c
> index 29b63db5f4..a6a01fe8d2 100644
> --- a/testsuites/sptests/sptask_err04/task1.c
> +++ b/testsuites/sptests/sptask_err04/task1.c
> @@ -192,7 +192,8 @@ rtems_task Task_1(
> );
> puts( "TA1 - rtems_task_mode - RTEMS_INVALID_ADDRESS" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/sptasknopreempt01/init.c b/testsuites/sptests/sptasknopreempt01/init.c
> index 2d698e0f18..5636a1f153 100644
> --- a/testsuites/sptests/sptasknopreempt01/init.c
> +++ b/testsuites/sptests/sptasknopreempt01/init.c
> @@ -71,11 +71,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spthreadlife01/init.c b/testsuites/sptests/spthreadlife01/init.c
> index 6cab1dd857..493e40d16b 100644
> --- a/testsuites/sptests/spthreadlife01/init.c
> +++ b/testsuites/sptests/spthreadlife01/init.c
> @@ -408,11 +408,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c
> index 64a51bcf18..4160ac1a18 100644
> --- a/testsuites/sptests/spthreadq01/init.c
> +++ b/testsuites/sptests/spthreadq01/init.c
> @@ -273,7 +273,8 @@ static rtems_task Init(
> {
> test_context *ctx = &test_instance;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "Init - _Thread_queue_Extract - thread not blocked on a thread queue" );
> _Thread_queue_Extract( _Thread_Get_executing() );
> @@ -285,7 +286,8 @@ static rtems_task Init(
>
> rtems_test_assert( _Thread_queue_Is_empty( &queue.Queue ) );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sptimecounter01/init.c b/testsuites/sptests/sptimecounter01/init.c
> index f56e8cf796..c6d91e6db5 100644
> --- a/testsuites/sptests/sptimecounter01/init.c
> +++ b/testsuites/sptests/sptimecounter01/init.c
> @@ -54,7 +54,8 @@ void boot_card(const char *cmdline)
> struct timeval tv;
> struct timespec ts;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> assert(time(NULL) == TOD_SECONDS_1970_THROUGH_1988);
>
> @@ -148,7 +149,8 @@ void boot_card(const char *cmdline)
> assert(bt.sec == 1);
> assert(bt.frac == 18446742522092);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> _Terminate(RTEMS_FATAL_SOURCE_EXIT, 0);
> }
> diff --git a/testsuites/sptests/sptimecounter02/init.c b/testsuites/sptests/sptimecounter02/init.c
> index abd550f4f6..142be478f4 100644
> --- a/testsuites/sptests/sptimecounter02/init.c
> +++ b/testsuites/sptests/sptimecounter02/init.c
> @@ -216,7 +216,8 @@ static void Init(rtems_task_argument arg)
> struct timespec ts;
> struct timeval tv;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf("<SPTimecounter01>\n");
>
> @@ -244,7 +245,8 @@ static void Init(rtems_task_argument arg)
>
> printf("</SPTimecounter01>\n");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sptimecounter03/init.c b/testsuites/sptests/sptimecounter03/init.c
> index a471a19781..76d21d0a90 100644
> --- a/testsuites/sptests/sptimecounter03/init.c
> +++ b/testsuites/sptests/sptimecounter03/init.c
> @@ -81,11 +81,13 @@ static const rtems_test_parallel_job jobs[] = {
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_test_parallel(&ctx, NULL, &jobs[0], RTEMS_ARRAY_SIZE(jobs));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sptimecounter04/init.c b/testsuites/sptests/sptimecounter04/init.c
> index f1304a3c5c..905a1e0d92 100644
> --- a/testsuites/sptests/sptimecounter04/init.c
> +++ b/testsuites/sptests/sptimecounter04/init.c
> @@ -39,7 +39,8 @@ static void Init(rtems_task_argument arg)
>
> int rv;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_timespec_set(&min, 1, 980000000);
> rtems_timespec_set(&max, 2, 20000000);
> @@ -64,7 +65,8 @@ static void Init(rtems_task_argument arg)
> rtems_test_assert(rtems_timespec_greater_than(&mono_elapsed, &min));
> rtems_test_assert(rtems_timespec_greater_than(&max, &mono_elapsed));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sptimer_err01/init.c b/testsuites/sptests/sptimer_err01/init.c
> index 1faa2e27fa..034ceabe05 100644
> --- a/testsuites/sptests/sptimer_err01/init.c
> +++ b/testsuites/sptests/sptimer_err01/init.c
> @@ -27,7 +27,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_status_code status;
> rtems_time_of_day time;
> @@ -243,7 +244,8 @@ rtems_task Init(
> puts( "TA1 - rtems_timer_get_information - RTEMS_INVALID_ID" );
>
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sptimer_err02/init.c b/testsuites/sptests/sptimer_err02/init.c
> index 882f86be1a..6e85c467be 100644
> --- a/testsuites/sptests/sptimer_err02/init.c
> +++ b/testsuites/sptests/sptimer_err02/init.c
> @@ -27,7 +27,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_status_code status;
> rtems_time_of_day time;
> @@ -199,7 +200,8 @@ rtems_task Init(
> " - before RTEMS_INVALID_CLOCK\n"
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sptimerserver01/init.c b/testsuites/sptests/sptimerserver01/init.c
> index 237f8b3699..e6a073eed1 100644
> --- a/testsuites/sptests/sptimerserver01/init.c
> +++ b/testsuites/sptests/sptimerserver01/init.c
> @@ -106,11 +106,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/sptests/sptimespec01/init.c b/testsuites/sptests/sptimespec01/init.c
> index 53aba88bf2..ac4d854644 100644
> --- a/testsuites/sptests/sptimespec01/init.c
> +++ b/testsuites/sptests/sptimespec01/init.c
> @@ -42,7 +42,8 @@ rtems_task Init(
> timespec1=&ts1;
> timespec2=&ts2;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_add();
> test_divide();
> @@ -52,7 +53,8 @@ rtems_task Init(
> test_subtract();
> test_convert();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c
> index 7724f63af2..bdd0a84885 100644
> --- a/testsuites/sptests/sptls01/init.c
> +++ b/testsuites/sptests/sptls01/init.c
> @@ -86,11 +86,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/sptls02/init.cc b/testsuites/sptests/sptls02/init.cc
> index 1cbefc6fcc..5ded57fa3a 100644
> --- a/testsuites/sptests/sptls02/init.cc
> +++ b/testsuites/sptests/sptls02/init.cc
> @@ -248,7 +248,8 @@ static void testWorkerTask()
>
> extern "C" void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf("A::globalCounter() = %li\n", A::globalCounter());
>
> @@ -267,7 +268,8 @@ extern "C" void Init(rtems_task_argument arg)
>
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> exit(0);
> }
> diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c
> index 6690ec349c..0b003bb004 100644
> --- a/testsuites/sptests/sptls03/init.c
> +++ b/testsuites/sptests/sptls03/init.c
> @@ -38,11 +38,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spversion01/init.c b/testsuites/sptests/spversion01/init.c
> index 3fc6f0a89c..6dc533ac4f 100644
> --- a/testsuites/sptests/spversion01/init.c
> +++ b/testsuites/sptests/spversion01/init.c
> @@ -22,7 +22,8 @@ static rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf("Release : %s\n", rtems_version());
> printf("Major : %d\n", rtems_version_major());
> @@ -30,7 +31,8 @@ static rtems_task Init(
> printf("Revision : %d\n", rtems_version_revision());
> printf("VC Key : %s\n", rtems_version_control_key());
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c
> index 0c7d41fd33..1fa8950815 100644
> --- a/testsuites/sptests/spwatchdog/init.c
> +++ b/testsuites/sptests/spwatchdog/init.c
> @@ -231,7 +231,8 @@ rtems_task Init(
> rtems_time_of_day time;
> rtems_status_code status;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_watchdog_operations();
> test_watchdog_static_init();
> diff --git a/testsuites/sptests/spwatchdog/task1.c b/testsuites/sptests/spwatchdog/task1.c
> index 568ad86197..4b177279f2 100644
> --- a/testsuites/sptests/spwatchdog/task1.c
> +++ b/testsuites/sptests/spwatchdog/task1.c
> @@ -81,6 +81,7 @@ rtems_task Task_1(
> status = rtems_timer_delete( tmid );
> directive_failed( status, "rtems_timer_delete" );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c
> index ab07e006c5..7cbc0b0966 100644
> --- a/testsuites/sptests/spwkspace/init.c
> +++ b/testsuites/sptests/spwkspace/init.c
> @@ -75,7 +75,8 @@ rtems_task Init(
> bool retbool;
> Heap_Information_block info;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> puts( "rtems_workspace_get_information - null pointer" );
> retbool = rtems_workspace_get_information( NULL );
> @@ -116,7 +117,8 @@ rtems_task Init(
> puts( "_Workspace_Allocate_aligned" );
> test_workspace_allocate_aligned();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/support/include/buffer_test_io.h b/testsuites/support/include/buffer_test_io.h
> deleted file mode 100644
> index ea68fea0d8..0000000000
> --- a/testsuites/support/include/buffer_test_io.h
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -/*
> - * Support for running the test output through a buffer
> - */
> -
> -#ifndef __BUFFER_TEST_IO_h
> -#define __BUFFER_TEST_IO_h
> -
> -#include <rtems/test.h>
> -
> -#ifdef __cplusplus
> -extern "C" {
> -#endif
> -
> -#define TEST_BEGIN() rtems_test_begin(rtems_test_name, TEST_STATE)
> -#define TEST_END() rtems_test_end(rtems_test_name)
> -
> -#ifdef __cplusplus
> -};
> -#endif
> -
> -#endif
> diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
> index 60da7647dc..a3dc298bb5 100644
> --- a/testsuites/support/include/tmacros.h
> +++ b/testsuites/support/include/tmacros.h
> @@ -29,8 +29,6 @@
> #include <rtems/test.h>
> #include <rtems/score/threaddispatch.h>
>
> -#include <buffer_test_io.h>
> -
> #ifdef __cplusplus
> extern "C" {
> #endif
> diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
> index 98f9f053f2..75767e99ed 100644
> --- a/testsuites/tmtests/tm01/task1.c
> +++ b/testsuites/tmtests/tm01/task1.c
> @@ -28,7 +28,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
> Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
> @@ -187,6 +188,7 @@ rtems_task Test_task(
> CALLING_OVERHEAD_SEMAPHORE_RELEASE
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
> index b3761502be..232fe1cf80 100644
> --- a/testsuites/tmtests/tm02/task1.c
> +++ b/testsuites/tmtests/tm02/task1.c
> @@ -66,7 +66,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -178,6 +179,7 @@ rtems_task Low_task(
> CALLING_OVERHEAD_SEMAPHORE_OBTAIN
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
> index 42126ac8a5..7ac59946ae 100644
> --- a/testsuites/tmtests/tm03/task1.c
> +++ b/testsuites/tmtests/tm03/task1.c
> @@ -63,7 +63,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
> status = rtems_task_create(
> rtems_build_name( 'T', 'A', '1', ' ' ),
> RTEMS_MAXIMUM_PRIORITY - 1u,
> @@ -170,6 +171,7 @@ rtems_task High_task(
> CALLING_OVERHEAD_SEMAPHORE_RELEASE
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
> index 7be2afd7c1..46799d5e34 100644
> --- a/testsuites/tmtests/tm04/task1.c
> +++ b/testsuites/tmtests/tm04/task1.c
> @@ -47,7 +47,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -333,7 +334,8 @@ rtems_task High_task(
> CALLING_OVERHEAD_TASK_DELETE
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
> index d1485e25bd..349a97dbeb 100644
> --- a/testsuites/tmtests/tm05/task1.c
> +++ b/testsuites/tmtests/tm05/task1.c
> @@ -43,7 +43,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -104,7 +105,8 @@ rtems_task High_task(
> CALLING_OVERHEAD_TASK_RESUME
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
> index a784f9cfac..6730e49f96 100644
> --- a/testsuites/tmtests/tm06/task1.c
> +++ b/testsuites/tmtests/tm06/task1.c
> @@ -38,7 +38,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -151,7 +152,8 @@ rtems_task Task_1(
> CALLING_OVERHEAD_TASK_RESUME
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
> index a14f1a8f23..bbf9fc99ad 100644
> --- a/testsuites/tmtests/tm07/task1.c
> +++ b/testsuites/tmtests/tm07/task1.c
> @@ -42,7 +42,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -100,7 +101,8 @@ rtems_task High_task(
> } else
> (void) rtems_task_suspend( RTEMS_SELF );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
> index a86322c61f..a10427aebd 100644
> --- a/testsuites/tmtests/tm08/task1.c
> +++ b/testsuites/tmtests/tm08/task1.c
> @@ -34,7 +34,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -213,7 +214,8 @@ rtems_task test_task(
> CALLING_OVERHEAD_CLOCK_GET
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
> index ff81571b5f..1780baa841 100644
> --- a/testsuites/tmtests/tm09/task1.c
> +++ b/testsuites/tmtests/tm09/task1.c
> @@ -31,7 +31,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> 1,
> @@ -86,7 +87,8 @@ rtems_task Test_task (
> CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
> index f7e4d27af4..41723a860b 100644
> --- a/testsuites/tmtests/tm10/task1.c
> +++ b/testsuites/tmtests/tm10/task1.c
> @@ -43,7 +43,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -167,6 +168,7 @@ rtems_task Low_task(
> CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
> index 01beb797e7..29c97ffd1f 100644
> --- a/testsuites/tmtests/tm11/task1.c
> +++ b/testsuites/tmtests/tm11/task1.c
> @@ -43,7 +43,8 @@ void Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> 1,
> @@ -157,6 +158,7 @@ rtems_task High_task(
> CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
> index dcd84c6216..11666c7d8d 100644
> --- a/testsuites/tmtests/tm12/task1.c
> +++ b/testsuites/tmtests/tm12/task1.c
> @@ -45,7 +45,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> 1,
> @@ -134,7 +135,8 @@ rtems_task High_task(
> CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
> index eac1b8bd7c..a803287e62 100644
> --- a/testsuites/tmtests/tm13/task1.c
> +++ b/testsuites/tmtests/tm13/task1.c
> @@ -45,7 +45,8 @@ void Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> 1,
> @@ -158,6 +159,7 @@ rtems_task High_task(
> CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
> index 8a7a5d7e59..b07c6b467a 100644
> --- a/testsuites/tmtests/tm14/task1.c
> +++ b/testsuites/tmtests/tm14/task1.c
> @@ -45,7 +45,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> 1,
> @@ -132,7 +133,8 @@ rtems_task High_task(
> CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
> index c3afd68e6c..4d4c1cbee3 100644
> --- a/testsuites/tmtests/tm15/task1.c
> +++ b/testsuites/tmtests/tm15/task1.c
> @@ -37,7 +37,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -195,7 +196,8 @@ rtems_task Low_task(
> CALLING_OVERHEAD_EVENT_SEND
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
> index c4aa255564..d1f74c5fd3 100644
> --- a/testsuites/tmtests/tm16/task1.c
> +++ b/testsuites/tmtests/tm16/task1.c
> @@ -41,7 +41,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'T', 'E', 'S', 'T' ),
> @@ -149,6 +150,7 @@ rtems_task High_task(
> CALLING_OVERHEAD_EVENT_SEND
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
> index 15c51a1f2b..b558143133 100644
> --- a/testsuites/tmtests/tm17/task1.c
> +++ b/testsuites/tmtests/tm17/task1.c
> @@ -43,7 +43,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_priority = RTEMS_MAXIMUM_PRIORITY - 1u;
> if ( OPERATION_COUNT > RTEMS_MAXIMUM_PRIORITY - 2u )
> @@ -128,6 +129,7 @@ rtems_task Last_task(
> CALLING_OVERHEAD_TASK_SET_PRIORITY
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
> index ca607f59f0..c69c3164a9 100644
> --- a/testsuites/tmtests/tm18/task1.c
> +++ b/testsuites/tmtests/tm18/task1.c
> @@ -42,7 +42,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test_init();
>
> @@ -109,6 +110,7 @@ rtems_task Last_task(
> CALLING_OVERHEAD_TASK_DELETE
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
> index 8f07df17f5..392a35c66f 100644
> --- a/testsuites/tmtests/tm19/task1.c
> +++ b/testsuites/tmtests/tm19/task1.c
> @@ -44,7 +44,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'T', 'I', 'M', 'E' ),
> @@ -210,6 +211,7 @@ rtems_task Task_3(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
> index ed9c204154..365d2b3add 100644
> --- a/testsuites/tmtests/tm20/task1.c
> +++ b/testsuites/tmtests/tm20/task1.c
> @@ -56,7 +56,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'T', 'I', 'M', '1' ),
> @@ -434,7 +435,8 @@ rtems_task Task_1(
> CALLING_OVERHEAD_IO_CONTROL
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
> index d7d6163d01..399803f377 100644
> --- a/testsuites/tmtests/tm21/task1.c
> +++ b/testsuites/tmtests/tm21/task1.c
> @@ -32,7 +32,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'T', 'I', 'M', 'E' ),
> @@ -233,6 +234,7 @@ rtems_task Task_1(
> CALLING_OVERHEAD_RATE_MONOTONIC_IDENT
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
> index eb4548648d..3db0bbfdf7 100644
> --- a/testsuites/tmtests/tm22/task1.c
> +++ b/testsuites/tmtests/tm22/task1.c
> @@ -42,7 +42,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_message_queue_create(
> rtems_build_name( 'M', 'Q', '1', ' '),
> @@ -181,7 +182,8 @@ rtems_task Low_task(
> CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
> index 249d62760a..4b934ea201 100644
> --- a/testsuites/tmtests/tm23/task1.c
> +++ b/testsuites/tmtests/tm23/task1.c
> @@ -52,7 +52,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> benchmark_timer_initialize();
> for ( index=1 ; index <= OPERATION_COUNT ; index++ )
> @@ -302,6 +303,7 @@ rtems_task Low_task(
> CALLING_OVERHEAD_TASK_WAKE_WHEN
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
> index 21de600e94..7a9cd569cd 100644
> --- a/testsuites/tmtests/tm24/task1.c
> +++ b/testsuites/tmtests/tm24/task1.c
> @@ -36,7 +36,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'H', 'I', 'G', 'H' ),
> @@ -119,7 +120,8 @@ rtems_task Tasks(
> CALLING_OVERHEAD_TASK_WAKE_AFTER
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
> diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
> index 7777b51df9..ae3a75f177 100644
> --- a/testsuites/tmtests/tm25/task1.c
> +++ b/testsuites/tmtests/tm25/task1.c
> @@ -36,7 +36,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_semaphore_create(
> rtems_build_name( 'S', 'M', '1', ' ') ,
> @@ -106,6 +107,7 @@ rtems_task Low_task(
> CALLING_OVERHEAD_CLOCK_TICK
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
> index 9d157e9fcf..4243ae4ab5 100644
> --- a/testsuites/tmtests/tm26/task1.c
> +++ b/testsuites/tmtests/tm26/task1.c
> @@ -147,7 +147,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (
> _Scheduler_Table[ 0 ].Operations.initialize
> @@ -155,7 +156,8 @@ rtems_task Init(
> ) {
> puts(" Error ==> " );
> puts("Test only supported for deterministic priority scheduler\n" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -698,6 +700,7 @@ void complete_test( void )
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
> index c89c0956f1..cfeac881db 100644
> --- a/testsuites/tmtests/tm27/task1.c
> +++ b/testsuites/tmtests/tm27/task1.c
> @@ -59,7 +59,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> if (
> _Scheduler_Table[ 0 ].Operations.initialize
> @@ -67,7 +68,8 @@ rtems_task Init(
> ) {
> puts(" Error ==> " );
> puts("Test only supported for deterministic priority scheduler\n" );
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> @@ -214,7 +216,8 @@ rtems_task Task_1(
> * goes to Isr_handler and then returns
> */
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
> index f157209eb5..c161982fe6 100644
> --- a/testsuites/tmtests/tm28/task1.c
> +++ b/testsuites/tmtests/tm28/task1.c
> @@ -33,7 +33,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'T', 'I', 'M', 'E' ),
> @@ -131,6 +132,7 @@ rtems_task Test_task (
> CALLING_OVERHEAD_PORT_DELETE
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
> index ef889cbf42..43b21f4080 100644
> --- a/testsuites/tmtests/tm29/task1.c
> +++ b/testsuites/tmtests/tm29/task1.c
> @@ -38,7 +38,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Period_name = rtems_build_name( 'P', 'R', 'D', ' ' );
>
> @@ -206,6 +207,7 @@ rtems_task Low_task(
> CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c
> index 309ed805c1..2f58631aa4 100644
> --- a/testsuites/tmtests/tm30/init.c
> +++ b/testsuites/tmtests/tm30/init.c
> @@ -68,7 +68,8 @@ rtems_task Init(
> rtems_task_argument argument
> )
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> rtems_time_test_measure_operation(
> "rtems_barrier_create: only case",
> @@ -94,7 +95,8 @@ rtems_task Init(
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit(0);
> }
> diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
> index e13181f912..4ab00ce89e 100644
> --- a/testsuites/tmtests/tmck/task1.c
> +++ b/testsuites/tmtests/tmck/task1.c
> @@ -45,7 +45,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ),
>
> @@ -138,7 +139,8 @@ rtems_test_pause();
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit( 0 );
> }
>
> diff --git a/testsuites/tmtests/tmcontext01/init.c b/testsuites/tmtests/tmcontext01/init.c
> index 4b3c9d8c8a..7b8445d462 100644
> --- a/testsuites/tmtests/tmcontext01/init.c
> +++ b/testsuites/tmtests/tmcontext01/init.c
> @@ -210,7 +210,8 @@ static void Init(rtems_task_argument arg)
> {
> uint32_t load = 0;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> printf("<Test>\n");
>
> @@ -258,7 +259,8 @@ static void Init(rtems_task_argument arg)
>
> printf("</Test>\n");
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/tmtests/tmfine01/init.c b/testsuites/tmtests/tmfine01/init.c
> index 21e6aff6f5..2b1b38b544 100644
> --- a/testsuites/tmtests/tmfine01/init.c
> +++ b/testsuites/tmtests/tmfine01/init.c
> @@ -768,7 +768,8 @@ static void Init(rtems_task_argument arg)
> rtems_status_code sc;
> size_t i;
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> ctx->master = rtems_task_self();
>
> @@ -803,7 +804,8 @@ static void Init(rtems_task_argument arg)
>
> printf("</%s>\n", test);
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
> index bc73f8bc5d..fc3583ecd7 100644
> --- a/testsuites/tmtests/tmoverhd/testtask.c
> +++ b/testsuites/tmtests/tmoverhd/testtask.c
> @@ -34,7 +34,8 @@ rtems_task Init(
>
> Print_Warning();
>
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> status = rtems_task_create(
> rtems_build_name( 'T', 'A', '1', ' ' ),
> @@ -1227,7 +1228,8 @@ rtems_test_pause();
> 0
> );
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
>
> rtems_test_exit( 0 );
> }
> diff --git a/testsuites/tmtests/tmtimer01/init.c b/testsuites/tmtests/tmtimer01/init.c
> index 3d337e693b..a4942d3fe0 100644
> --- a/testsuites/tmtests/tmtimer01/init.c
> +++ b/testsuites/tmtests/tmtimer01/init.c
> @@ -186,11 +186,13 @@ static void test(void)
>
> static void Init(rtems_task_argument arg)
> {
> - TEST_BEGIN();
> + rtems_test_begin(rtems_test_name, TEST_STATE);
> +
>
> test();
>
> - TEST_END();
> + rtems_test_end(rtems_test_name);
> +
> rtems_test_exit(0);
> }
>
> --
> 2.13.2
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
More information about the devel
mailing list