[rtems commit] testsuite: Use printk for all test output where possible.
Chris Johns
chrisj at rtems.org
Mon Oct 23 05:26:20 UTC 2017
Module: rtems
Branch: master
Commit: 98c6d501452f02264ff148a1b8479e420c81562d
Changeset: http://git.rtems.org/rtems/commit/?id=98c6d501452f02264ff148a1b8479e420c81562d
Author: Chris Johns <chrisj at rtems.org>
Date: Thu Oct 19 16:39:16 2017 +1100
testsuite: Use printk for all test output where possible.
- Remove the printf support leaving the direct printk support configured
with TESTS_USE_PRINTK and all other output goes via a buffered vsniprintf
call to printk.
- Control the test's single init for functions and global data with
TEST_INIT and not CONFIGURE_INIT. They are now separate.
Updates #3170.
---
testsuites/benchmarks/dhrystone/init.c | 2 +
testsuites/benchmarks/linpack/init.c | 2 +
testsuites/benchmarks/whetstone/init.c | 2 +
testsuites/fstests/fsbdpart01/init.c | 2 +
testsuites/fstests/fsclose01/init.c | 2 +
testsuites/fstests/fsdosfsformat01/init.c | 2 +
testsuites/fstests/fsdosfsname01/init.c | 2 +
testsuites/fstests/fsdosfsname02/init.c | 2 +
testsuites/fstests/fsdosfssync01/init.c | 2 +
testsuites/fstests/fsdosfswrite01/init.c | 2 +
testsuites/fstests/fsfseeko01/init.c | 2 +
testsuites/fstests/fsimfsconfig01/init.c | 2 +
testsuites/fstests/fsimfsconfig02/init.c | 2 +
testsuites/fstests/fsimfsconfig03/init.c | 2 +
testsuites/fstests/fsimfsgeneric01/init.c | 2 +
testsuites/fstests/fsnofs01/init.c | 2 +
testsuites/fstests/fsrofs01/init.c | 2 +
testsuites/fstests/imfs_support/fs_support.c | 2 +
testsuites/fstests/jffs2_support/fs_support.c | 2 +
testsuites/fstests/mdosfs_support/fs_support.c | 2 +
testsuites/fstests/mimfs_support/fs_support.c | 2 +
testsuites/fstests/mrfs_support/fs_support.c | 2 +
testsuites/libtests/block01/init.c | 2 +
testsuites/libtests/block02/init.c | 2 +
testsuites/libtests/block03/init.c | 2 +
testsuites/libtests/block04/init.c | 2 +
testsuites/libtests/block05/init.c | 2 +
testsuites/libtests/block06/init.c | 150 +++++++-------
testsuites/libtests/block07/init.c | 36 ++--
testsuites/libtests/block08/bdbuf_test3_2.c | 4 +-
testsuites/libtests/block08/bdbuf_test3_3.c | 4 +-
testsuites/libtests/block08/bdbuf_tests.c | 27 ++-
testsuites/libtests/block08/init.c | 2 +
testsuites/libtests/block08/test_disk.c | 12 +-
testsuites/libtests/block09/init.c | 2 +
testsuites/libtests/block10/init.c | 36 ++--
testsuites/libtests/block11/init.c | 2 +
testsuites/libtests/block12/init.c | 2 +
testsuites/libtests/block13/init.c | 2 +
testsuites/libtests/block14/init.c | 2 +
testsuites/libtests/block15/init.c | 2 +
testsuites/libtests/block16/init.c | 2 +
testsuites/libtests/block17/init.c | 2 +
testsuites/libtests/bspcmdline01/init.c | 2 +
testsuites/libtests/capture01/init.c | 2 +
testsuites/libtests/cpuuse/init.c | 2 +
testsuites/libtests/crypt01/init.c | 2 +
testsuites/libtests/debugger01/init.c | 2 +
testsuites/libtests/defaultconfig01/init.c | 2 +
testsuites/libtests/devfs01/init.c | 2 +
testsuites/libtests/devfs02/init.c | 2 +
testsuites/libtests/devfs03/init.c | 2 +
testsuites/libtests/devfs04/init.c | 2 +
testsuites/libtests/deviceio01/init.c | 2 +
testsuites/libtests/dl01/init.c | 2 +
testsuites/libtests/dl02/init.c | 2 +
testsuites/libtests/dl03/init.c | 2 +
testsuites/libtests/dl04/init.c | 2 +
testsuites/libtests/dl05/init.c | 2 +
testsuites/libtests/dumpbuf01/init.c | 2 +
testsuites/libtests/exit01/init.c | 2 +
testsuites/libtests/exit02/init.c | 2 +
testsuites/libtests/flashdisk01/init.c | 2 +
testsuites/libtests/ftp01/init.c | 2 +
testsuites/libtests/gxx01/init.c | 2 +
testsuites/libtests/heapwalk/init.c | 2 +
testsuites/libtests/i2c01/init.c | 2 +
testsuites/libtests/libfdt01/init.c | 2 +
testsuites/libtests/malloc02/init.c | 2 +
testsuites/libtests/malloc03/init.c | 2 +
testsuites/libtests/malloc04/init.c | 2 +
testsuites/libtests/malloctest/init.c | 2 +
testsuites/libtests/md501/init.c | 2 +
testsuites/libtests/mghttpd01/init.c | 2 +
testsuites/libtests/monitor/init.c | 2 +
testsuites/libtests/monitor02/init.c | 2 +
testsuites/libtests/mouse01/init.c | 2 +
testsuites/libtests/networking01/init.c | 2 +
testsuites/libtests/newlib01/init.c | 2 +
testsuites/libtests/putenvtest/init.c | 2 +
testsuites/libtests/pwdgrp01/init.c | 2 +
testsuites/libtests/pwdgrp02/init.c | 2 +
testsuites/libtests/rbheap01/init.c | 2 +
testsuites/libtests/rtmonuse/init.c | 2 +
testsuites/libtests/sha/init.c | 2 +
testsuites/libtests/shell01/init.c | 2 +
testsuites/libtests/sparsedisk01/init.c | 2 +
testsuites/libtests/spi01/init.c | 2 +
testsuites/libtests/stackchk/init.c | 2 +
testsuites/libtests/stackchk01/init.c | 2 +
testsuites/libtests/stringto01/init.c | 2 +
testsuites/libtests/syscall01/init.c | 2 +
testsuites/libtests/tar01/init.c | 2 +
testsuites/libtests/tar02/init.c | 2 +
testsuites/libtests/tar03/init.c | 2 +
testsuites/libtests/termios/init.c | 2 +
testsuites/libtests/termios01/init.c | 2 +
testsuites/libtests/termios02/init.c | 2 +
testsuites/libtests/termios03/init.c | 2 +
testsuites/libtests/termios04/init.c | 2 +
testsuites/libtests/termios05/init.c | 2 +
testsuites/libtests/termios06/init.c | 2 +
testsuites/libtests/termios07/init.c | 2 +
testsuites/libtests/termios08/init.c | 2 +
testsuites/libtests/termios09/init.c | 2 +
testsuites/libtests/top/init.c | 2 +
testsuites/libtests/tztest/init.c | 2 +
testsuites/libtests/uid01/init.c | 2 +
testsuites/libtests/utf8proc01/init.c | 2 +
testsuites/mptests/mp01/init.c | 2 +
testsuites/mptests/mp03/init.c | 2 +
testsuites/mptests/mp04/init.c | 2 +
testsuites/mptests/mp05/init.c | 2 +
testsuites/mptests/mp06/init.c | 2 +
testsuites/mptests/mp07/init.c | 2 +
testsuites/mptests/mp08/init.c | 2 +
testsuites/mptests/mp09/init.c | 2 +
testsuites/mptests/mp10/init.c | 2 +
testsuites/mptests/mp11/init.c | 2 +
testsuites/mptests/mp12/init.c | 2 +
testsuites/mptests/mp13/init.c | 2 +
testsuites/mptests/mp14/init.c | 2 +
testsuites/psxtests/include/pmacros.h | 1 -
testsuites/psxtests/psx01/init.c | 2 +
testsuites/psxtests/psx02/init.c | 2 +
testsuites/psxtests/psx03/init.c | 2 +
testsuites/psxtests/psx04/init.c | 2 +
testsuites/psxtests/psx05/init.c | 2 +
testsuites/psxtests/psx06/init.c | 2 +
testsuites/psxtests/psx07/init.c | 2 +
testsuites/psxtests/psx08/init.c | 2 +
testsuites/psxtests/psx09/init.c | 2 +
testsuites/psxtests/psx10/init.c | 2 +
testsuites/psxtests/psx11/init.c | 2 +
testsuites/psxtests/psx12/init.c | 2 +
testsuites/psxtests/psx13/main.c | 3 +-
testsuites/psxtests/psx14/init.c | 2 +
testsuites/psxtests/psx15/init.c | 2 +
testsuites/psxtests/psx16/init.c | 2 +
testsuites/psxtests/psxaio01/init.c | 2 +
testsuites/psxtests/psxaio02/init.c | 2 +
testsuites/psxtests/psxaio03/init.c | 2 +
testsuites/psxtests/psxalarm01/init.c | 2 +
testsuites/psxtests/psxautoinit01/init.c | 2 +
testsuites/psxtests/psxautoinit02/init.c | 2 +
testsuites/psxtests/psxbarrier01/main.c | 3 +-
testsuites/psxtests/psxcancel/init.c | 2 +
testsuites/psxtests/psxcancel01/init.c | 2 +
testsuites/psxtests/psxchroot01/main.c | 3 +-
testsuites/psxtests/psxclassic01/init.c | 2 +
testsuites/psxtests/psxcleanup/psxcleanup.c | 2 +
testsuites/psxtests/psxcleanup01/init.c | 2 +
testsuites/psxtests/psxcleanup02/init.c | 2 +
testsuites/psxtests/psxclock/init.c | 2 +
testsuites/psxtests/psxclock01/init.c | 2 +
testsuites/psxtests/psxconcurrency01/init.c | 2 +
testsuites/psxtests/psxcond01/init.c | 2 +
testsuites/psxtests/psxcond02/init.c | 2 +
testsuites/psxtests/psxconfig01/init.c | 2 +
testsuites/psxtests/psxdevctl01/main.c | 3 +-
testsuites/psxtests/psxeintr_join/init.c | 2 +
testsuites/psxtests/psxenosys/init.c | 2 +
testsuites/psxtests/psxfatal_support/init.c | 2 +
testsuites/psxtests/psxfchx01/init.c | 2 +
testsuites/psxtests/psxfile01/main.c | 3 +-
testsuites/psxtests/psxfile01/test.c | 9 +-
testsuites/psxtests/psxfile02/init.c | 2 +
testsuites/psxtests/psxfilelock01/init.c | 2 +
testsuites/psxtests/psxgetattrnp01/init.c | 2 +
testsuites/psxtests/psxgetrusage01/init.c | 2 +
testsuites/psxtests/psxglobalcon01/init.cc | 2 +
testsuites/psxtests/psxglobalcon02/init.cc | 2 +
testsuites/psxtests/psxid01/init.c | 2 +
testsuites/psxtests/psximfs01/init.c | 43 ++--
testsuites/psxtests/psximfs02/init.c | 2 +
testsuites/psxtests/psxintrcritical01/init.c | 2 +
testsuites/psxtests/psxitimer/init.c | 2 +
testsuites/psxtests/psxkey01/init.c | 2 +
testsuites/psxtests/psxkey02/init.c | 2 +
testsuites/psxtests/psxkey03/init.c | 2 +
testsuites/psxtests/psxkey04/init.c | 2 +
testsuites/psxtests/psxkey05/init.c | 2 +
testsuites/psxtests/psxkey06/init.c | 2 +
testsuites/psxtests/psxkey07/init.c | 2 +
testsuites/psxtests/psxkey08/init.c | 2 +
testsuites/psxtests/psxkey09/init.c | 2 +
testsuites/psxtests/psxkey10/init.c | 2 +
testsuites/psxtests/psxmmap01/init.c | 2 +
testsuites/psxtests/psxmount/main.c | 3 +-
testsuites/psxtests/psxmsgq01/init.c | 2 +
testsuites/psxtests/psxmsgq02/init.c | 2 +
testsuites/psxtests/psxmsgq03/init.c | 2 +
testsuites/psxtests/psxmsgq04/init.c | 2 +
testsuites/psxtests/psxmutexattr01/init.c | 2 +
testsuites/psxtests/psxobj01/init.c | 2 +
testsuites/psxtests/psxonce01/init.c | 2 +
testsuites/psxtests/psxpasswd01/init.c | 2 +
testsuites/psxtests/psxpasswd02/init.c | 2 +
testsuites/psxtests/psxpipe01/init.c | 2 +
testsuites/psxtests/psxrdwrv/main.c | 3 +-
testsuites/psxtests/psxreaddir/main.c | 3 +-
testsuites/psxtests/psxrwlock01/main.c | 3 +-
testsuites/psxtests/psxsem01/init.c | 2 +
testsuites/psxtests/psxshm01/init.c | 2 +
testsuites/psxtests/psxshm02/init.c | 2 +
testsuites/psxtests/psxsignal01/init.c | 2 +
testsuites/psxtests/psxsignal02/init.c | 2 +
testsuites/psxtests/psxsignal03/init.c | 2 +
testsuites/psxtests/psxsignal05/init.c | 2 +
testsuites/psxtests/psxsignal06/init.c | 2 +
testsuites/psxtests/psxspin01/main.c | 3 +-
testsuites/psxtests/psxstack01/init.c | 2 +
testsuites/psxtests/psxstack02/init.c | 2 +
testsuites/psxtests/psxstat/main.c | 3 +-
testsuites/psxtests/psxstrsignal01/init.c | 2 +
testsuites/psxtests/psxsysconf/init.c | 2 +
testsuites/psxtests/psxthreadname01/init.c | 2 +
testsuites/psxtests/psxtime/main.c | 3 +-
testsuites/psxtests/psxtimer01/psxtimer.c | 2 +
testsuites/psxtests/psxtimer02/psxtimer.c | 2 +
testsuites/psxtests/psxtimes01/init.c | 2 +
testsuites/psxtests/psxualarm/init.c | 2 +
testsuites/psxtests/psxusleep/init.c | 2 +
testsuites/psxtmtests/psxtmbarrier01/init.c | 4 +-
testsuites/psxtmtests/psxtmbarrier02/init.c | 2 +
testsuites/psxtmtests/psxtmbarrier03/init.c | 2 +
testsuites/psxtmtests/psxtmbarrier04/init.c | 2 +
testsuites/psxtmtests/psxtmclocknanosleep01/init.c | 6 +-
testsuites/psxtmtests/psxtmclocknanosleep02/init.c | 4 +-
testsuites/psxtmtests/psxtmclocknanosleep03/init.c | 4 +-
testsuites/psxtmtests/psxtmcond01/init.c | 2 +
testsuites/psxtmtests/psxtmcond02/init.c | 4 +-
testsuites/psxtmtests/psxtmcond03/init.c | 2 +
testsuites/psxtmtests/psxtmcond04/init.c | 2 +
testsuites/psxtmtests/psxtmcond05/init.c | 2 +
testsuites/psxtmtests/psxtmcond06/init.c | 2 +
testsuites/psxtmtests/psxtmcond07/init.c | 2 +
testsuites/psxtmtests/psxtmcond08/init.c | 2 +
testsuites/psxtmtests/psxtmkey01/init.c | 6 +-
testsuites/psxtmtests/psxtmkey02/init.c | 2 +
testsuites/psxtmtests/psxtmmq01/init.c | 2 +
testsuites/psxtmtests/psxtmmutex01/init.c | 2 +
testsuites/psxtmtests/psxtmmutex02/init.c | 2 +
testsuites/psxtmtests/psxtmmutex03/init.c | 16 +-
testsuites/psxtmtests/psxtmmutex04/init.c | 2 +
testsuites/psxtmtests/psxtmmutex05/init.c | 2 +
testsuites/psxtmtests/psxtmmutex06/init.c | 2 +
testsuites/psxtmtests/psxtmmutex07/init.c | 4 +-
testsuites/psxtmtests/psxtmnanosleep01/init.c | 6 +-
testsuites/psxtmtests/psxtmnanosleep02/init.c | 4 +-
testsuites/psxtmtests/psxtmrwlock01/init.c | 3 +
testsuites/psxtmtests/psxtmrwlock02/init.c | 2 +
testsuites/psxtmtests/psxtmrwlock03/init.c | 2 +
testsuites/psxtmtests/psxtmrwlock04/init.c | 2 +
testsuites/psxtmtests/psxtmrwlock05/init.c | 2 +
testsuites/psxtmtests/psxtmrwlock06/init.c | 2 +
testsuites/psxtmtests/psxtmrwlock07/init.c | 2 +
testsuites/psxtmtests/psxtmsem01/init.c | 2 +
testsuites/psxtmtests/psxtmsem02/init.c | 2 +
testsuites/psxtmtests/psxtmsem03/init.c | 2 +
testsuites/psxtmtests/psxtmsem04/init.c | 2 +
testsuites/psxtmtests/psxtmsem05/init.c | 2 +
testsuites/psxtmtests/psxtmsleep01/init.c | 2 +
testsuites/psxtmtests/psxtmsleep02/init.c | 4 +-
testsuites/psxtmtests/psxtmthread01/init.c | 2 +
testsuites/psxtmtests/psxtmthread02/init.c | 2 +
testsuites/psxtmtests/psxtmthread03/init.c | 2 +
testsuites/psxtmtests/psxtmthread04/init.c | 6 +-
testsuites/psxtmtests/psxtmthread05/init.c | 4 +-
testsuites/psxtmtests/psxtmthread06/init.c | 2 +
testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c | 2 +
testsuites/rhealstone/rhilatency/ilatency.c | 2 +
testsuites/rhealstone/rhmlatency/mlatency.c | 2 +
testsuites/rhealstone/rhsemshuffle/semshuffle.c | 2 +
testsuites/rhealstone/rhtaskpreempt/taskpreempt.c | 2 +
testsuites/rhealstone/rhtaskswitch/taskswitch.c | 2 +
testsuites/samples/base_mp/init.c | 2 +
testsuites/samples/base_sp/init.c | 2 +
testsuites/samples/capture/init.c | 2 +
testsuites/samples/cdtest/init.c | 2 +
testsuites/samples/fileio/init.c | 2 +
testsuites/samples/nsecs/init.c | 2 +
testsuites/samples/paranoia/init.c | 2 +
testsuites/samples/pppd/init.c | 2 +
testsuites/samples/ticker/init.c | 2 +
testsuites/samples/unlimited/init.c | 2 +
testsuites/smptests/smp01/init.c | 2 +
testsuites/smptests/smp02/init.c | 2 +
testsuites/smptests/smp03/init.c | 2 +
testsuites/smptests/smp05/init.c | 2 +
testsuites/smptests/smp07/init.c | 2 +
testsuites/smptests/smp08/init.c | 2 +
testsuites/smptests/smp09/init.c | 2 +
testsuites/smptests/smpaffinity01/init.c | 2 +
testsuites/smptests/smpatomic01/init.c | 2 +
testsuites/smptests/smpcache01/init.c | 2 +
testsuites/smptests/smpcapture01/init.c | 2 +
testsuites/smptests/smpcapture02/init.c | 2 +
testsuites/smptests/smpclock01/init.c | 2 +
testsuites/smptests/smpfatal01/init.c | 2 +
testsuites/smptests/smpfatal02/init.c | 2 +
testsuites/smptests/smpfatal03/init.c | 2 +
testsuites/smptests/smpfatal04/init.c | 2 +
testsuites/smptests/smpfatal05/init.c | 2 +
testsuites/smptests/smpfatal06/init.c | 2 +
testsuites/smptests/smpfatal08/init.c | 2 +
testsuites/smptests/smpipi01/init.c | 2 +
testsuites/smptests/smpload01/init.c | 2 +
testsuites/smptests/smplock01/init.c | 2 +
testsuites/smptests/smpmigration01/init.c | 2 +
testsuites/smptests/smpmigration02/init.c | 2 +
testsuites/smptests/smpmrsp01/init.c | 2 +
testsuites/smptests/smpmutex01/init.c | 2 +
testsuites/smptests/smpmutex02/init.c | 2 +
testsuites/smptests/smppsxaffinity01/init.c | 2 +
testsuites/smptests/smppsxaffinity02/init.c | 2 +
testsuites/smptests/smppsxmutex01/init.c | 2 +
testsuites/smptests/smppsxsignal01/init.c | 2 +
testsuites/smptests/smpschedaffinity01/init.c | 2 +
testsuites/smptests/smpschedaffinity02/init.c | 2 +
testsuites/smptests/smpschedaffinity03/init.c | 2 +
testsuites/smptests/smpschedaffinity04/init.c | 2 +
testsuites/smptests/smpschedaffinity05/init.c | 2 +
testsuites/smptests/smpschededf01/init.c | 2 +
testsuites/smptests/smpschededf02/init.c | 2 +
testsuites/smptests/smpschededf03/init.c | 2 +
testsuites/smptests/smpschedsem01/init.c | 2 +
testsuites/smptests/smpscheduler01/init.c | 2 +
testsuites/smptests/smpscheduler02/init.c | 2 +
testsuites/smptests/smpscheduler04/init.c | 2 +
testsuites/smptests/smpsignal01/init.c | 2 +
testsuites/smptests/smpstrongapa01/init.c | 2 +
testsuites/smptests/smpswitchextension01/init.c | 2 +
testsuites/smptests/smpthreadlife01/init.c | 2 +
testsuites/smptests/smpunsupported01/init.c | 2 +
testsuites/smptests/smpwakeafter01/init.c | 2 +
testsuites/sptests/Makefile.am | 1 -
testsuites/sptests/sp01/init.c | 2 +
testsuites/sptests/sp02/init.c | 2 +
testsuites/sptests/sp03/init.c | 2 +
testsuites/sptests/sp04/init.c | 2 +
testsuites/sptests/sp05/init.c | 2 +
testsuites/sptests/sp06/init.c | 2 +
testsuites/sptests/sp07/init.c | 2 +
testsuites/sptests/sp08/init.c | 2 +
testsuites/sptests/sp11/init.c | 2 +
testsuites/sptests/sp12/init.c | 2 +
testsuites/sptests/sp13/init.c | 2 +
testsuites/sptests/sp14/init.c | 2 +
testsuites/sptests/sp15/init.c | 2 +
testsuites/sptests/sp16/init.c | 2 +
testsuites/sptests/sp17/init.c | 2 +
testsuites/sptests/sp18/init.c | 2 +
testsuites/sptests/sp19/init.c | 2 +
testsuites/sptests/sp20/init.c | 2 +
testsuites/sptests/sp2038/init.c | 2 +
testsuites/sptests/sp21/init.c | 2 +
testsuites/sptests/sp22/init.c | 2 +
testsuites/sptests/sp23/init.c | 2 +
testsuites/sptests/sp24/init.c | 2 +
testsuites/sptests/sp25/init.c | 2 +
testsuites/sptests/sp26/init.c | 2 +
testsuites/sptests/sp27/init.c | 2 +
testsuites/sptests/sp29/init.c | 2 +
testsuites/sptests/sp30/init.c | 2 +
testsuites/sptests/sp31/init.c | 2 +
testsuites/sptests/sp32/init.c | 2 +
testsuites/sptests/sp33/init.c | 3 +-
testsuites/sptests/sp34/changepri.c | 2 +
testsuites/sptests/sp35/priinv.c | 4 +-
testsuites/sptests/sp36/strict_order_mut.c | 2 +
testsuites/sptests/sp37/init.c | 2 +
testsuites/sptests/sp38/init.c | 2 +
testsuites/sptests/sp40/init.c | 2 +
testsuites/sptests/sp41/init.c | 2 +
testsuites/sptests/sp42/init.c | 2 +
testsuites/sptests/sp43/init.c | 2 +
testsuites/sptests/sp44/init.c | 2 +
testsuites/sptests/sp45/init.c | 2 +
testsuites/sptests/sp46/init.c | 2 +
testsuites/sptests/sp47/init.c | 2 +
testsuites/sptests/sp48/init.c | 2 +
testsuites/sptests/sp49/init.c | 2 +
testsuites/sptests/sp50/init.c | 2 +
testsuites/sptests/sp51/init.c | 2 +
testsuites/sptests/sp52/init.c | 2 +
testsuites/sptests/sp54/init.c | 2 +
testsuites/sptests/sp55/init.c | 2 +
testsuites/sptests/sp56/init.c | 2 +
testsuites/sptests/sp57/init.c | 2 +
testsuites/sptests/sp58/init.c | 2 +
testsuites/sptests/sp59/init.c | 2 +
testsuites/sptests/sp60/init.c | 2 +
testsuites/sptests/sp62/init.c | 2 +
testsuites/sptests/sp63/init.c | 2 +
testsuites/sptests/sp64/init.c | 2 +
testsuites/sptests/sp65/init.c | 2 +
testsuites/sptests/sp67/init.c | 2 +
testsuites/sptests/sp68/init.c | 2 +
testsuites/sptests/sp69/init.c | 2 +
testsuites/sptests/sp70/init.c | 2 +
testsuites/sptests/sp71/init.c | 2 +
testsuites/sptests/sp72/init.c | 2 +
testsuites/sptests/sp73/init.c | 2 +
testsuites/sptests/sp74/init.c | 2 +
testsuites/sptests/sp75/init.c | 2 +
testsuites/sptests/sp76/init.c | 2 +
testsuites/sptests/sp77/init.c | 2 +
testsuites/sptests/spassoc01/init.c | 2 +
testsuites/sptests/spatomic01/init.c | 2 +
testsuites/sptests/spcache01/init.c | 2 +
testsuites/sptests/spcbssched01/init.c | 2 +
testsuites/sptests/spcbssched02/init.c | 2 +
testsuites/sptests/spcbssched03/init.c | 2 +
testsuites/sptests/spchain/init.c | 2 +
testsuites/sptests/spclock_err01/init.c | 2 +
testsuites/sptests/spclock_err02/init.c | 2 +
testsuites/sptests/spcontext01/init.c | 2 +
testsuites/sptests/spcoverage/init.c | 2 +
testsuites/sptests/spcpucounter01/init.c | 2 +
testsuites/sptests/spcpuset01/init.c | 2 +
testsuites/sptests/spedfsched01/init.c | 2 +
testsuites/sptests/spedfsched02/init.c | 2 +
testsuites/sptests/spedfsched03/init.c | 2 +
testsuites/sptests/spedfsched04/init.c | 2 +
testsuites/sptests/sperror01/init.c | 2 +
testsuites/sptests/sperror02/init.c | 2 +
testsuites/sptests/sperror03/init.c | 2 +
testsuites/sptests/spevent_err03/init.c | 2 +
testsuites/sptests/speventsystem01/init.c | 2 +
testsuites/sptests/speventtransient01/init.c | 2 +
testsuites/sptests/spextensions01/init.c | 2 +
testsuites/sptests/spfatal26/init.c | 2 +
testsuites/sptests/spfatal30/init.c | 2 +
testsuites/sptests/spfatal31/init.c | 2 +
testsuites/sptests/spfatal_support/init.c | 2 +
testsuites/sptests/spfifo01/init.c | 2 +
testsuites/sptests/spfifo02/init.c | 2 +
testsuites/sptests/spfifo03/init.c | 2 +
testsuites/sptests/spfifo04/init.c | 2 +
testsuites/sptests/spfifo05/init.c | 2 +
testsuites/sptests/spfreechain01/init.c | 2 +
testsuites/sptests/spheapprot/init.c | 2 +
testsuites/sptests/spinternalerror01/init.c | 2 +
testsuites/sptests/spinternalerror02/init.c | 2 +
testsuites/sptests/spintr_err01/init.c | 2 +
testsuites/sptests/spintrcritical01/init.c | 2 +
testsuites/sptests/spintrcritical06/init.c | 2 +
testsuites/sptests/spintrcritical08/init.c | 2 +
testsuites/sptests/spintrcritical09/init.c | 2 +
testsuites/sptests/spintrcritical10/init.c | 2 +
testsuites/sptests/spintrcritical11/init.c | 2 +
testsuites/sptests/spintrcritical13/init.c | 2 +
testsuites/sptests/spintrcritical15/init.c | 2 +
testsuites/sptests/spintrcritical16/init.c | 2 +
testsuites/sptests/spintrcritical18/init.c | 2 +
testsuites/sptests/spintrcritical20/init.c | 2 +
testsuites/sptests/spintrcritical21/init.c | 2 +
testsuites/sptests/spintrcritical22/init.c | 2 +
testsuites/sptests/spintrcritical23/init.c | 2 +
testsuites/sptests/spintrcritical24/init.c | 2 +
testsuites/sptests/splinkersets01/init.c | 2 +
testsuites/sptests/spmkdir/init.c | 2 +
testsuites/sptests/spmountmgr01/init.c | 2 +
testsuites/sptests/spmrsp01/init.c | 2 +
testsuites/sptests/spmsgq_err01/init.c | 2 +
testsuites/sptests/spmsgq_err02/init.c | 2 +
testsuites/sptests/spmutex01/init.c | 2 +
testsuites/sptests/spnsext01/init.c | 2 +
testsuites/sptests/spobjgetnext/init.c | 2 +
testsuites/sptests/sppagesize/init.c | 2 +
testsuites/sptests/sppartition_err01/init.c | 2 +
testsuites/sptests/spport_err01/init.c | 2 +
testsuites/sptests/spprintk/init.c | 2 +
testsuites/sptests/spprivenv01/init.c | 2 +
testsuites/sptests/spprofiling01/init.c | 2 +
testsuites/sptests/spqreslib/init.c | 2 +
testsuites/sptests/spratemon_err01/init.c | 2 +
testsuites/sptests/sprbtree01/init.c | 2 +
testsuites/sptests/spregion_err01/init.c | 2 +
testsuites/sptests/sprmsched01/init.c | 2 +
testsuites/sptests/sprmsched02/init.c | 2 +
testsuites/sptests/spscheduler01/init.c | 2 +
testsuites/sptests/spsem01/init.c | 2 +
testsuites/sptests/spsem02/init.c | 2 +
testsuites/sptests/spsem03/init.c | 2 +
testsuites/sptests/spsem_err01/init.c | 2 +
testsuites/sptests/spsem_err02/init.c | 2 +
testsuites/sptests/spsignal_err01/init.c | 2 +
testsuites/sptests/spsimplesched01/init.c | 2 +
testsuites/sptests/spsimplesched02/init.c | 2 +
testsuites/sptests/spsimplesched03/init.c | 2 +
testsuites/sptests/spsize/init.c | 2 +
testsuites/sptests/spstdthreads01/init.c | 2 +
testsuites/sptests/spstkalloc/init.c | 2 +
testsuites/sptests/spstkalloc02/init.c | 2 +
testsuites/sptests/spsysinit01/init.c | 2 +
testsuites/sptests/spsyslock01/init.c | 2 +
testsuites/sptests/sptask_err01/init.c | 2 +
testsuites/sptests/sptask_err02/init.c | 2 +
testsuites/sptests/sptask_err03/init.c | 2 +
testsuites/sptests/sptask_err04/init.c | 2 +
testsuites/sptests/sptasknopreempt01/init.c | 2 +
testsuites/sptests/spthreadlife01/init.c | 2 +
testsuites/sptests/spthreadq01/init.c | 2 +
testsuites/sptests/sptimecounter01/init.c | 2 +
testsuites/sptests/sptimecounter02/init.c | 2 +
testsuites/sptests/sptimecounter03/init.c | 2 +
testsuites/sptests/sptimecounter04/init.c | 2 +
testsuites/sptests/sptimer_err01/init.c | 2 +
testsuites/sptests/sptimer_err02/init.c | 2 +
testsuites/sptests/sptimerserver01/init.c | 2 +
testsuites/sptests/sptimespec01/init.c | 2 +
testsuites/sptests/sptls01/init.c | 2 +
testsuites/sptests/sptls02/init.cc | 2 +
testsuites/sptests/sptls03/init.c | 2 +
testsuites/sptests/spwatchdog/init.c | 2 +
testsuites/sptests/spwkspace/init.c | 2 +
testsuites/support/include/buffer_test_io.h | 220 ++++++++-------------
testsuites/support/include/tmacros.h | 2 +-
testsuites/tmtests/tm01/task1.c | 2 +
testsuites/tmtests/tm02/task1.c | 2 +
testsuites/tmtests/tm03/task1.c | 2 +
testsuites/tmtests/tm04/task1.c | 2 +
testsuites/tmtests/tm05/task1.c | 2 +
testsuites/tmtests/tm06/task1.c | 2 +
testsuites/tmtests/tm07/task1.c | 2 +
testsuites/tmtests/tm08/task1.c | 2 +
testsuites/tmtests/tm09/task1.c | 2 +
testsuites/tmtests/tm10/task1.c | 2 +
testsuites/tmtests/tm11/task1.c | 2 +
testsuites/tmtests/tm12/task1.c | 2 +
testsuites/tmtests/tm13/task1.c | 2 +
testsuites/tmtests/tm14/task1.c | 2 +
testsuites/tmtests/tm15/task1.c | 2 +
testsuites/tmtests/tm16/task1.c | 2 +
testsuites/tmtests/tm17/task1.c | 2 +
testsuites/tmtests/tm18/task1.c | 2 +
testsuites/tmtests/tm19/task1.c | 2 +
testsuites/tmtests/tm20/task1.c | 2 +
testsuites/tmtests/tm21/task1.c | 2 +
testsuites/tmtests/tm22/task1.c | 2 +
testsuites/tmtests/tm23/task1.c | 2 +
testsuites/tmtests/tm24/task1.c | 2 +
testsuites/tmtests/tm25/task1.c | 2 +
testsuites/tmtests/tm26/task1.c | 2 +
testsuites/tmtests/tm27/task1.c | 2 +
testsuites/tmtests/tm28/task1.c | 2 +
testsuites/tmtests/tm29/task1.c | 2 +
testsuites/tmtests/tm30/init.c | 2 +
testsuites/tmtests/tmck/task1.c | 2 +
testsuites/tmtests/tmcontext01/init.c | 2 +
testsuites/tmtests/tmfine01/init.c | 2 +
testsuites/tmtests/tmoverhd/testtask.c | 2 +
testsuites/tmtests/tmtimer01/init.c | 2 +
555 files changed, 1349 insertions(+), 342 deletions(-)
diff --git a/testsuites/benchmarks/dhrystone/init.c b/testsuites/benchmarks/dhrystone/init.c
index 3e6245c..a109f4e 100644
--- a/testsuites/benchmarks/dhrystone/init.c
+++ b/testsuites/benchmarks/dhrystone/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "DHRYSTONE";
diff --git a/testsuites/benchmarks/linpack/init.c b/testsuites/benchmarks/linpack/init.c
index c94314b..38bfbaf 100644
--- a/testsuites/benchmarks/linpack/init.c
+++ b/testsuites/benchmarks/linpack/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "LINPACK";
diff --git a/testsuites/benchmarks/whetstone/init.c b/testsuites/benchmarks/whetstone/init.c
index b166118..572b6cc 100644
--- a/testsuites/benchmarks/whetstone/init.c
+++ b/testsuites/benchmarks/whetstone/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "WHETSTONE";
diff --git a/testsuites/fstests/fsbdpart01/init.c b/testsuites/fstests/fsbdpart01/init.c
index f339255..ec0b3f6 100644
--- a/testsuites/fstests/fsbdpart01/init.c
+++ b/testsuites/fstests/fsbdpart01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/stat.h>
diff --git a/testsuites/fstests/fsclose01/init.c b/testsuites/fstests/fsclose01/init.c
index 77df082..9e8a51e 100644
--- a/testsuites/fstests/fsclose01/init.c
+++ b/testsuites/fstests/fsclose01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/uio.h>
diff --git a/testsuites/fstests/fsdosfsformat01/init.c b/testsuites/fstests/fsdosfsformat01/init.c
index b7df748..d84a80b 100644
--- a/testsuites/fstests/fsdosfsformat01/init.c
+++ b/testsuites/fstests/fsdosfsformat01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <fcntl.h>
diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c
index f272945..ab01296 100644
--- a/testsuites/fstests/fsdosfsname01/init.c
+++ b/testsuites/fstests/fsdosfsname01/init.c
@@ -17,6 +17,8 @@
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/fstests/fsdosfsname02/init.c b/testsuites/fstests/fsdosfsname02/init.c
index 0496ca0..bfb3bd3 100644
--- a/testsuites/fstests/fsdosfsname02/init.c
+++ b/testsuites/fstests/fsdosfsname02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <fcntl.h>
#include <stdlib.h>
diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c
index c53d2cc..2b27408 100644
--- a/testsuites/fstests/fsdosfssync01/init.c
+++ b/testsuites/fstests/fsdosfssync01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/stat.h>
diff --git a/testsuites/fstests/fsdosfswrite01/init.c b/testsuites/fstests/fsdosfswrite01/init.c
index 525a882..b787e3c 100644
--- a/testsuites/fstests/fsdosfswrite01/init.c
+++ b/testsuites/fstests/fsdosfswrite01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <fcntl.h>
#include <rtems/dosfs.h>
diff --git a/testsuites/fstests/fsfseeko01/init.c b/testsuites/fstests/fsfseeko01/init.c
index dd073ce..ca6ce47 100644
--- a/testsuites/fstests/fsfseeko01/init.c
+++ b/testsuites/fstests/fsfseeko01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/types.h>
diff --git a/testsuites/fstests/fsimfsconfig01/init.c b/testsuites/fstests/fsimfsconfig01/init.c
index 0a1cea5..57fd63c 100644
--- a/testsuites/fstests/fsimfsconfig01/init.c
+++ b/testsuites/fstests/fsimfsconfig01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/fstests/fsimfsconfig02/init.c b/testsuites/fstests/fsimfsconfig02/init.c
index 35f9c83..07df216 100644
--- a/testsuites/fstests/fsimfsconfig02/init.c
+++ b/testsuites/fstests/fsimfsconfig02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/stat.h>
diff --git a/testsuites/fstests/fsimfsconfig03/init.c b/testsuites/fstests/fsimfsconfig03/init.c
index 352fb50..311c5bb 100644
--- a/testsuites/fstests/fsimfsconfig03/init.c
+++ b/testsuites/fstests/fsimfsconfig03/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/fstests/fsimfsgeneric01/init.c b/testsuites/fstests/fsimfsgeneric01/init.c
index 45d6d1c..fff59e4 100644
--- a/testsuites/fstests/fsimfsgeneric01/init.c
+++ b/testsuites/fstests/fsimfsgeneric01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/stat.h>
diff --git a/testsuites/fstests/fsnofs01/init.c b/testsuites/fstests/fsnofs01/init.c
index 37ebac1..603a906 100644
--- a/testsuites/fstests/fsnofs01/init.c
+++ b/testsuites/fstests/fsnofs01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c
index 45aae88..323e275 100644
--- a/testsuites/fstests/fsrofs01/init.c
+++ b/testsuites/fstests/fsrofs01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/stat.h>
diff --git a/testsuites/fstests/imfs_support/fs_support.c b/testsuites/fstests/imfs_support/fs_support.c
index 966b01f..53271fe 100644
--- a/testsuites/fstests/imfs_support/fs_support.c
+++ b/testsuites/fstests/imfs_support/fs_support.c
@@ -1,3 +1,5 @@
+#define TEST_INIT
+
/*
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
diff --git a/testsuites/fstests/jffs2_support/fs_support.c b/testsuites/fstests/jffs2_support/fs_support.c
index da80de6..18dbe20 100644
--- a/testsuites/fstests/jffs2_support/fs_support.c
+++ b/testsuites/fstests/jffs2_support/fs_support.c
@@ -12,6 +12,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c
index 1a07edf..b233a33 100644
--- a/testsuites/fstests/mdosfs_support/fs_support.c
+++ b/testsuites/fstests/mdosfs_support/fs_support.c
@@ -1,3 +1,5 @@
+#define TEST_INIT
+
/*
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c
index 7760ff7..efcd5c4 100644
--- a/testsuites/fstests/mimfs_support/fs_support.c
+++ b/testsuites/fstests/mimfs_support/fs_support.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c
index 1105350..85e1217 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/libtests/block01/init.c b/testsuites/libtests/block01/init.c
index b7eaa2b..c1a2069 100644
--- a/testsuites/libtests/block01/init.c
+++ b/testsuites/libtests/block01/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/testsuites/libtests/block02/init.c b/testsuites/libtests/block02/init.c
index 8630641..f7dc3ef 100644
--- a/testsuites/libtests/block02/init.c
+++ b/testsuites/libtests/block02/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/libtests/block03/init.c b/testsuites/libtests/block03/init.c
index f2a18b9..f2f6bd9 100644
--- a/testsuites/libtests/block03/init.c
+++ b/testsuites/libtests/block03/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/libtests/block04/init.c b/testsuites/libtests/block04/init.c
index 3f448c7..3d674c1 100644
--- a/testsuites/libtests/block04/init.c
+++ b/testsuites/libtests/block04/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/libtests/block05/init.c b/testsuites/libtests/block05/init.c
index 7cce2ac..7a40b50 100644
--- a/testsuites/libtests/block05/init.c
+++ b/testsuites/libtests/block05/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
#include <stdarg.h>
diff --git a/testsuites/libtests/block06/init.c b/testsuites/libtests/block06/init.c
index 1b91ad7..e154411 100644
--- a/testsuites/libtests/block06/init.c
+++ b/testsuites/libtests/block06/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <setjmp.h>
#include <stdio.h>
@@ -128,24 +130,6 @@ typedef struct bdbuf_task_control
#define BDBUF_SECONDS(msec) ((msec) * 1000UL)
/**
- * Print a message to output and flush it.
- *
- * @param format The format string. See printf for details.
- * @param ... The arguments for the format text.
- * @return int The number of bytes written to the output.
- */
-static int
-bdbuf_test_printf (const char *format, ...)
-{
- int ret = 0;
- va_list args;
- va_start (args, format);
- ret = vfprintf (stdout, format, args);
- fflush (stdout);
- return ret;
-}
-
-/**
* Print the status code description and return true if true.
*
* @param sc The RTEMS status code.
@@ -172,7 +156,7 @@ bdbuf_disk_lock (bdbuf_disk* bdd)
sc = rtems_semaphore_obtain (bdd->lock, RTEMS_WAIT, 0);
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("disk ioctl: lock failed: ");
+ printf ("disk ioctl: lock failed: ");
bdbuf_test_print_sc (sc, true);
return false;
}
@@ -189,7 +173,7 @@ bdbuf_disk_unlock (bdbuf_disk* bdd)
sc = rtems_semaphore_release (bdd->lock);
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("disk ioctl: unlock failed: ");
+ printf ("disk ioctl: unlock failed: ");
bdbuf_test_print_sc (sc, true);
return false;
}
@@ -210,12 +194,12 @@ bdbuf_wait (const char* who, unsigned long timeout)
&out);
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("%s: wait: receive failed: ", who);
+ printf ("%s: wait: receive failed: ", who);
bdbuf_test_print_sc (sc, true);
}
else if ((out & RTEMS_EVENT_0) == 0)
{
- bdbuf_test_printf ("%s: wait: received wrong event: %08x", who, out);
+ printf ("%s: wait: received wrong event: %08x", who, out);
}
return sc;
}
@@ -226,7 +210,7 @@ bdbuf_wait (const char* who, unsigned long timeout)
static bool
bdbuf_send_wait_event (const char* task, const char* msg, rtems_id id)
{
- bdbuf_test_printf ("%s: %s: %08x: ", task, msg, id);
+ printf ("%s: %s: %08x: ", task, msg, id);
return bdbuf_test_print_sc (rtems_event_send (id, RTEMS_EVENT_0), true);
}
@@ -244,12 +228,12 @@ bdbuf_watch (unsigned long timeout)
&out);
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("watch: receive failed: ");
+ printf ("watch: receive failed: ");
bdbuf_test_print_sc (sc, true);
}
else if ((out & RTEMS_EVENT_1) == 0)
{
- bdbuf_test_printf ("watch: received wrong event: %08x", out);
+ printf ("watch: received wrong event: %08x", out);
}
return sc;
}
@@ -260,7 +244,7 @@ bdbuf_watch (unsigned long timeout)
static bool
bdbuf_send_watch_event (const char* task, const char* msg, rtems_id id)
{
- bdbuf_test_printf ("%s: %s: %08x: ", task, msg, id);
+ printf ("%s: %s: %08x: ", task, msg, id);
return bdbuf_test_print_sc (rtems_event_send (id, RTEMS_EVENT_1), true);
}
@@ -306,7 +290,7 @@ bdbuf_disk_driver_watch_wait (bdbuf_task_control* tc, unsigned long msecs)
rtems_status_code sc = bdbuf_watch (msecs);
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("%s: driver watch: driver wait: ", tc->name);
+ printf ("%s: driver watch: driver wait: ", tc->name);
passed = bdbuf_test_print_sc (sc, true);
}
bdbuf_clear_disk_driver_watch (tc);
@@ -337,7 +321,7 @@ bdbuf_sleep (unsigned long msecs)
sc = rtems_task_wake_after (RTEMS_MICROSECONDS_TO_TICKS (msecs * 1000));
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("sleep wake after failed: ");
+ printf ("sleep wake after failed: ");
bdbuf_test_print_sc (sc, true);
return false;
}
@@ -413,7 +397,7 @@ bdbuf_disk_ioctl_process (bdbuf_disk* bdd, rtems_blkdev_request* req)
case BDBUF_DISK_WAIT:
if (bdd->waiting)
- bdbuf_test_printf ("disk ioctl: bad waiter: %s:%08x\n",
+ printf ("disk ioctl: bad waiter: %s:%08x\n",
bdd->waiting_name, bdd->waiting);
bdd->waiting_name = "bdd";
@@ -431,22 +415,22 @@ bdbuf_disk_ioctl_process (bdbuf_disk* bdd, rtems_blkdev_request* req)
break;
case BDBUF_DISK_SLEEP:
- bdbuf_test_printf ("disk ioctl: sleeping: %d msecs\n",
+ printf ("disk ioctl: sleeping: %d msecs\n",
bdd->driver_sleep);
result = bdbuf_sleep (bdd->driver_sleep);
break;
case BDBUF_DISK_BLOCKS_INORDER:
- bdbuf_test_printf ("disk ioctl: multi-block order check: count = %d\n",
+ printf ("disk ioctl: multi-block order check: count = %d\n",
req->bufnum);
for (b = 0; b < (req->bufnum - 1); b++)
if (req->bufs[b].block >= req->bufs[b + 1].block)
- bdbuf_test_printf ("disk ioctl: out of order: index:%d (%d >= %d\n",
+ printf ("disk ioctl: out of order: index:%d (%d >= %d\n",
b, req->bufs[b].block, req->bufs[b + 1].block);
break;
default:
- bdbuf_test_printf ("disk ioctl: invalid action: %d\n",
+ printf ("disk ioctl: invalid action: %d\n",
bdd->driver_action);
result = false;
break;
@@ -563,7 +547,7 @@ bdbuf_disk_initialize (rtems_device_major_number major,
{
rtems_status_code sc;
- bdbuf_test_printf ("disk io init: ");
+ printf ("disk io init: ");
sc = rtems_disk_io_initialize ();
if (!bdbuf_test_print_sc (sc, true))
return sc;
@@ -579,8 +563,8 @@ bdbuf_disk_initialize (rtems_device_major_number major,
bdd->name = strdup (name);
- bdbuf_test_printf ("disk init: %s\n", bdd->name);
- bdbuf_test_printf ("disk lock: ");
+ printf ("disk init: %s\n", bdd->name);
+ printf ("disk lock: ");
sc = rtems_semaphore_create (rtems_build_name ('B', 'D', 'D', 'K'), 1,
RTEMS_PRIORITY | RTEMS_BINARY_SEMAPHORE |
@@ -596,7 +580,7 @@ bdbuf_disk_initialize (rtems_device_major_number major,
bdbuf_disk_ioctl, bdd, name);
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("disk init: create phys failed: ");
+ printf ("disk init: create phys failed: ");
bdbuf_test_print_sc (sc, true);
return sc;
}
@@ -631,7 +615,7 @@ bdbuf_tests_setup_disk (rtems_device_major_number *major,
/*
* Register the disk driver.
*/
- bdbuf_test_printf ("register disk driver\n");
+ printf ("register disk driver\n");
sc = rtems_io_register_driver (RTEMS_DRIVER_AUTO_MAJOR,
&bdbuf_disk_io_ops,
@@ -653,7 +637,7 @@ bdbuf_tests_create_task (bdbuf_task_control* tc,
{
rtems_status_code sc;
- bdbuf_test_printf ("creating task: %s: priority: %d: ",
+ printf ("creating task: %s: priority: %d: ",
tc->name, priority);
sc = rtems_task_create (rtems_build_name (tc->name[0], tc->name[1],
@@ -666,7 +650,7 @@ bdbuf_tests_create_task (bdbuf_task_control* tc,
if (!bdbuf_test_print_sc (sc, true))
return false;
- bdbuf_test_printf ("starting task: %s: ", tc->name);
+ printf ("starting task: %s: ", tc->name);
sc = rtems_task_start (tc->task, entry_point, (rtems_task_argument) tc);
@@ -694,7 +678,7 @@ bdbuf_tests_task_0_test_1 (bdbuf_task_control* tc)
for (i = 0; (i < 2) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_get[0]: ", tc->name);
+ printf ("%s: rtems_bdbuf_get[0]: ", tc->name);
sc = rtems_bdbuf_get (tc->dd, 0, &bd);
if (!bdbuf_test_print_sc (sc, true))
{
@@ -702,7 +686,7 @@ bdbuf_tests_task_0_test_1 (bdbuf_task_control* tc)
break;
}
- bdbuf_test_printf ("%s: rtems_bdbuf_release[0]: ", tc->name);
+ printf ("%s: rtems_bdbuf_release[0]: ", tc->name);
sc = rtems_bdbuf_release (bd);
if (!bdbuf_test_print_sc (sc, true))
{
@@ -742,7 +726,7 @@ bdbuf_tests_task_0_test_2 (bdbuf_task_control* tc)
for (i = 0; (i < 5) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i);
sc = rtems_bdbuf_get (tc->dd, i, &bd);
if (!bdbuf_test_print_sc (sc, true))
passed = false;
@@ -767,18 +751,18 @@ bdbuf_tests_task_0_test_2 (bdbuf_task_control* tc)
sc = bdbuf_wait (tc->name, BDBUF_SECONDS (5));
if (sc != RTEMS_SUCCESSFUL)
{
- bdbuf_test_printf ("%s: wait failed: ", tc->name);
+ printf ("%s: wait failed: ", tc->name);
bdbuf_test_print_sc (sc, true);
passed = false;
break;
}
else
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release[%d]: unblocks task 1\n",
+ printf ("%s: rtems_bdbuf_release[%d]: unblocks task 1\n",
tc->name, i);
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
sc = rtems_bdbuf_release (bd);
- bdbuf_test_printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i);
if (!bdbuf_test_print_sc (sc, true))
{
passed = false;
@@ -815,11 +799,11 @@ bdbuf_tests_task_0_test_3 (bdbuf_task_control* tc)
/*
* Read the buffer and then release it.
*/
- bdbuf_test_printf ("%s: rtems_bdbuf_read[5]: ", tc->name);
+ printf ("%s: rtems_bdbuf_read[5]: ", tc->name);
sc = rtems_bdbuf_read (tc->dd, 5, &bd);
if ((passed = bdbuf_test_print_sc (sc, true)))
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[5]: ", tc->name);
+ printf ("%s: rtems_bdbuf_release_modified[5]: ", tc->name);
sc = rtems_bdbuf_release_modified (bd);
passed = bdbuf_test_print_sc (sc, true);
}
@@ -828,11 +812,11 @@ bdbuf_tests_task_0_test_3 (bdbuf_task_control* tc)
* Read the buffer again and then just release. The buffer should
* be maintained as modified.
*/
- bdbuf_test_printf ("%s: rtems_bdbuf_read[5]: ", tc->name);
+ printf ("%s: rtems_bdbuf_read[5]: ", tc->name);
sc = rtems_bdbuf_read (tc->dd, 5, &bd);
if ((passed = bdbuf_test_print_sc (sc, true)))
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release[5]: ", tc->name);
+ printf ("%s: rtems_bdbuf_release[5]: ", tc->name);
sc = rtems_bdbuf_release (bd);
passed = bdbuf_test_print_sc (sc, true);
}
@@ -886,7 +870,7 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc)
for (i = 0; (i < num) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
sc = rtems_bdbuf_read (tc->dd, i, &bd);
if (!bdbuf_test_print_sc (sc, true))
passed = false;
@@ -909,21 +893,21 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc)
* Release half the buffers, wait 500msecs then release the
* remainder. This tests the swap out timer on each buffer.
*/
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[0]: unblocks task 1\n",
+ printf ("%s: rtems_bdbuf_release_modified[0]: unblocks task 1\n",
tc->name);
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
sc = rtems_bdbuf_release_modified (bd);
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[0]: ", tc->name);
+ printf ("%s: rtems_bdbuf_release_modified[0]: ", tc->name);
passed = bdbuf_test_print_sc (sc, true);
if (passed)
{
for (i = 1; (i < (num / 2)) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: " \
+ printf ("%s: rtems_bdbuf_release_modified[%d]: " \
"unblocks task 1\n", tc->name, i);
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
sc = rtems_bdbuf_release_modified (bd);
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ",
+ printf ("%s: rtems_bdbuf_release_modified[%d]: ",
tc->name, i);
passed = bdbuf_test_print_sc (sc, true);
if (!passed)
@@ -942,7 +926,7 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc)
for (i = 0; (i < (num / 2)) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ",
+ printf ("%s: rtems_bdbuf_release_modified[%d]: ",
tc->name, i + (num / 2));
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd),
@@ -958,7 +942,7 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc)
if (!rtems_chain_is_empty (&buffers))
{
passed = false;
- bdbuf_test_printf ("%s: buffer chain not empty\n", tc->name);
+ printf ("%s: buffer chain not empty\n", tc->name);
}
}
}
@@ -1004,7 +988,7 @@ bdbuf_tests_task_0_test_6 (bdbuf_task_control* tc)
for (i = 0; (i < 5) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
sc = rtems_bdbuf_get (tc->dd, i, &bd);
if (!bdbuf_test_print_sc (sc, true))
passed = false;
@@ -1014,7 +998,7 @@ bdbuf_tests_task_0_test_6 (bdbuf_task_control* tc)
for (i = 0; (i < 4) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ",
+ printf ("%s: rtems_bdbuf_release_modified[%d]: ",
tc->name, i);
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd),
@@ -1023,7 +1007,7 @@ bdbuf_tests_task_0_test_6 (bdbuf_task_control* tc)
if (passed)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_sync[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_sync[%d]: ", tc->name, i);
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
passed = bdbuf_test_print_sc (rtems_bdbuf_sync (bd), true);
@@ -1061,7 +1045,7 @@ bdbuf_tests_task_0_test_7 (bdbuf_task_control* tc)
for (i = 0; (i < 5) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
sc = rtems_bdbuf_get (tc->dd, i, &bd);
if (!bdbuf_test_print_sc (sc, true))
passed = false;
@@ -1071,7 +1055,7 @@ bdbuf_tests_task_0_test_7 (bdbuf_task_control* tc)
for (i = 0; (i < 5) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ",
+ printf ("%s: rtems_bdbuf_release_modified[%d]: ",
tc->name, i);
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd),
@@ -1080,7 +1064,7 @@ bdbuf_tests_task_0_test_7 (bdbuf_task_control* tc)
if (passed)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ",
+ printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ",
tc->name, i,
tc->major,
tc->minor);
@@ -1121,7 +1105,7 @@ bdbuf_tests_task_0_test_8 (bdbuf_task_control* tc)
for (i = 0; (i < 5) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i);
sc = rtems_bdbuf_get (tc->dd, i, &bd);
if (!bdbuf_test_print_sc (sc, true))
passed = false;
@@ -1136,19 +1120,19 @@ bdbuf_tests_task_0_test_8 (bdbuf_task_control* tc)
pnode = node->previous;
rtems_chain_extract (node);
node = pnode;
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[4]: ", tc->name);
+ printf ("%s: rtems_bdbuf_release_modified[4]: ", tc->name);
passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), true);
bd = (rtems_bdbuf_buffer*) node;
pnode = node->previous;
rtems_chain_extract (node);
node = pnode;
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[3]: ", tc->name);
+ printf ("%s: rtems_bdbuf_release_modified[3]: ", tc->name);
passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), true);
for (i = 0; (i < 3) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ",
+ printf ("%s: rtems_bdbuf_release_modified[%d]: ",
tc->name, i);
bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers);
passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd),
@@ -1162,12 +1146,12 @@ bdbuf_tests_task_0_test_8 (bdbuf_task_control* tc)
*/
bdbuf_set_disk_driver_action (tc, BDBUF_DISK_BLOCKS_INORDER);
- bdbuf_test_printf ("%s: rtems_bdbuf_syncdev[%d:%d]: checking order\n",
+ printf ("%s: rtems_bdbuf_syncdev[%d:%d]: checking order\n",
tc->name, i,
tc->major,
tc->minor);
sc = rtems_bdbuf_syncdev (tc->dd);
- bdbuf_test_printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ",
+ printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ",
tc->name, i,
tc->major,
tc->minor);
@@ -1230,14 +1214,14 @@ bdbuf_tests_task_0 (rtems_task_argument arg)
/*
* Invalid test for this task. An error.
*/
- bdbuf_test_printf ("%s: invalid test: %d\n", tc->name, tc->test);
+ printf ("%s: invalid test: %d\n", tc->name, tc->test);
tc->passed = false;
tc->test = 0;
break;
}
}
- bdbuf_test_printf ("%s: delete task\n", tc->name);
+ printf ("%s: delete task\n", tc->name);
rtems_task_delete (RTEMS_SELF);
}
@@ -1264,16 +1248,16 @@ bdbuf_tests_ranged_get_release (bdbuf_task_control* tc,
for (i = lower; (i < upper) && passed; i++)
{
- bdbuf_test_printf ("%s: rtems_bdbuf_get[%d]: blocking ...\n", tc->name, i);
+ printf ("%s: rtems_bdbuf_get[%d]: blocking ...\n", tc->name, i);
sc = rtems_bdbuf_get (tc->dd, i, &bd);
- bdbuf_test_printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i);
if (!bdbuf_test_print_sc (sc, true))
{
passed = false;
break;
}
- bdbuf_test_printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i);
+ printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i);
sc = rtems_bdbuf_release (bd);
if (!bdbuf_test_print_sc (sc, true))
{
@@ -1324,14 +1308,14 @@ bdbuf_tests_task_1 (rtems_task_argument arg)
/*
* Invalid test for this task. An error.
*/
- bdbuf_test_printf ("%s: invalid test: %d\n", tc->name, tc->test);
+ printf ("%s: invalid test: %d\n", tc->name, tc->test);
tc->passed = false;
tc->test = 0;
break;
}
}
- bdbuf_test_printf ("%s: delete task\n", tc->name);
+ printf ("%s: delete task\n", tc->name);
rtems_task_delete (RTEMS_SELF);
}
@@ -1372,14 +1356,14 @@ bdbuf_tests_task_2 (rtems_task_argument arg)
/*
* Invalid test for this task. An error.
*/
- bdbuf_test_printf ("%s: invalid test: %d\n", tc->name, tc->test);
+ printf ("%s: invalid test: %d\n", tc->name, tc->test);
tc->passed = false;
tc->test = 0;
break;
}
}
- bdbuf_test_printf ("%s: delete task\n", tc->name);
+ printf ("%s: delete task\n", tc->name);
rtems_task_delete (RTEMS_SELF);
}
@@ -1426,7 +1410,7 @@ bdbuf_tests_finished (bdbuf_task_control* tasks)
}
if (!finished)
- bdbuf_test_printf ("master: test timed out\n");
+ printf ("master: test timed out\n");
else
{
int t;
@@ -1778,7 +1762,7 @@ bdbuf_tester (void)
/*
* Change priority to a lower one.
*/
- bdbuf_test_printf ("lower priority to %d: ", BDBUF_TESTS_PRI_HIGH + 1);
+ printf ("lower priority to %d: ", BDBUF_TESTS_PRI_HIGH + 1);
bdbuf_test_print_sc (rtems_task_set_priority (RTEMS_SELF,
BDBUF_TESTS_PRI_HIGH + 1,
&old_priority),
@@ -1789,7 +1773,7 @@ bdbuf_tester (void)
*/
if (!bdbuf_tests_setup_disk (&major, &dd))
{
- bdbuf_test_printf ("disk set up failed\n");
+ printf ("disk set up failed\n");
return;
}
@@ -1827,9 +1811,9 @@ bdbuf_tester (void)
*/
for (t = 0; (t < BDBUF_TEST_NUM) && passed; t++)
{
- bdbuf_test_printf ("test %d: %s\n", t + 1, bdbuf_tests[t].label);
+ printf ("test %d: %s\n", t + 1, bdbuf_tests[t].label);
passed = bdbuf_tests[t].test (tasks);
- bdbuf_test_printf ("test %d: %s\n", t + 1, passed ? "passed" : "failed");
+ printf ("test %d: %s\n", t + 1, passed ? "passed" : "failed");
}
}
diff --git a/testsuites/libtests/block07/init.c b/testsuites/libtests/block07/init.c
index cd1b64a..727bb6f 100644
--- a/testsuites/libtests/block07/init.c
+++ b/testsuites/libtests/block07/init.c
@@ -23,12 +23,14 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#define TESTS_USE_PRINTK
+#define TESTS_USE_PRINTF
#include "tmacros.h"
#include <rtems.h>
@@ -88,21 +90,21 @@ static void task_low(rtems_task_argument arg)
rtems_status_code sc = RTEMS_SUCCESSFUL;
rtems_bdbuf_buffer *bd = NULL;
- printk("L: try access: 0\n");
+ printf("L: try access: 0\n");
sc = rtems_bdbuf_get(dd, 0, &bd);
ASSERT_SC(sc);
- printk("L: access: 0\n");
+ printf("L: access: 0\n");
rtems_test_assert(bd->group->bds_per_group == 2);
- printk("L: release: 0\n");
+ printf("L: release: 0\n");
sc = rtems_bdbuf_release(bd);
ASSERT_SC(sc);
- printk("L: release done: 0\n");
+ printf("L: release done: 0\n");
TEST_END();
@@ -114,21 +116,21 @@ static void task_mid(rtems_task_argument arg)
rtems_status_code sc = RTEMS_SUCCESSFUL;
rtems_bdbuf_buffer *bd = NULL;
- printk("M: try access: 0\n");
+ printf("M: try access: 0\n");
sc = rtems_bdbuf_get(dd, 0, &bd);
ASSERT_SC(sc);
- printk("M: access: 0\n");
+ printf("M: access: 0\n");
rtems_test_assert(bd->group->bds_per_group == 1);
- printk("M: release: 0\n");
+ printf("M: release: 0\n");
sc = rtems_bdbuf_release(bd);
ASSERT_SC(sc);
- printk("M: release done: 0\n");
+ printf("M: release done: 0\n");
rtems_task_delete(RTEMS_SELF);
}
@@ -140,21 +142,21 @@ static void task_high(rtems_task_argument arg)
change_block_size();
- printk("H: try access: 0\n");
+ printf("H: try access: 0\n");
sc = rtems_bdbuf_get(dd, 0, &bd);
ASSERT_SC(sc);
- printk("H: access: 0\n");
+ printf("H: access: 0\n");
rtems_test_assert(bd->group->bds_per_group == 1);
- printk("H: release: 0\n");
+ printf("H: release: 0\n");
sc = rtems_bdbuf_release(bd);
ASSERT_SC(sc);
- printk("H: release done: 0\n");
+ printf("H: release done: 0\n");
rtems_task_delete(RTEMS_SELF);
}
@@ -228,12 +230,12 @@ static rtems_task Init(rtems_task_argument argument)
sc = rtems_bdbuf_release(bd);
ASSERT_SC(sc);
- printk("I: try access: 0\n");
+ printf("I: try access: 0\n");
sc = rtems_bdbuf_get(dd, 0, &bd);
ASSERT_SC(sc);
- printk("I: access: 0\n");
+ printf("I: access: 0\n");
sc = rtems_task_set_priority(RTEMS_SELF, PRIORITY_IDLE, &cur_prio);
ASSERT_SC(sc);
@@ -247,12 +249,12 @@ static rtems_task Init(rtems_task_argument argument)
sc = rtems_task_set_priority(RTEMS_SELF, PRIORITY_INIT, &cur_prio);
ASSERT_SC(sc);
- printk("I: release: 0\n");
+ printf("I: release: 0\n");
sc = rtems_bdbuf_release(bd);
ASSERT_SC(sc);
- printk("I: release done: 0\n");
+ printf("I: release done: 0\n");
rtems_task_delete(RTEMS_SELF);
}
diff --git a/testsuites/libtests/block08/bdbuf_test3_2.c b/testsuites/libtests/block08/bdbuf_test3_2.c
index e9cfc9e..aba2bea 100644
--- a/testsuites/libtests/block08/bdbuf_test3_2.c
+++ b/testsuites/libtests/block08/bdbuf_test3_2.c
@@ -154,7 +154,7 @@ bdbuf_test3_2_thread2(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #2 DEBLOCK\n");
+ printf("Thread #2 DEBLOCK\n");
CONTINUE_MAIN(2);
rc = rtems_bdbuf_release_modified(bd);
@@ -184,7 +184,7 @@ bdbuf_test3_2_thread3(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #3 DEBLOCK\n");
+ printf("Thread #3 DEBLOCK\n");
CONTINUE_MAIN(3);
diff --git a/testsuites/libtests/block08/bdbuf_test3_3.c b/testsuites/libtests/block08/bdbuf_test3_3.c
index 9b3080b..562bb78 100644
--- a/testsuites/libtests/block08/bdbuf_test3_3.c
+++ b/testsuites/libtests/block08/bdbuf_test3_3.c
@@ -165,7 +165,7 @@ bdbuf_test3_3_thread2(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #2 DEBLOCK\n");
+ printf("Thread #2 DEBLOCK\n");
CONTINUE_MAIN(2);
rc = rtems_bdbuf_release(bd);
@@ -195,7 +195,7 @@ bdbuf_test3_3_thread3(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #3 DEBLOCK\n");
+ printf("Thread #3 DEBLOCK\n");
CONTINUE_MAIN(3);
diff --git a/testsuites/libtests/block08/bdbuf_tests.c b/testsuites/libtests/block08/bdbuf_tests.c
index c918d93..66e69d4 100644
--- a/testsuites/libtests/block08/bdbuf_tests.c
+++ b/testsuites/libtests/block08/bdbuf_tests.c
@@ -33,14 +33,14 @@ struct bdbuf_test_descr {
{ bdbuf_test1_3_main },
{ bdbuf_test1_4_main },
{ bdbuf_test1_5_main },
-
+
{ bdbuf_test2_1_main },
{ bdbuf_test2_2_main },
-
+
{ bdbuf_test3_1_main },
{ bdbuf_test3_2_main },
{ bdbuf_test3_3_main },
-
+
{ bdbuf_test4_1_main },
{ bdbuf_test4_2_main },
{ bdbuf_test4_3_main },
@@ -88,7 +88,7 @@ bdbuf_test_start_aux_task(rtems_name name,
printf("Failed to create task\n");
return rc;
}
-
+
rc = rtems_task_start(task_id, entry_point, arg);
if (rc != RTEMS_SUCCESSFUL)
{
@@ -126,7 +126,7 @@ run_bdbuf_tests()
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create message queue for test task: %u\n", sc);
+ printf("Failed to create message queue for test task: %u\n", sc);
return;
}
@@ -134,14 +134,14 @@ run_bdbuf_tests()
sc = rtems_io_register_driver(0, &testdisk, &major);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to register TEST DEVICE: %d\n", sc);
+ printf("Failed to register TEST DEVICE: %d\n", sc);
return;
}
test_dev = -1;
while ((disk = rtems_disk_next(dev)) != NULL)
{
- printk(
+ printf(
"DEV: %s [%" PRIdrtems_blkdev_bnum "]\n",
disk->name,
disk->size
@@ -185,7 +185,7 @@ run_bdbuf_tests()
&g_test_ctx.test_sync_main[i]);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create sync sem for test task: %u\n", sc);
+ printf("Failed to create sync sem for test task: %u\n", sc);
return;
}
}
@@ -197,17 +197,17 @@ run_bdbuf_tests()
&g_test_ctx.test_sync[i]);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create sync sem for test task #%d: %u\n", i + 1, sc);
+ printf("Failed to create sync sem for test task #%d: %u\n", i + 1, sc);
return;
}
}
-
+
sc = rtems_semaphore_create(rtems_build_name('T', 'S', 'M', 'E'),
0, TEST_SEM_ATTRIBS, 0,
&g_test_ctx.test_end_main);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create end sync sem for test task: %u\n", sc);
+ printf("Failed to create end sync sem for test task: %u\n", sc);
return;
}
@@ -249,7 +249,7 @@ bdbuf_test_start_thread(unsigned int idx, rtems_task_entry func)
sc = rtems_task_delete(g_test_ctx.test_task[idx]);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to delete test thread %u in test %s\n",
+ printf("Failed to delete test thread %u in test %s\n",
idx + 1, g_test_ctx.test_name);
return sc;
}
@@ -275,11 +275,10 @@ bdbuf_test_end()
RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to get a thread stopped\n");
+ printf("Failed to get a thread stopped\n");
}
g_test_ctx.test_task[i] = OBJECTS_ID_NONE;
}
}
return RTEMS_SUCCESSFUL;
}
-
diff --git a/testsuites/libtests/block08/init.c b/testsuites/libtests/block08/init.c
index 83eaf6d..e712b07 100644
--- a/testsuites/libtests/block08/init.c
+++ b/testsuites/libtests/block08/init.c
@@ -19,6 +19,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#define CONFIGURE_INIT
diff --git a/testsuites/libtests/block08/test_disk.c b/testsuites/libtests/block08/test_disk.c
index 9a4c5bf..aa33803 100644
--- a/testsuites/libtests/block08/test_disk.c
+++ b/testsuites/libtests/block08/test_disk.c
@@ -46,19 +46,19 @@ test_disk_ioctl(rtems_disk_device *dd, uint32_t req, void *argp)
r = argp;
- printk("DISK_DRV: %s ",
+ printf("DISK_DRV: %s ",
r->req == RTEMS_BLKDEV_REQ_READ ? "R" :
r->req == RTEMS_BLKDEV_REQ_WRITE ? "W" : "?");
for (i = 0, sg = r->bufs; i < r->bufnum; i++, sg++)
{
- printk("[%" PRIu32 "] ", sg->block);
+ printf("[%" PRIu32 "] ", sg->block);
}
- printk("\n");
+ printf("\n");
break;
}
default:
- printk("%s() Unexpected request comes %" PRIu32 "\n",
+ printf("%s() Unexpected request comes %" PRIu32 "\n",
__FUNCTION__, req);
return -1;
}
@@ -135,7 +135,7 @@ test_disk_initialize(
rc = bdbuf_test_create_drv_rx_queue(&drvq_id);
if (rc != RTEMS_SUCCESSFUL)
{
- printk("%s() Failed to create Msg Queue for RX: %u\n",
+ printf("%s() Failed to create Msg Queue for RX: %u\n",
__FUNCTION__, rc);
return rc;
}
@@ -148,6 +148,6 @@ test_disk_initialize(
return rc;
}
- printk("TEST DISK - OK\n");
+ printf("TEST DISK - OK\n");
return RTEMS_SUCCESSFUL;
}
diff --git a/testsuites/libtests/block09/init.c b/testsuites/libtests/block09/init.c
index 45e3b7a..3ad283e 100644
--- a/testsuites/libtests/block09/init.c
+++ b/testsuites/libtests/block09/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/libtests/block10/init.c b/testsuites/libtests/block10/init.c
index 1cdc91e..9827744 100644
--- a/testsuites/libtests/block10/init.c
+++ b/testsuites/libtests/block10/init.c
@@ -23,7 +23,9 @@
#include "config.h"
#endif
-#define TESTS_USE_PRINTK
+#define TEST_INIT
+
+#define TESTS_USE_PRINTF
#include "tmacros.h"
#include <assert.h>
@@ -157,12 +159,12 @@ static rtems_bdbuf_buffer *do_get(char task)
rtems_status_code sc = RTEMS_SUCCESSFUL;
rtems_bdbuf_buffer *bd = NULL;
- printk("%c: try get\n", task);
+ printf("%c: try get\n", task);
sc = rtems_bdbuf_get(dd, 0, &bd);
ASSERT_SC(sc);
- printk("%c: get\n", task);
+ printf("%c: get\n", task);
return bd;
}
@@ -172,7 +174,7 @@ static rtems_bdbuf_buffer *do_get_mod(char task)
rtems_status_code sc = RTEMS_SUCCESSFUL;
rtems_bdbuf_buffer *bd = NULL;
- printk("%c: try get modified\n", task);
+ printf("%c: try get modified\n", task);
sc = rtems_bdbuf_get(dd, 0, &bd);
ASSERT_SC(sc);
@@ -183,7 +185,7 @@ static rtems_bdbuf_buffer *do_get_mod(char task)
sc = rtems_bdbuf_get(dd, 0, &bd);
ASSERT_SC(sc);
- printk("%c: get modified\n", task);
+ printf("%c: get modified\n", task);
return bd;
}
@@ -193,12 +195,12 @@ static rtems_bdbuf_buffer *do_read(char task)
rtems_status_code sc = RTEMS_SUCCESSFUL;
rtems_bdbuf_buffer *bd = NULL;
- printk("%c: try read\n", task);
+ printf("%c: try read\n", task);
sc = rtems_bdbuf_read(dd, 0, &bd);
ASSERT_SC(sc);
- printk("%c: read\n", task);
+ printf("%c: read\n", task);
return bd;
}
@@ -207,41 +209,41 @@ static void do_rel(char task, rtems_bdbuf_buffer *bd)
{
rtems_status_code sc = RTEMS_SUCCESSFUL;
- printk("%c: release\n", task);
+ printf("%c: release\n", task);
sc = rtems_bdbuf_release(bd);
ASSERT_SC(sc);
- printk("%c: release done\n", task);
+ printf("%c: release done\n", task);
}
static void do_rel_mod(char task, rtems_bdbuf_buffer *bd)
{
rtems_status_code sc = RTEMS_SUCCESSFUL;
- printk("%c: release modified\n", task);
+ printf("%c: release modified\n", task);
sc = rtems_bdbuf_release_modified(bd);
ASSERT_SC(sc);
- printk("%c: release modified done\n", task);
+ printf("%c: release modified done\n", task);
}
static void do_sync(char task, rtems_bdbuf_buffer *bd)
{
rtems_status_code sc = RTEMS_SUCCESSFUL;
- printk("%c: sync\n", task);
+ printf("%c: sync\n", task);
sc = rtems_bdbuf_sync(bd);
ASSERT_SC(sc);
- printk("%c: sync done\n", task);
+ printf("%c: sync done\n", task);
}
static void purge(char task)
{
- printk("%c: purge\n", task);
+ printf("%c: purge\n", task);
rtems_bdbuf_purge_dev(dd);
}
@@ -449,7 +451,7 @@ static rtems_task Init(rtems_task_argument argument)
for (i_ac = 0; i_ac < ACCESS_COUNT; ++i_ac) {
for (i_rel = 0; i_rel < RELEASE_COUNT; ++i_rel) {
for (i_w = 0; i_w < WAITER_COUNT; ++i_w) {
- printk("test case [access]: %s and %s %s\n", access_assoc_table [i_ac], release_assoc_table [i_rel], waiter_assoc_table [i_w]);
+ printf("test case [access]: %s and %s %s\n", access_assoc_table [i_ac], release_assoc_table [i_rel], waiter_assoc_table [i_w]);
check_access(access_table [i_ac], release_table [i_rel], waiter_table [i_w]);
}
}
@@ -457,14 +459,14 @@ static rtems_task Init(rtems_task_argument argument)
for (i_rel = 0; i_rel < RELEASE_COUNT; ++i_rel) {
for (i_w = 0; i_w < WAITER_COUNT; ++i_w) {
- printk("test case [intermediate]: %s %s\n", release_assoc_table [i_rel], waiter_assoc_table [i_w]);
+ printf("test case [intermediate]: %s %s\n", release_assoc_table [i_rel], waiter_assoc_table [i_w]);
check_intermediate(release_table [i_rel], waiter_table [i_w]);
}
}
for (i_p = 0; i_p < PURGER_COUNT; ++i_p) {
for (i_w = 0; i_w < WAITER_COUNT; ++i_w) {
- printk("test case [transfer]: %s %s\n", purger_assoc_table [i_p], waiter_assoc_table [i_w]);
+ printf("test case [transfer]: %s %s\n", purger_assoc_table [i_p], waiter_assoc_table [i_w]);
check_transfer(purger_table [i_p], waiter_table [i_w]);
}
}
diff --git a/testsuites/libtests/block11/init.c b/testsuites/libtests/block11/init.c
index 4d19d19..68f962f 100644
--- a/testsuites/libtests/block11/init.c
+++ b/testsuites/libtests/block11/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/stat.h>
diff --git a/testsuites/libtests/block12/init.c b/testsuites/libtests/block12/init.c
index 5b74977..c7a409d 100644
--- a/testsuites/libtests/block12/init.c
+++ b/testsuites/libtests/block12/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/block13/init.c b/testsuites/libtests/block13/init.c
index 82c9b3a..c936e0c 100644
--- a/testsuites/libtests/block13/init.c
+++ b/testsuites/libtests/block13/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/block14/init.c b/testsuites/libtests/block14/init.c
index 0c2bed7..fcbb1b5 100644
--- a/testsuites/libtests/block14/init.c
+++ b/testsuites/libtests/block14/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/block15/init.c b/testsuites/libtests/block15/init.c
index 19d30d1..fa2f1dd 100644
--- a/testsuites/libtests/block15/init.c
+++ b/testsuites/libtests/block15/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/block16/init.c b/testsuites/libtests/block16/init.c
index c7d4148..0c83f05 100644
--- a/testsuites/libtests/block16/init.c
+++ b/testsuites/libtests/block16/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/ioctl.h>
diff --git a/testsuites/libtests/block17/init.c b/testsuites/libtests/block17/init.c
index 384cb95..43dcde0 100644
--- a/testsuites/libtests/block17/init.c
+++ b/testsuites/libtests/block17/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/bdbuf.h>
#include "tmacros.h"
diff --git a/testsuites/libtests/bspcmdline01/init.c b/testsuites/libtests/bspcmdline01/init.c
index bea5021..64d70bc 100644
--- a/testsuites/libtests/bspcmdline01/init.c
+++ b/testsuites/libtests/bspcmdline01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/bspcmdline.h>
diff --git a/testsuites/libtests/capture01/init.c b/testsuites/libtests/capture01/init.c
index 7a24915..8062cbb 100644
--- a/testsuites/libtests/capture01/init.c
+++ b/testsuites/libtests/capture01/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "system.h"
#include <ctype.h>
#include <stdlib.h>
diff --git a/testsuites/libtests/cpuuse/init.c b/testsuites/libtests/cpuuse/init.c
index 11fb273..899b7db 100644
--- a/testsuites/libtests/cpuuse/init.c
+++ b/testsuites/libtests/cpuuse/init.c
@@ -19,6 +19,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/crypt01/init.c b/testsuites/libtests/crypt01/init.c
index 545c533..7c9dca0 100644
--- a/testsuites/libtests/crypt01/init.c
+++ b/testsuites/libtests/crypt01/init.c
@@ -39,6 +39,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <crypt.h>
#include <string.h>
diff --git a/testsuites/libtests/debugger01/init.c b/testsuites/libtests/debugger01/init.c
index e243d42..e7db8fe 100644
--- a/testsuites/libtests/debugger01/init.c
+++ b/testsuites/libtests/debugger01/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/defaultconfig01/init.c b/testsuites/libtests/defaultconfig01/init.c
index 21c326d..66bb9d3 100644
--- a/testsuites/libtests/defaultconfig01/init.c
+++ b/testsuites/libtests/defaultconfig01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <bsp.h>
diff --git a/testsuites/libtests/devfs01/init.c b/testsuites/libtests/devfs01/init.c
index 1bfae95..66e702f 100644
--- a/testsuites/libtests/devfs01/init.c
+++ b/testsuites/libtests/devfs01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/libtests/devfs02/init.c b/testsuites/libtests/devfs02/init.c
index 95ea10d..7404072 100644
--- a/testsuites/libtests/devfs02/init.c
+++ b/testsuites/libtests/devfs02/init.c
@@ -14,6 +14,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "test_support.h"
#define TESTS_USE_PRINTK
diff --git a/testsuites/libtests/devfs03/init.c b/testsuites/libtests/devfs03/init.c
index 147deeb..34d488b 100644
--- a/testsuites/libtests/devfs03/init.c
+++ b/testsuites/libtests/devfs03/init.c
@@ -14,6 +14,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <rtems/devfs.h>
diff --git a/testsuites/libtests/devfs04/init.c b/testsuites/libtests/devfs04/init.c
index 707deec..96b68df 100644
--- a/testsuites/libtests/devfs04/init.c
+++ b/testsuites/libtests/devfs04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/libtests/deviceio01/init.c b/testsuites/libtests/deviceio01/init.c
index 519719d..6271463 100644
--- a/testsuites/libtests/deviceio01/init.c
+++ b/testsuites/libtests/deviceio01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <rtems/devfs.h>
diff --git a/testsuites/libtests/dl01/init.c b/testsuites/libtests/dl01/init.c
index ec7ae1a..d511c19 100644
--- a/testsuites/libtests/dl01/init.c
+++ b/testsuites/libtests/dl01/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/dl02/init.c b/testsuites/libtests/dl02/init.c
index bf2d1a9..b796b9e 100644
--- a/testsuites/libtests/dl02/init.c
+++ b/testsuites/libtests/dl02/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/dl03/init.c b/testsuites/libtests/dl03/init.c
index ae82722..ddfda7a 100644
--- a/testsuites/libtests/dl03/init.c
+++ b/testsuites/libtests/dl03/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/dl04/init.c b/testsuites/libtests/dl04/init.c
index eb3018e..d8655a6 100644
--- a/testsuites/libtests/dl04/init.c
+++ b/testsuites/libtests/dl04/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/dl05/init.c b/testsuites/libtests/dl05/init.c
index 0c58204..a224f9a 100644
--- a/testsuites/libtests/dl05/init.c
+++ b/testsuites/libtests/dl05/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <errno.h>
diff --git a/testsuites/libtests/dumpbuf01/init.c b/testsuites/libtests/dumpbuf01/init.c
index e9671cd..4d03ffc 100644
--- a/testsuites/libtests/dumpbuf01/init.c
+++ b/testsuites/libtests/dumpbuf01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <rtems/dumpbuf.h>
diff --git a/testsuites/libtests/exit01/init.c b/testsuites/libtests/exit01/init.c
index 0fd8d35..3592644 100644
--- a/testsuites/libtests/exit01/init.c
+++ b/testsuites/libtests/exit01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/libtests/exit02/init.c b/testsuites/libtests/exit02/init.c
index 48248a5..2aa3f33 100644
--- a/testsuites/libtests/exit02/init.c
+++ b/testsuites/libtests/exit02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c
index ea1b583..276ba5d 100644
--- a/testsuites/libtests/flashdisk01/init.c
+++ b/testsuites/libtests/flashdisk01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/stat.h>
diff --git a/testsuites/libtests/ftp01/init.c b/testsuites/libtests/ftp01/init.c
index ad166c3..af8dd07 100644
--- a/testsuites/libtests/ftp01/init.c
+++ b/testsuites/libtests/ftp01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
diff --git a/testsuites/libtests/gxx01/init.c b/testsuites/libtests/gxx01/init.c
index a0debcd..c73e2b2 100644
--- a/testsuites/libtests/gxx01/init.c
+++ b/testsuites/libtests/gxx01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/libtests/heapwalk/init.c b/testsuites/libtests/heapwalk/init.c
index 3bd6c91..7d221aa 100644
--- a/testsuites/libtests/heapwalk/init.c
+++ b/testsuites/libtests/heapwalk/init.c
@@ -15,6 +15,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/i2c01/init.c b/testsuites/libtests/i2c01/init.c
index 0d6fc83..9994a9c 100644
--- a/testsuites/libtests/i2c01/init.c
+++ b/testsuites/libtests/i2c01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <dev/i2c/i2c.h>
#include <dev/i2c/eeprom.h>
#include <dev/i2c/gpio-nxp-pca9535.h>
diff --git a/testsuites/libtests/libfdt01/init.c b/testsuites/libtests/libfdt01/init.c
index a13fc82..9324aa9 100644
--- a/testsuites/libtests/libfdt01/init.c
+++ b/testsuites/libtests/libfdt01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <libfdt.h>
diff --git a/testsuites/libtests/malloc02/init.c b/testsuites/libtests/malloc02/init.c
index c333b228..d3937ca 100644
--- a/testsuites/libtests/malloc02/init.c
+++ b/testsuites/libtests/malloc02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "MALLOC 2";
diff --git a/testsuites/libtests/malloc03/init.c b/testsuites/libtests/malloc03/init.c
index 3b23a07..51d1c13 100644
--- a/testsuites/libtests/malloc03/init.c
+++ b/testsuites/libtests/malloc03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/libtests/malloc04/init.c b/testsuites/libtests/malloc04/init.c
index dabbf98..3fc6906 100644
--- a/testsuites/libtests/malloc04/init.c
+++ b/testsuites/libtests/malloc04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <rtems/libcsupport.h>
diff --git a/testsuites/libtests/malloctest/init.c b/testsuites/libtests/malloctest/init.c
index 6be6c1c..59aa1a1 100644
--- a/testsuites/libtests/malloctest/init.c
+++ b/testsuites/libtests/malloctest/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/md501/init.c b/testsuites/libtests/md501/init.c
index 124c2d7..f743454 100644
--- a/testsuites/libtests/md501/init.c
+++ b/testsuites/libtests/md501/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <md5.h>
diff --git a/testsuites/libtests/mghttpd01/init.c b/testsuites/libtests/mghttpd01/init.c
index 39071a8..31f0972 100644
--- a/testsuites/libtests/mghttpd01/init.c
+++ b/testsuites/libtests/mghttpd01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <tmacros.h>
diff --git a/testsuites/libtests/monitor/init.c b/testsuites/libtests/monitor/init.c
index 1511228..e579d3c 100644
--- a/testsuites/libtests/monitor/init.c
+++ b/testsuites/libtests/monitor/init.c
@@ -15,6 +15,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/monitor02/init.c b/testsuites/libtests/monitor02/init.c
index 22818cc..105f1fd 100644
--- a/testsuites/libtests/monitor02/init.c
+++ b/testsuites/libtests/monitor02/init.c
@@ -15,6 +15,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "bsp.h"
#include "system.h"
diff --git a/testsuites/libtests/mouse01/init.c b/testsuites/libtests/mouse01/init.c
index 9445519..145887a 100644
--- a/testsuites/libtests/mouse01/init.c
+++ b/testsuites/libtests/mouse01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <stdlib.h>
diff --git a/testsuites/libtests/networking01/init.c b/testsuites/libtests/networking01/init.c
index f22b332..00f0bd4 100644
--- a/testsuites/libtests/networking01/init.c
+++ b/testsuites/libtests/networking01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/socket.h>
#include <netdb.h>
#include <string.h>
diff --git a/testsuites/libtests/newlib01/init.c b/testsuites/libtests/newlib01/init.c
index 24dad1c..bbe260e 100644
--- a/testsuites/libtests/newlib01/init.c
+++ b/testsuites/libtests/newlib01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <rtems.h>
diff --git a/testsuites/libtests/putenvtest/init.c b/testsuites/libtests/putenvtest/init.c
index 0c2ca66..a71ed42 100644
--- a/testsuites/libtests/putenvtest/init.c
+++ b/testsuites/libtests/putenvtest/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include <tmacros.h>
#include <stdio.h>
diff --git a/testsuites/libtests/pwdgrp01/init.c b/testsuites/libtests/pwdgrp01/init.c
index bc37367..af04cc8 100644
--- a/testsuites/libtests/pwdgrp01/init.c
+++ b/testsuites/libtests/pwdgrp01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
diff --git a/testsuites/libtests/pwdgrp02/init.c b/testsuites/libtests/pwdgrp02/init.c
index ebc8d0b..15939cd 100644
--- a/testsuites/libtests/pwdgrp02/init.c
+++ b/testsuites/libtests/pwdgrp02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
diff --git a/testsuites/libtests/rbheap01/init.c b/testsuites/libtests/rbheap01/init.c
index a85d107..c97f677 100644
--- a/testsuites/libtests/rbheap01/init.c
+++ b/testsuites/libtests/rbheap01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems.h>
diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c
index a3f2ee1..f6cb347 100644
--- a/testsuites/libtests/rtmonuse/init.c
+++ b/testsuites/libtests/rtmonuse/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/sha/init.c b/testsuites/libtests/sha/init.c
index 797eec7..c53f2f8 100644
--- a/testsuites/libtests/sha/init.c
+++ b/testsuites/libtests/sha/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sha256.h>
#include <sha512.h>
#include <stdio.h>
diff --git a/testsuites/libtests/shell01/init.c b/testsuites/libtests/shell01/init.c
index b7ec2d1..bf3b50d 100644
--- a/testsuites/libtests/shell01/init.c
+++ b/testsuites/libtests/shell01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
diff --git a/testsuites/libtests/sparsedisk01/init.c b/testsuites/libtests/sparsedisk01/init.c
index 7c556cd..6d3a648 100644
--- a/testsuites/libtests/sparsedisk01/init.c
+++ b/testsuites/libtests/sparsedisk01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <fcntl.h>
#include <rtems/blkdev.h>
#include "rtems/sparse-disk.h"
diff --git a/testsuites/libtests/spi01/init.c b/testsuites/libtests/spi01/init.c
index 990d3ec..e478d7b 100644
--- a/testsuites/libtests/spi01/init.c
+++ b/testsuites/libtests/spi01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <dev/spi/spi.h>
#include <sys/ioctl.h>
diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c
index 72e3c23..a88d01a 100644
--- a/testsuites/libtests/stackchk/init.c
+++ b/testsuites/libtests/stackchk/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/stackchk01/init.c b/testsuites/libtests/stackchk01/init.c
index be0d494..cb72c94 100644
--- a/testsuites/libtests/stackchk01/init.c
+++ b/testsuites/libtests/stackchk01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/stackchk.h>
diff --git a/testsuites/libtests/stringto01/init.c b/testsuites/libtests/stringto01/init.c
index d36a4e5..fd1c262 100644
--- a/testsuites/libtests/stringto01/init.c
+++ b/testsuites/libtests/stringto01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems/stringto.h>
#include <limits.h>
diff --git a/testsuites/libtests/syscall01/init.c b/testsuites/libtests/syscall01/init.c
index 253b91f..b58f73c 100644
--- a/testsuites/libtests/syscall01/init.c
+++ b/testsuites/libtests/syscall01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/select.h>
diff --git a/testsuites/libtests/tar01/init.c b/testsuites/libtests/tar01/init.c
index 3316982..ffc49b6 100644
--- a/testsuites/libtests/tar01/init.c
+++ b/testsuites/libtests/tar01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h> /* for device driver prototypes */
#include "tmacros.h"
#include <rtems/untar.h>
diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c
index 23c1187..6d0c9a7 100644
--- a/testsuites/libtests/tar02/init.c
+++ b/testsuites/libtests/tar02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h> /* for device driver prototypes */
#include "tmacros.h"
#include <rtems/imfs.h>
diff --git a/testsuites/libtests/tar03/init.c b/testsuites/libtests/tar03/init.c
index 72e95ec..9a79222 100644
--- a/testsuites/libtests/tar03/init.c
+++ b/testsuites/libtests/tar03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c
index 558f095..deb6a88 100644
--- a/testsuites/libtests/termios/init.c
+++ b/testsuites/libtests/termios/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <rtems/shell.h>
diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c
index a892762..865b55c 100644
--- a/testsuites/libtests/termios01/init.c
+++ b/testsuites/libtests/termios01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#define TTYDEFCHARS
#include <termios.h>
diff --git a/testsuites/libtests/termios02/init.c b/testsuites/libtests/termios02/init.c
index fe16150..eead771 100644
--- a/testsuites/libtests/termios02/init.c
+++ b/testsuites/libtests/termios02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <termios.h>
#include <errno.h>
diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c
index ab33ac8..d18c1c3 100644
--- a/testsuites/libtests/termios03/init.c
+++ b/testsuites/libtests/termios03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include "termios_testdriver_polled.h"
diff --git a/testsuites/libtests/termios04/init.c b/testsuites/libtests/termios04/init.c
index dd9f653..ed76962 100644
--- a/testsuites/libtests/termios04/init.c
+++ b/testsuites/libtests/termios04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include "termios_testdriver_intr.h"
diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c
index 72c9e81..d359165 100644
--- a/testsuites/libtests/termios05/init.c
+++ b/testsuites/libtests/termios05/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include "termios_testdriver_intr.h"
diff --git a/testsuites/libtests/termios06/init.c b/testsuites/libtests/termios06/init.c
index 9b59ad2..5c39dab 100644
--- a/testsuites/libtests/termios06/init.c
+++ b/testsuites/libtests/termios06/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include "termios_testdriver_polled.h"
diff --git a/testsuites/libtests/termios07/init.c b/testsuites/libtests/termios07/init.c
index bda570d..d6a91ef 100644
--- a/testsuites/libtests/termios07/init.c
+++ b/testsuites/libtests/termios07/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include "termios_testdriver_intr.h"
diff --git a/testsuites/libtests/termios08/init.c b/testsuites/libtests/termios08/init.c
index 317ce72..7c29098 100644
--- a/testsuites/libtests/termios08/init.c
+++ b/testsuites/libtests/termios08/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include "termios_testdriver_polled.h"
diff --git a/testsuites/libtests/termios09/init.c b/testsuites/libtests/termios09/init.c
index 6feb521..46b4c76 100644
--- a/testsuites/libtests/termios09/init.c
+++ b/testsuites/libtests/termios09/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
diff --git a/testsuites/libtests/top/init.c b/testsuites/libtests/top/init.c
index 8a824ae..ed33d82 100644
--- a/testsuites/libtests/top/init.c
+++ b/testsuites/libtests/top/init.c
@@ -21,6 +21,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/libtests/tztest/init.c b/testsuites/libtests/tztest/init.c
index 88799f5..263bd8e 100644
--- a/testsuites/libtests/tztest/init.c
+++ b/testsuites/libtests/tztest/init.c
@@ -20,6 +20,8 @@
#define CONFIGURE_INIT
+#define TEST_INIT
+
#include <tmacros.h>
#include <time.h>
#include <stdlib.h>
diff --git a/testsuites/libtests/uid01/init.c b/testsuites/libtests/uid01/init.c
index 2e6fd63..56eba61 100644
--- a/testsuites/libtests/uid01/init.c
+++ b/testsuites/libtests/uid01/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <stdlib.h>
diff --git a/testsuites/libtests/utf8proc01/init.c b/testsuites/libtests/utf8proc01/init.c
index fda1444..142af2b 100644
--- a/testsuites/libtests/utf8proc01/init.c
+++ b/testsuites/libtests/utf8proc01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <string.h>
diff --git a/testsuites/mptests/mp01/init.c b/testsuites/mptests/mp01/init.c
index 9e1a1a7..33e8110 100644
--- a/testsuites/mptests/mp01/init.c
+++ b/testsuites/mptests/mp01/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp03/init.c b/testsuites/mptests/mp03/init.c
index 9607a44..6197f40 100644
--- a/testsuites/mptests/mp03/init.c
+++ b/testsuites/mptests/mp03/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp04/init.c b/testsuites/mptests/mp04/init.c
index 5fbcaf8..9d5bfc7 100644
--- a/testsuites/mptests/mp04/init.c
+++ b/testsuites/mptests/mp04/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp05/init.c b/testsuites/mptests/mp05/init.c
index 9ecac0e..b93c81a 100644
--- a/testsuites/mptests/mp05/init.c
+++ b/testsuites/mptests/mp05/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp06/init.c b/testsuites/mptests/mp06/init.c
index 3907517..12e57a1 100644
--- a/testsuites/mptests/mp06/init.c
+++ b/testsuites/mptests/mp06/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp07/init.c b/testsuites/mptests/mp07/init.c
index 4bf3d57..7cdf386 100644
--- a/testsuites/mptests/mp07/init.c
+++ b/testsuites/mptests/mp07/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp08/init.c b/testsuites/mptests/mp08/init.c
index a4e1ad4..8ce0c9a 100644
--- a/testsuites/mptests/mp08/init.c
+++ b/testsuites/mptests/mp08/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp09/init.c b/testsuites/mptests/mp09/init.c
index 8f64a3a..7cc24a6 100644
--- a/testsuites/mptests/mp09/init.c
+++ b/testsuites/mptests/mp09/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp10/init.c b/testsuites/mptests/mp10/init.c
index b5c5a20..b235600 100644
--- a/testsuites/mptests/mp10/init.c
+++ b/testsuites/mptests/mp10/init.c
@@ -29,6 +29,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp11/init.c b/testsuites/mptests/mp11/init.c
index e44b151..527f187 100644
--- a/testsuites/mptests/mp11/init.c
+++ b/testsuites/mptests/mp11/init.c
@@ -26,6 +26,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp12/init.c b/testsuites/mptests/mp12/init.c
index 7486e66..7d1e23d 100644
--- a/testsuites/mptests/mp12/init.c
+++ b/testsuites/mptests/mp12/init.c
@@ -28,6 +28,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp13/init.c b/testsuites/mptests/mp13/init.c
index e82a1d1..3889796 100644
--- a/testsuites/mptests/mp13/init.c
+++ b/testsuites/mptests/mp13/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c
index 68359bc..47ad312 100644
--- a/testsuites/mptests/mp14/init.c
+++ b/testsuites/mptests/mp14/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h
index be1b8b7..76e30f5 100644
--- a/testsuites/psxtests/include/pmacros.h
+++ b/testsuites/psxtests/include/pmacros.h
@@ -86,7 +86,6 @@
(void) ctime_r( &_tv.tv_sec, _time_buffer ); \
_time_buffer[ strlen( _time_buffer ) - 1 ] = 0; \
printf( "%s%s%s\n", s1, _time_buffer, s2 ); \
- fflush(stdout); \
} while ( 0 )
#define empty_line() puts( "" )
diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c
index 2b2fafd..7b7a4ef 100644
--- a/testsuites/psxtests/psx01/init.c
+++ b/testsuites/psxtests/psx01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sched.h>
#include <sys/utsname.h>
diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c
index 0d2ab06..7ea8b98 100644
--- a/testsuites/psxtests/psx02/init.c
+++ b/testsuites/psxtests/psx02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <signal.h>
diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c
index 5c5383c..a78c72d 100644
--- a/testsuites/psxtests/psx03/init.c
+++ b/testsuites/psxtests/psx03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <signal.h>
diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c
index 76c76af..b35fb68 100644
--- a/testsuites/psxtests/psx04/init.c
+++ b/testsuites/psxtests/psx04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <signal.h>
diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c
index 70e8d4a..17249ee 100644
--- a/testsuites/psxtests/psx05/init.c
+++ b/testsuites/psxtests/psx05/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sched.h>
#define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c
index e077a28..e10a7f5 100644
--- a/testsuites/psxtests/psx06/init.c
+++ b/testsuites/psxtests/psx06/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <errno.h>
diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c
index be5208b..b41e77e 100644
--- a/testsuites/psxtests/psx07/init.c
+++ b/testsuites/psxtests/psx07/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <sched.h>
diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c
index 781ac1e..b5839ea 100644
--- a/testsuites/psxtests/psx08/init.c
+++ b/testsuites/psxtests/psx08/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <errno.h>
diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c
index d9226c9..db10206 100644
--- a/testsuites/psxtests/psx09/init.c
+++ b/testsuites/psxtests/psx09/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sched.h>
#define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c
index ad4e60e..d58024a 100644
--- a/testsuites/psxtests/psx10/init.c
+++ b/testsuites/psxtests/psx10/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <sched.h>
diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c
index 9adde6e..8a4c0c4 100644
--- a/testsuites/psxtests/psx11/init.c
+++ b/testsuites/psxtests/psx11/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sched.h>
#define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c
index 46fb016..fc96aa0 100644
--- a/testsuites/psxtests/psx12/init.c
+++ b/testsuites/psxtests/psx12/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/time.h>
#include <errno.h>
#include <inttypes.h>
diff --git a/testsuites/psxtests/psx13/main.c b/testsuites/psxtests/psx13/main.c
index 62541bb..2d91111 100644
--- a/testsuites/psxtests/psx13/main.c
+++ b/testsuites/psxtests/psx13/main.c
@@ -9,12 +9,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psx14/init.c b/testsuites/psxtests/psx14/init.c
index 070501f..94a43fd 100644
--- a/testsuites/psxtests/psx14/init.c
+++ b/testsuites/psxtests/psx14/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <rtems.h>
diff --git a/testsuites/psxtests/psx15/init.c b/testsuites/psxtests/psx15/init.c
index 654f0c8..36eadf4 100644
--- a/testsuites/psxtests/psx15/init.c
+++ b/testsuites/psxtests/psx15/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <inttypes.h>
diff --git a/testsuites/psxtests/psx16/init.c b/testsuites/psxtests/psx16/init.c
index 55f6526..c9ddfeb 100644
--- a/testsuites/psxtests/psx16/init.c
+++ b/testsuites/psxtests/psx16/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtests/psxaio01/init.c b/testsuites/psxtests/psxaio01/init.c
index 283507f..32479d4 100644
--- a/testsuites/psxtests/psxaio01/init.c
+++ b/testsuites/psxtests/psxaio01/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <rtems.h>
diff --git a/testsuites/psxtests/psxaio02/init.c b/testsuites/psxtests/psxaio02/init.c
index 3c75a36..781f01b 100644
--- a/testsuites/psxtests/psxaio02/init.c
+++ b/testsuites/psxtests/psxaio02/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <rtems.h>
diff --git a/testsuites/psxtests/psxaio03/init.c b/testsuites/psxtests/psxaio03/init.c
index d8a13fa..e0da0ee 100644
--- a/testsuites/psxtests/psxaio03/init.c
+++ b/testsuites/psxtests/psxaio03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <rtems.h>
diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c
index e4ab9b4..d8ef475 100644
--- a/testsuites/psxtests/psxalarm01/init.c
+++ b/testsuites/psxtests/psxalarm01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <sys/time.h>
diff --git a/testsuites/psxtests/psxautoinit01/init.c b/testsuites/psxtests/psxautoinit01/init.c
index 9001de2..630fa1d 100644
--- a/testsuites/psxtests/psxautoinit01/init.c
+++ b/testsuites/psxtests/psxautoinit01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <pthread.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxautoinit02/init.c b/testsuites/psxtests/psxautoinit02/init.c
index 5d652f7..e281746 100644
--- a/testsuites/psxtests/psxautoinit02/init.c
+++ b/testsuites/psxtests/psxautoinit02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <pthread.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxbarrier01/main.c b/testsuites/psxtests/psxbarrier01/main.c
index f031c05..a9c98ca 100644
--- a/testsuites/psxtests/psxbarrier01/main.c
+++ b/testsuites/psxtests/psxbarrier01/main.c
@@ -7,12 +7,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/test.h>
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxcancel/init.c b/testsuites/psxtests/psxcancel/init.c
index c4c442b..0e92db6 100644
--- a/testsuites/psxtests/psxcancel/init.c
+++ b/testsuites/psxtests/psxcancel/init.c
@@ -8,6 +8,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <stdlib.h>
#include <pthread.h>
diff --git a/testsuites/psxtests/psxcancel01/init.c b/testsuites/psxtests/psxcancel01/init.c
index fce188e..5f4b1f8 100644
--- a/testsuites/psxtests/psxcancel01/init.c
+++ b/testsuites/psxtests/psxcancel01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxchroot01/main.c b/testsuites/psxtests/psxchroot01/main.c
index 6dcb307..0c1e6a6 100644
--- a/testsuites/psxtests/psxchroot01/main.c
+++ b/testsuites/psxtests/psxchroot01/main.c
@@ -2,12 +2,13 @@
* Simple test program -- simplified version of sample test hello.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxclassic01/init.c b/testsuites/psxtests/psxclassic01/init.c
index 1acc141..e9bca2a 100644
--- a/testsuites/psxtests/psxclassic01/init.c
+++ b/testsuites/psxtests/psxclassic01/init.c
@@ -17,6 +17,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <stdio.h>
diff --git a/testsuites/psxtests/psxcleanup/psxcleanup.c b/testsuites/psxtests/psxcleanup/psxcleanup.c
index 2af4aaf..f3f5de2 100644
--- a/testsuites/psxtests/psxcleanup/psxcleanup.c
+++ b/testsuites/psxtests/psxcleanup/psxcleanup.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <pthread.h> /* thread facilities */
diff --git a/testsuites/psxtests/psxcleanup01/init.c b/testsuites/psxtests/psxcleanup01/init.c
index f38b48e..15f18e2 100644
--- a/testsuites/psxtests/psxcleanup01/init.c
+++ b/testsuites/psxtests/psxcleanup01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "pmacros.h"
#include <pthread.h> /* thread facilities */
diff --git a/testsuites/psxtests/psxcleanup02/init.c b/testsuites/psxtests/psxcleanup02/init.c
index 88ecfee..7891e62 100644
--- a/testsuites/psxtests/psxcleanup02/init.c
+++ b/testsuites/psxtests/psxcleanup02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
int main(int argc, char **argv);
diff --git a/testsuites/psxtests/psxclock/init.c b/testsuites/psxtests/psxclock/init.c
index 669f4bb..4aedd3e 100644
--- a/testsuites/psxtests/psxclock/init.c
+++ b/testsuites/psxtests/psxclock/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <time.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxclock01/init.c b/testsuites/psxtests/psxclock01/init.c
index 6be85d2..9178e89 100644
--- a/testsuites/psxtests/psxclock01/init.c
+++ b/testsuites/psxtests/psxclock01/init.c
@@ -6,6 +6,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/psxtests/psxconcurrency01/init.c b/testsuites/psxtests/psxconcurrency01/init.c
index 60aef92..f93fda0 100644
--- a/testsuites/psxtests/psxconcurrency01/init.c
+++ b/testsuites/psxtests/psxconcurrency01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <pthread.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxcond01/init.c b/testsuites/psxtests/psxcond01/init.c
index 5747696..2e4da67 100644
--- a/testsuites/psxtests/psxcond01/init.c
+++ b/testsuites/psxtests/psxcond01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <pthread.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxcond02/init.c b/testsuites/psxtests/psxcond02/init.c
index 6314762..c458cfc 100644
--- a/testsuites/psxtests/psxcond02/init.c
+++ b/testsuites/psxtests/psxcond02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <pthread.h>
#include <time.h>
diff --git a/testsuites/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c
index a1dc4c6..45bc168 100644
--- a/testsuites/psxtests/psxconfig01/init.c
+++ b/testsuites/psxtests/psxconfig01/init.c
@@ -25,6 +25,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/test.h>
#include <tmacros.h>
diff --git a/testsuites/psxtests/psxdevctl01/main.c b/testsuites/psxtests/psxdevctl01/main.c
index 2228551..664f82c 100644
--- a/testsuites/psxtests/psxdevctl01/main.c
+++ b/testsuites/psxtests/psxdevctl01/main.c
@@ -13,12 +13,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxeintr_join/init.c b/testsuites/psxtests/psxeintr_join/init.c
index f0810b5..935047d 100644
--- a/testsuites/psxtests/psxeintr_join/init.c
+++ b/testsuites/psxtests/psxeintr_join/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <signal.h>
#include <semaphore.h>
diff --git a/testsuites/psxtests/psxenosys/init.c b/testsuites/psxtests/psxenosys/init.c
index e092744..ef9a1ba 100644
--- a/testsuites/psxtests/psxenosys/init.c
+++ b/testsuites/psxtests/psxenosys/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/types.h>
#include <sys/wait.h>
#if HAVE_SYS_MMAN_H
diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c
index 9b59efa..50e3abb 100644
--- a/testsuites/psxtests/psxfatal_support/init.c
+++ b/testsuites/psxtests/psxfatal_support/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxfchx01/init.c b/testsuites/psxtests/psxfchx01/init.c
index 89a0d06..dc6d537 100644
--- a/testsuites/psxtests/psxfchx01/init.c
+++ b/testsuites/psxtests/psxfchx01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
#include <unistd.h>
diff --git a/testsuites/psxtests/psxfile01/main.c b/testsuites/psxtests/psxfile01/main.c
index 554f8e9..7b1ea9a 100644
--- a/testsuites/psxtests/psxfile01/main.c
+++ b/testsuites/psxtests/psxfile01/main.c
@@ -7,12 +7,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxfile01/test.c b/testsuites/psxtests/psxfile01/test.c
index 8fcb281..4f53c1d 100644
--- a/testsuites/psxtests/psxfile01/test.c
+++ b/testsuites/psxtests/psxfile01/test.c
@@ -118,7 +118,6 @@ void stat_a_file(
rtems_test_assert( file );
printf( "stat( %s ) returned ", file );
- fflush( stdout );
status = stat( file, &statbuf );
@@ -335,7 +334,7 @@ int main(
status = close( fd );
rtems_test_assert( status == 0 );
- /*
+ /*
* Open a file in read-only mode and try to truncate
*/
@@ -362,7 +361,7 @@ int main(
rtems_test_assert( status == -1 );
rtems_test_assert( errno == EINVAL );
- /*
+ /*
* Read from filedes opened for write
*/
@@ -387,7 +386,7 @@ int main(
puts( "open /tmp/bha in read only mode -- OK" );
fd = open( "/tmp/bha", O_CREAT | O_RDONLY, S_IRWXU|S_IRWXG|S_IRWXO );
rtems_test_assert( fd != -1 );
-
+
puts( "attempt to read from /tmp/bha - expect EBADF" );
status = write( fd, buffer, 10 );
rtems_test_assert( status == -1 );
@@ -398,7 +397,7 @@ int main(
status |= unlink( "/tmp/bha" );
rtems_test_assert( status == 0 );
- /*
+ /*
* Read/write from an unopened filedes
*/
puts( "attempt to read from an unopened filedes - expect EBADF" );
diff --git a/testsuites/psxtests/psxfile02/init.c b/testsuites/psxtests/psxfile02/init.c
index d668152..80e5d86 100644
--- a/testsuites/psxtests/psxfile02/init.c
+++ b/testsuites/psxtests/psxfile02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <sys/uio.h>
#include <sys/types.h>
diff --git a/testsuites/psxtests/psxfilelock01/init.c b/testsuites/psxtests/psxfilelock01/init.c
index d64d1a1..7453317 100644
--- a/testsuites/psxtests/psxfilelock01/init.c
+++ b/testsuites/psxtests/psxfilelock01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <errno.h>
diff --git a/testsuites/psxtests/psxgetattrnp01/init.c b/testsuites/psxtests/psxgetattrnp01/init.c
index 1998157..33735cc 100644
--- a/testsuites/psxtests/psxgetattrnp01/init.c
+++ b/testsuites/psxtests/psxgetattrnp01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define _GNU_SOURCE
#include <tmacros.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxgetrusage01/init.c b/testsuites/psxtests/psxgetrusage01/init.c
index 590bc20..8723386 100644
--- a/testsuites/psxtests/psxgetrusage01/init.c
+++ b/testsuites/psxtests/psxgetrusage01/init.c
@@ -19,6 +19,8 @@
extern int getrusage(int who, struct rusage *usage);
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/psxtests/psxglobalcon01/init.cc b/testsuites/psxtests/psxglobalcon01/init.cc
index d485526..f531410 100644
--- a/testsuites/psxtests/psxglobalcon01/init.cc
+++ b/testsuites/psxtests/psxglobalcon01/init.cc
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "PSXGLOBALCON 1";
diff --git a/testsuites/psxtests/psxglobalcon02/init.cc b/testsuites/psxtests/psxglobalcon02/init.cc
index c5f09b0..44a3c1a 100644
--- a/testsuites/psxtests/psxglobalcon02/init.cc
+++ b/testsuites/psxtests/psxglobalcon02/init.cc
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "PSXGLOBALCON 2";
diff --git a/testsuites/psxtests/psxid01/init.c b/testsuites/psxtests/psxid01/init.c
index 5aa0399..2ffb84e 100644
--- a/testsuites/psxtests/psxid01/init.c
+++ b/testsuites/psxtests/psxid01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/psxtests/psximfs01/init.c b/testsuites/psxtests/psximfs01/init.c
index 76bb156..380ece7 100644
--- a/testsuites/psxtests/psximfs01/init.c
+++ b/testsuites/psxtests/psximfs01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
@@ -70,8 +72,7 @@ void write_helper(void)
printf( "Total written = %zd\n", TotalWritten );
return;
}
- fprintf(
- stderr,
+ printf(
"Unable to create largest IMFS file (error=%s)\n",
strerror(errno)
);
@@ -79,7 +80,7 @@ void write_helper(void)
}
TotalWritten += written;
} while (1);
-
+
}
void read_helper(void)
@@ -93,8 +94,7 @@ void read_helper(void)
sc = read( TestFd, &ch, sizeof(ch) );
if ( sc == 1 ) {
if ( ch != (i%256) ) {
- fprintf(
- stderr,
+ printf(
"MISMATCH 0x%02x != 0x%02x at offset %d\n",
ch,
i % 256,
@@ -104,8 +104,7 @@ void read_helper(void)
}
i++;
} else if ( sc != 0 ) {
- fprintf(
- stderr,
+ printf(
"ERROR - at offset %d - returned %zd and error=%s\n",
i,
sc,
@@ -139,12 +138,11 @@ void truncate_helper(void)
rc = ftruncate( TestFd, new );
if ( rc != 0 ) {
- fprintf(
- stderr,
- "ERROR - at offset %d - returned %d and error=%s\n",
- (int) new,
- rc,
- strerror( errno )
+ printf(
+ "ERROR - at offset %d - returned %d and error=%s\n",
+ (int) new,
+ rc,
+ strerror( errno )
);
}
rtems_test_assert( rc == 0 );
@@ -162,8 +160,8 @@ void extend_helper(int eno)
position = lseek( TestFd, 0, SEEK_END );
printf( "Seek to end .. returned %d\n", (int) position );
- /*
- * test case to ftruncate a file to a length > its size
+ /*
+ * test case to ftruncate a file to a length > its size
*/
rc = ftruncate( TestFd, 2 );
@@ -178,12 +176,11 @@ void extend_helper(int eno)
rc = ftruncate( TestFd, new );
if ( rc != 0 ) {
if( errno != eno ) {
- fprintf(
- stderr,
- "ERROR - at offset %d - returned %d and error=%s\n",
- (int) new,
- rc,
- strerror( errno )
+ printf(
+ "ERROR - at offset %d - returned %d and error=%s\n",
+ (int) new,
+ rc,
+ strerror( errno )
);
break;
}
@@ -239,7 +236,7 @@ rtems_task Init(
open_it(true, false);
read_helper();
close_it();
-
+
open_it(false, false);
truncate_helper();
@@ -250,7 +247,7 @@ rtems_task Init(
extend_helper(ENOSPC);
- /*
+ /*
* free the allocated heap memory
*/
free(alloc_ptr);
diff --git a/testsuites/psxtests/psximfs02/init.c b/testsuites/psxtests/psximfs02/init.c
index 047a4fc..07e55c4 100644
--- a/testsuites/psxtests/psximfs02/init.c
+++ b/testsuites/psxtests/psximfs02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/psxtests/psxintrcritical01/init.c b/testsuites/psxtests/psxintrcritical01/init.c
index a6a64ba..72686cc 100644
--- a/testsuites/psxtests/psxintrcritical01/init.c
+++ b/testsuites/psxtests/psxintrcritical01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
#include <time.h>
diff --git a/testsuites/psxtests/psxitimer/init.c b/testsuites/psxtests/psxitimer/init.c
index dc32f34..915c445 100644
--- a/testsuites/psxtests/psxitimer/init.c
+++ b/testsuites/psxtests/psxitimer/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <sys/time.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c
index 6b8f57e..c1ce6cb 100644
--- a/testsuites/psxtests/psxkey01/init.c
+++ b/testsuites/psxtests/psxkey01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <errno.h>
diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c
index 23a392b..e36c586 100644
--- a/testsuites/psxtests/psxkey02/init.c
+++ b/testsuites/psxtests/psxkey02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <errno.h>
#include <rtems/libcsupport.h>
diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c
index b133e50..e0c2f7d 100644
--- a/testsuites/psxtests/psxkey03/init.c
+++ b/testsuites/psxtests/psxkey03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <errno.h>
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey04/init.c b/testsuites/psxtests/psxkey04/init.c
index 4dcc342..2540dd9 100644
--- a/testsuites/psxtests/psxkey04/init.c
+++ b/testsuites/psxtests/psxkey04/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <errno.h>
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey05/init.c b/testsuites/psxtests/psxkey05/init.c
index 6ebe49f..e848fa3 100644
--- a/testsuites/psxtests/psxkey05/init.c
+++ b/testsuites/psxtests/psxkey05/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <errno.h>
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey06/init.c b/testsuites/psxtests/psxkey06/init.c
index 28236c2..fa3f2cf 100644
--- a/testsuites/psxtests/psxkey06/init.c
+++ b/testsuites/psxtests/psxkey06/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <errno.h>
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey07/init.c b/testsuites/psxtests/psxkey07/init.c
index 91cc7ea..b7616c5 100644
--- a/testsuites/psxtests/psxkey07/init.c
+++ b/testsuites/psxtests/psxkey07/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <sched.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxkey08/init.c b/testsuites/psxtests/psxkey08/init.c
index 1e6d53a..95da493 100644
--- a/testsuites/psxtests/psxkey08/init.c
+++ b/testsuites/psxtests/psxkey08/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <stdio.h>
diff --git a/testsuites/psxtests/psxkey09/init.c b/testsuites/psxtests/psxkey09/init.c
index 2f7e92a..9e1b494 100644
--- a/testsuites/psxtests/psxkey09/init.c
+++ b/testsuites/psxtests/psxkey09/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <errno.h>
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey10/init.c b/testsuites/psxtests/psxkey10/init.c
index 1c6ebd8..1e773e3 100644
--- a/testsuites/psxtests/psxkey10/init.c
+++ b/testsuites/psxtests/psxkey10/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pthread.h>
#include <errno.h>
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxmmap01/init.c b/testsuites/psxtests/psxmmap01/init.c
index e3e8b9a..7efb36e 100644
--- a/testsuites/psxtests/psxmmap01/init.c
+++ b/testsuites/psxtests/psxmmap01/init.c
@@ -30,6 +30,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include "pritime.h"
diff --git a/testsuites/psxtests/psxmount/main.c b/testsuites/psxtests/psxmount/main.c
index a723b87..140057e 100644
--- a/testsuites/psxtests/psxmount/main.c
+++ b/testsuites/psxtests/psxmount/main.c
@@ -4,12 +4,13 @@
* Attempt to mount the IMFS file system on a mount point in the base IMFS
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c
index 3f34d39..8cab816 100644
--- a/testsuites/psxtests/psxmsgq01/init.c
+++ b/testsuites/psxtests/psxmsgq01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <sched.h>
diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c
index 290663d..e9f2e92 100644
--- a/testsuites/psxtests/psxmsgq02/init.c
+++ b/testsuites/psxtests/psxmsgq02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <errno.h>
diff --git a/testsuites/psxtests/psxmsgq03/init.c b/testsuites/psxtests/psxmsgq03/init.c
index 1464442..127bb72 100644
--- a/testsuites/psxtests/psxmsgq03/init.c
+++ b/testsuites/psxtests/psxmsgq03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/psxtests/psxmsgq04/init.c b/testsuites/psxtests/psxmsgq04/init.c
index f1e1c96..815cb02 100644
--- a/testsuites/psxtests/psxmsgq04/init.c
+++ b/testsuites/psxtests/psxmsgq04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <unistd.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxmutexattr01/init.c b/testsuites/psxtests/psxmutexattr01/init.c
index 1ea1ab5..8ee6774 100644
--- a/testsuites/psxtests/psxmutexattr01/init.c
+++ b/testsuites/psxtests/psxmutexattr01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <errno.h>
#include <pthread.h>
diff --git a/testsuites/psxtests/psxobj01/init.c b/testsuites/psxtests/psxobj01/init.c
index c3b3f49..3a983b5 100644
--- a/testsuites/psxtests/psxobj01/init.c
+++ b/testsuites/psxtests/psxobj01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/score/objectimpl.h>
diff --git a/testsuites/psxtests/psxonce01/init.c b/testsuites/psxtests/psxonce01/init.c
index 1c90769..9f7f76b 100644
--- a/testsuites/psxtests/psxonce01/init.c
+++ b/testsuites/psxtests/psxonce01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/psxtests/psxpasswd01/init.c b/testsuites/psxtests/psxpasswd01/init.c
index eb96e28..947478b 100644
--- a/testsuites/psxtests/psxpasswd01/init.c
+++ b/testsuites/psxtests/psxpasswd01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
#include <sys/types.h>
diff --git a/testsuites/psxtests/psxpasswd02/init.c b/testsuites/psxtests/psxpasswd02/init.c
index 7090c94..f299d1e 100644
--- a/testsuites/psxtests/psxpasswd02/init.c
+++ b/testsuites/psxtests/psxpasswd02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
#include <sys/types.h>
diff --git a/testsuites/psxtests/psxpipe01/init.c b/testsuites/psxtests/psxpipe01/init.c
index 7066f6c..50ebeef 100644
--- a/testsuites/psxtests/psxpipe01/init.c
+++ b/testsuites/psxtests/psxpipe01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
#include <sys/types.h>
diff --git a/testsuites/psxtests/psxrdwrv/main.c b/testsuites/psxtests/psxrdwrv/main.c
index 32a5fa9..701f99a 100644
--- a/testsuites/psxtests/psxrdwrv/main.c
+++ b/testsuites/psxtests/psxrdwrv/main.c
@@ -7,12 +7,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxreaddir/main.c b/testsuites/psxtests/psxreaddir/main.c
index 176d264..ac421c1 100644
--- a/testsuites/psxtests/psxreaddir/main.c
+++ b/testsuites/psxtests/psxreaddir/main.c
@@ -2,12 +2,13 @@
* Simple test program -- simplified version of sample test hello.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxrwlock01/main.c b/testsuites/psxtests/psxrwlock01/main.c
index 88190eb..1386ad4 100644
--- a/testsuites/psxtests/psxrwlock01/main.c
+++ b/testsuites/psxtests/psxrwlock01/main.c
@@ -7,12 +7,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/test.h>
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxsem01/init.c b/testsuites/psxtests/psxsem01/init.c
index ae0b390..d4ea8cb 100644
--- a/testsuites/psxtests/psxsem01/init.c
+++ b/testsuites/psxtests/psxsem01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sched.h>
#include <semaphore.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxshm01/init.c b/testsuites/psxtests/psxshm01/init.c
index 4636f9a..1769333 100644
--- a/testsuites/psxtests/psxshm01/init.c
+++ b/testsuites/psxtests/psxshm01/init.c
@@ -14,6 +14,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include "pritime.h"
diff --git a/testsuites/psxtests/psxshm02/init.c b/testsuites/psxtests/psxshm02/init.c
index 071f4c4..ff356ce 100644
--- a/testsuites/psxtests/psxshm02/init.c
+++ b/testsuites/psxtests/psxshm02/init.c
@@ -14,6 +14,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include "pritime.h"
diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c
index 511dd2d..7ce2a72 100644
--- a/testsuites/psxtests/psxsignal01/init.c
+++ b/testsuites/psxtests/psxsignal01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <signal.h>
diff --git a/testsuites/psxtests/psxsignal02/init.c b/testsuites/psxtests/psxsignal02/init.c
index 6ae68d6..eda7ef7 100644
--- a/testsuites/psxtests/psxsignal02/init.c
+++ b/testsuites/psxtests/psxsignal02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <signal.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c
index f3fc266..07fd69a 100644
--- a/testsuites/psxtests/psxsignal03/init.c
+++ b/testsuites/psxtests/psxsignal03/init.c
@@ -47,6 +47,8 @@
#error "Test Mode not defined"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <signal.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxsignal05/init.c b/testsuites/psxtests/psxsignal05/init.c
index 0bc8d7f..196082e 100644
--- a/testsuites/psxtests/psxsignal05/init.c
+++ b/testsuites/psxtests/psxsignal05/init.c
@@ -16,6 +16,8 @@
#define SIGNAL_ONE SIGUSR1
#define SIGNAL_TWO SIGUSR2
+#define TEST_INIT
+
#include <pmacros.h>
#include <signal.h>
#include <errno.h>
diff --git a/testsuites/psxtests/psxsignal06/init.c b/testsuites/psxtests/psxsignal06/init.c
index cb34bb6..20277be 100644
--- a/testsuites/psxtests/psxsignal06/init.c
+++ b/testsuites/psxtests/psxsignal06/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtests/psxspin01/main.c b/testsuites/psxtests/psxspin01/main.c
index 4c3bc27..e646210 100644
--- a/testsuites/psxtests/psxspin01/main.c
+++ b/testsuites/psxtests/psxspin01/main.c
@@ -13,12 +13,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c
index 7a010c8..be3617a 100644
--- a/testsuites/psxtests/psxstack01/init.c
+++ b/testsuites/psxtests/psxstack01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <errno.h>
#include <pthread.h>
diff --git a/testsuites/psxtests/psxstack02/init.c b/testsuites/psxtests/psxstack02/init.c
index df65ee3..43fca98 100644
--- a/testsuites/psxtests/psxstack02/init.c
+++ b/testsuites/psxtests/psxstack02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/psxtests/psxstat/main.c b/testsuites/psxtests/psxstat/main.c
index 07fde7f..14a4b42 100644
--- a/testsuites/psxtests/psxstat/main.c
+++ b/testsuites/psxtests/psxstat/main.c
@@ -7,12 +7,13 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define CONFIGURE_INIT
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <pmacros.h>
diff --git a/testsuites/psxtests/psxstrsignal01/init.c b/testsuites/psxtests/psxstrsignal01/init.c
index 9614fb9..8f3129f 100644
--- a/testsuites/psxtests/psxstrsignal01/init.c
+++ b/testsuites/psxtests/psxstrsignal01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <signal.h>
#include <string.h>
diff --git a/testsuites/psxtests/psxsysconf/init.c b/testsuites/psxtests/psxsysconf/init.c
index 2dd9018..d95fdd3 100644
--- a/testsuites/psxtests/psxsysconf/init.c
+++ b/testsuites/psxtests/psxsysconf/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxthreadname01/init.c b/testsuites/psxtests/psxthreadname01/init.c
index 16fdec6..2af3ba7 100644
--- a/testsuites/psxtests/psxthreadname01/init.c
+++ b/testsuites/psxtests/psxthreadname01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define _GNU_SOURCE
#include <errno.h>
#include <pthread.h>
diff --git a/testsuites/psxtests/psxtime/main.c b/testsuites/psxtests/psxtime/main.c
index 7280e8f..a1653ff 100644
--- a/testsuites/psxtests/psxtime/main.c
+++ b/testsuites/psxtests/psxtime/main.c
@@ -13,7 +13,8 @@
#include "config.h"
#endif
-#define CONFIGURE_INIT
+
+#define TEST_INIT
#include <bsp.h>
#include <tmacros.h> /* instantiate buffering code if needed */
diff --git a/testsuites/psxtests/psxtimer01/psxtimer.c b/testsuites/psxtests/psxtimer01/psxtimer.c
index 032e9f8..d869374 100644
--- a/testsuites/psxtests/psxtimer01/psxtimer.c
+++ b/testsuites/psxtests/psxtimer01/psxtimer.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <pthread.h> /* thread facilities */
diff --git a/testsuites/psxtests/psxtimer02/psxtimer.c b/testsuites/psxtests/psxtimer02/psxtimer.c
index e4d6d7d..59f1697 100644
--- a/testsuites/psxtests/psxtimer02/psxtimer.c
+++ b/testsuites/psxtests/psxtimer02/psxtimer.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include "tmacros.h"
diff --git a/testsuites/psxtests/psxtimes01/init.c b/testsuites/psxtests/psxtimes01/init.c
index 30cecd4..e6150b0 100644
--- a/testsuites/psxtests/psxtimes01/init.c
+++ b/testsuites/psxtests/psxtimes01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <sys/times.h>
diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c
index 7a4fb21..a5ba5bf 100644
--- a/testsuites/psxtests/psxualarm/init.c
+++ b/testsuites/psxtests/psxualarm/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <signal.h>
diff --git a/testsuites/psxtests/psxusleep/init.c b/testsuites/psxtests/psxusleep/init.c
index 383943e..d9d0e71 100644
--- a/testsuites/psxtests/psxusleep/init.c
+++ b/testsuites/psxtests/psxusleep/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <pmacros.h>
#include <time.h>
#include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c
index 7caa672..0148e1c 100644
--- a/testsuites/psxtmtests/psxtmbarrier01/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
@@ -79,7 +81,7 @@ void *POSIX_Init(
benchmark_pthread_barrier_init();
/* destroying barrier */
benchmark_pthread_barrier_destroy();
-
+
TEST_END();
rtems_test_exit(0);
diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c
index 6705125..d7e8f08 100644
--- a/testsuites/psxtmtests/psxtmbarrier02/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <tmacros.h>
#include <rtems/btimer.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c
index 27feac1..05372f5 100644
--- a/testsuites/psxtmtests/psxtmbarrier03/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c
index baf1bf1..61675b1 100644
--- a/testsuites/psxtmtests/psxtmbarrier04/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier04/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
index 86c1f5f..484ddba 100644
--- a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
+++ b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
@@ -34,9 +36,9 @@ void *POSIX_Init(
TEST_BEGIN();
- benchmark_timer_initialize();
+ benchmark_timer_initialize();
clock_nanosleep( CLOCK_REALTIME, 0, &sleepTime, (struct timespec *) NULL );
- end_time = benchmark_timer_read();
+ end_time = benchmark_timer_read();
put_time( "nanosleep: yield", end_time, 1, 0, 0 );
diff --git a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
index b35a82b..89836f4 100644
--- a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
+++ b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
@@ -83,7 +85,7 @@ void *POSIX_Init(
status = pthread_create( &threadId, NULL, Middle, NULL );
rtems_test_assert( !status );
}
-
+
status = pthread_create( &threadId, NULL, Low, NULL );
rtems_test_assert( !status );
diff --git a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
index ccceada..8feef4e 100644
--- a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
+++ b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
@@ -88,7 +90,7 @@ void *POSIX_Init(
status = pthread_create( &threadId, NULL, Middle, NULL );
rtems_test_assert( !status );
}
-
+
status = pthread_create( &threadId, NULL, Low, NULL );
rtems_test_assert( !status );
diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c
index 7ec876b..ce7be62 100644
--- a/testsuites/psxtmtests/psxtmcond01/init.c
+++ b/testsuites/psxtmtests/psxtmcond01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c
index c8cf9c2..8f8d16e 100644
--- a/testsuites/psxtmtests/psxtmcond02/init.c
+++ b/testsuites/psxtmtests/psxtmcond02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <pthread.h>
#include <rtems/btimer.h>
@@ -49,7 +51,7 @@ void benchmark_signal(void)
void *POSIX_Init(
void *argument
)
-{
+{
TEST_BEGIN();
pthread_cond_init(&CondID, NULL);
diff --git a/testsuites/psxtmtests/psxtmcond03/init.c b/testsuites/psxtmtests/psxtmcond03/init.c
index 4a829bd..1a56a5b 100644
--- a/testsuites/psxtmtests/psxtmcond03/init.c
+++ b/testsuites/psxtmtests/psxtmcond03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c
index 1a40f23..529139b 100644
--- a/testsuites/psxtmtests/psxtmcond04/init.c
+++ b/testsuites/psxtmtests/psxtmcond04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c
index fcfad14..fce8862 100644
--- a/testsuites/psxtmtests/psxtmcond05/init.c
+++ b/testsuites/psxtmtests/psxtmcond05/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/psxtmtests/psxtmcond06/init.c b/testsuites/psxtmtests/psxtmcond06/init.c
index ec87ccd..75a00c4 100644
--- a/testsuites/psxtmtests/psxtmcond06/init.c
+++ b/testsuites/psxtmtests/psxtmcond06/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond07/init.c b/testsuites/psxtmtests/psxtmcond07/init.c
index 218fccc..611af66 100644
--- a/testsuites/psxtmtests/psxtmcond07/init.c
+++ b/testsuites/psxtmtests/psxtmcond07/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c
index 377b099..636ecb6 100644
--- a/testsuites/psxtmtests/psxtmcond08/init.c
+++ b/testsuites/psxtmtests/psxtmcond08/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <time.h>
#include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c
index 7430b15..1812247 100644
--- a/testsuites/psxtmtests/psxtmkey01/init.c
+++ b/testsuites/psxtmtests/psxtmkey01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include <errno.h>
@@ -71,10 +73,10 @@ void *POSIX_Init(void *argument)
/*key creation, using NULL destructor*/
benchmark_pthread_key_create();
-
+
/* key deletion*/
benchmark_pthread_key_delete();
-
+
TEST_END();
rtems_test_exit(0);
diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c
index fafb8f6..3381d41 100644
--- a/testsuites/psxtmtests/psxtmkey02/init.c
+++ b/testsuites/psxtmtests/psxtmkey02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c
index a5ed4fc..e023be0 100644
--- a/testsuites/psxtmtests/psxtmmq01/init.c
+++ b/testsuites/psxtmtests/psxtmmq01/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c
index 7a020f9..558d8e6 100644
--- a/testsuites/psxtmtests/psxtmmutex01/init.c
+++ b/testsuites/psxtmtests/psxtmmutex01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c
index b71e21f..44d74ca 100644
--- a/testsuites/psxtmtests/psxtmmutex02/init.c
+++ b/testsuites/psxtmtests/psxtmmutex02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c
index 6a29230..9751b87 100644
--- a/testsuites/psxtmtests/psxtmmutex03/init.c
+++ b/testsuites/psxtmtests/psxtmmutex03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include <errno.h>
@@ -93,10 +95,10 @@ void benchmark_mutex_trylock_not_available(void)
benchmark_timer_initialize();
status = pthread_mutex_trylock( &MutexId );
- /*
- * it has to return a negative value
- * because it try to lock a not available mutex
- * so the assert call is make with status instead !status
+ /*
+ * it has to return a negative value
+ * because it try to lock a not available mutex
+ * so the assert call is make with status instead !status
*/
end_time = benchmark_timer_read();
rtems_test_assert( status );
@@ -136,7 +138,7 @@ void *POSIX_Init(
int status;
TEST_BEGIN();
-
+
/*
* Create the single Mutex used in all the test case
*/
@@ -144,7 +146,7 @@ void *POSIX_Init(
rtems_test_assert( !status );
/*
- * Now invoke subroutines to time each test case
+ * Now invoke subroutines to time each test case
* get the goal depends of its order
*/
benchmark_mutex_lock_available();
@@ -154,7 +156,7 @@ void *POSIX_Init(
benchmark_mutex_unlock_no_threads_waiting();
benchmark_mutex_timedlock_available();
benchmark_mutex_unlock_no_threads_waiting();
-
+
/*
* Destroy the mutex used in the tests
diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c
index 6513c59..cb6d1f4 100644
--- a/testsuites/psxtmtests/psxtmmutex04/init.c
+++ b/testsuites/psxtmtests/psxtmmutex04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <tmacros.h>
#include <rtems/btimer.h>
diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c
index d274fc5..6ed38c2 100644
--- a/testsuites/psxtmtests/psxtmmutex05/init.c
+++ b/testsuites/psxtmtests/psxtmmutex05/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c
index c2bd001..01cea46 100644
--- a/testsuites/psxtmtests/psxtmmutex06/init.c
+++ b/testsuites/psxtmtests/psxtmmutex06/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c
index 9f087e5..46ca01c 100644
--- a/testsuites/psxtmtests/psxtmmutex07/init.c
+++ b/testsuites/psxtmtests/psxtmmutex07/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include <errno.h>
@@ -84,7 +86,7 @@ void *POSIX_Init(
/* destroy mutex */
status = pthread_mutex_destroy( &MutexId );
rtems_test_assert( status == 0 );
-
+
TEST_END();
rtems_test_exit(0);
diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c
index eeb67c1..8dc2890 100644
--- a/testsuites/psxtmtests/psxtmnanosleep01/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
@@ -32,9 +34,9 @@ void *POSIX_Init(
TEST_BEGIN();
- benchmark_timer_initialize();
+ benchmark_timer_initialize();
nanosleep( &sleepTime, (struct timespec *) NULL );
- end_time = benchmark_timer_read();
+ end_time = benchmark_timer_read();
put_time( "nanosleep: yield", end_time, 1, 0, 0 );
diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c
index 12f6b75..5c8139b 100644
--- a/testsuites/psxtmtests/psxtmnanosleep02/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
@@ -81,7 +83,7 @@ void *POSIX_Init(
status = pthread_create( &threadId, NULL, Middle, NULL );
rtems_test_assert( !status );
}
-
+
status = pthread_create( &threadId, NULL, Low, NULL );
rtems_test_assert( !status );
diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c
index 93d9c8b..49f8e56 100644
--- a/testsuites/psxtmtests/psxtmrwlock01/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock01/init.c
@@ -10,6 +10,9 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+
+#define TEST_INIT
+
#include <errno.h>
#include <timesys.h>
#include <rtems/btimer.h>
diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c
index f2462b2..0b37e0f 100644
--- a/testsuites/psxtmtests/psxtmrwlock02/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock02/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c
index 10c7aee..e4fc6c5 100644
--- a/testsuites/psxtmtests/psxtmrwlock03/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock03/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/psxtmtests/psxtmrwlock04/init.c b/testsuites/psxtmtests/psxtmrwlock04/init.c
index dd2d735..53df5fa 100644
--- a/testsuites/psxtmtests/psxtmrwlock04/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock04/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c
index f6668c3..cf7ed6a 100644
--- a/testsuites/psxtmtests/psxtmrwlock05/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock05/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c
index 93a49be..b68f716 100644
--- a/testsuites/psxtmtests/psxtmrwlock06/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock06/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <pthread.h>
#include <sched.h>
diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c
index 303c301..4c7128c 100644
--- a/testsuites/psxtmtests/psxtmrwlock07/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock07/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c
index 4223a02..031124b 100644
--- a/testsuites/psxtmtests/psxtmsem01/init.c
+++ b/testsuites/psxtmtests/psxtmsem01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <fcntl.h>
#include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem02/init.c b/testsuites/psxtmtests/psxtmsem02/init.c
index 3c2f34a..79557ab 100644
--- a/testsuites/psxtmtests/psxtmsem02/init.c
+++ b/testsuites/psxtmtests/psxtmsem02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <fcntl.h>
#include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c
index 687c8c6..9037882 100644
--- a/testsuites/psxtmtests/psxtmsem03/init.c
+++ b/testsuites/psxtmtests/psxtmsem03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <fcntl.h>
#include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c
index 540f0a3..b8130a9 100644
--- a/testsuites/psxtmtests/psxtmsem04/init.c
+++ b/testsuites/psxtmtests/psxtmsem04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <fcntl.h>
#include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c
index 07b96b2..fca2e03 100644
--- a/testsuites/psxtmtests/psxtmsem05/init.c
+++ b/testsuites/psxtmtests/psxtmsem05/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <fcntl.h>
#include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c
index f2ee0af..5f3b8de 100644
--- a/testsuites/psxtmtests/psxtmsleep01/init.c
+++ b/testsuites/psxtmtests/psxtmsleep01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c
index 95fc9d9..8948c94 100644
--- a/testsuites/psxtmtests/psxtmsleep02/init.c
+++ b/testsuites/psxtmtests/psxtmsleep02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
#include "test_support.h"
@@ -68,7 +70,7 @@ void *POSIX_Init(
status = pthread_create( &threadId, NULL, Middle, NULL );
rtems_test_assert( !status );
}
-
+
status = pthread_create( &threadId, NULL, Low, NULL );
rtems_test_assert( !status );
diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c
index 60f94cf..35b9cbb 100644
--- a/testsuites/psxtmtests/psxtmthread01/init.c
+++ b/testsuites/psxtmtests/psxtmthread01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c
index c468f03..52e0ad3 100644
--- a/testsuites/psxtmtests/psxtmthread02/init.c
+++ b/testsuites/psxtmtests/psxtmthread02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c
index 938a8c6..30e1b64 100644
--- a/testsuites/psxtmtests/psxtmthread03/init.c
+++ b/testsuites/psxtmtests/psxtmthread03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <coverhd.h>
#include <tmacros.h>
#include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c
index 5b260dd..12f5337 100644
--- a/testsuites/psxtmtests/psxtmthread04/init.c
+++ b/testsuites/psxtmtests/psxtmthread04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
@@ -55,7 +57,7 @@ void benchmark_pthread_setschedparam(void)
status = pthread_getschedparam( pthread_self(), &policy, ¶m );
rtems_test_assert( status == 0 );
-
+
/* Arbitrary priority, no other threads to preempt us so it doesn't matter. */
param.sched_priority = 5;
benchmark_timer_initialize();
@@ -69,7 +71,7 @@ void benchmark_pthread_setschedparam(void)
1, /* Only executed once */
0,
0
- );
+ );
}
void *POSIX_Init(
diff --git a/testsuites/psxtmtests/psxtmthread05/init.c b/testsuites/psxtmtests/psxtmthread05/init.c
index 53a8b11..682afc0 100644
--- a/testsuites/psxtmtests/psxtmthread05/init.c
+++ b/testsuites/psxtmtests/psxtmthread05/init.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
@@ -38,7 +40,7 @@ void benchmark_pthread_setschedparam(void)
/* make test_thread equal to POSIX_Init() */
pthread_getschedparam(pthread_self(), &policy, ¶m);
-
+
pthread_setschedparam(thread_ID, policy, ¶m);
/* At this point, we've switched to test_thread */
diff --git a/testsuites/psxtmtests/psxtmthread06/init.c b/testsuites/psxtmtests/psxtmthread06/init.c
index 6031909..d7c92fc 100644
--- a/testsuites/psxtmtests/psxtmthread06/init.c
+++ b/testsuites/psxtmtests/psxtmthread06/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
diff --git a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
index a897727..438bff1 100644
--- a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
+++ b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
@@ -4,6 +4,8 @@
* This file's license is 2-clause BSD as in this distribution's LICENSE file.
*/
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
diff --git a/testsuites/rhealstone/rhilatency/ilatency.c b/testsuites/rhealstone/rhilatency/ilatency.c
index 0a7741b..87ca136 100644
--- a/testsuites/rhealstone/rhilatency/ilatency.c
+++ b/testsuites/rhealstone/rhilatency/ilatency.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include <timesys.h>
#include <rtems/btimer.h>
diff --git a/testsuites/rhealstone/rhmlatency/mlatency.c b/testsuites/rhealstone/rhmlatency/mlatency.c
index 11a29c0..3682dc8 100644
--- a/testsuites/rhealstone/rhmlatency/mlatency.c
+++ b/testsuites/rhealstone/rhmlatency/mlatency.c
@@ -8,6 +8,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
diff --git a/testsuites/rhealstone/rhsemshuffle/semshuffle.c b/testsuites/rhealstone/rhsemshuffle/semshuffle.c
index 6800926..6aaf38d 100644
--- a/testsuites/rhealstone/rhsemshuffle/semshuffle.c
+++ b/testsuites/rhealstone/rhsemshuffle/semshuffle.c
@@ -4,6 +4,8 @@
* This file's license is 2-clause BSD as in this distribution's LICENSE file.
*/
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
diff --git a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
index c396e74..0218c6d 100644
--- a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
+++ b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
@@ -4,6 +4,8 @@
* This file's license is 2-clause BSD as in this distribution's LICENSE file.
*/
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
diff --git a/testsuites/rhealstone/rhtaskswitch/taskswitch.c b/testsuites/rhealstone/rhtaskswitch/taskswitch.c
index 520de33..972eed8 100644
--- a/testsuites/rhealstone/rhtaskswitch/taskswitch.c
+++ b/testsuites/rhealstone/rhtaskswitch/taskswitch.c
@@ -4,6 +4,8 @@
* This file's license is 2-clause BSD as in this distribution's LICENSE file.
*/
+#define TEST_INIT
+
#include <timesys.h>
#include <rtems/btimer.h>
diff --git a/testsuites/samples/base_mp/init.c b/testsuites/samples/base_mp/init.c
index 901dc83..9986d3c 100644
--- a/testsuites/samples/base_mp/init.c
+++ b/testsuites/samples/base_mp/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <stdio.h>
diff --git a/testsuites/samples/base_sp/init.c b/testsuites/samples/base_sp/init.c
index b1cb4d9..48dbf79 100644
--- a/testsuites/samples/base_sp/init.c
+++ b/testsuites/samples/base_sp/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include "tmacros.h"
diff --git a/testsuites/samples/capture/init.c b/testsuites/samples/capture/init.c
index 557e809..4893274 100644
--- a/testsuites/samples/capture/init.c
+++ b/testsuites/samples/capture/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "system.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/testsuites/samples/cdtest/init.c b/testsuites/samples/cdtest/init.c
index 1cf2b20..b5ea093 100644
--- a/testsuites/samples/cdtest/init.c
+++ b/testsuites/samples/cdtest/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <stdio.h>
diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c
index 433266a..7158ab1 100644
--- a/testsuites/samples/fileio/init.c
+++ b/testsuites/samples/fileio/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <sys/param.h>
diff --git a/testsuites/samples/nsecs/init.c b/testsuites/samples/nsecs/init.c
index 59995f1..7e4e209 100644
--- a/testsuites/samples/nsecs/init.c
+++ b/testsuites/samples/nsecs/init.c
@@ -17,6 +17,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <inttypes.h>
#include <stdio.h>
diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c
index ac7c214..60aaefc 100644
--- a/testsuites/samples/paranoia/init.c
+++ b/testsuites/samples/paranoia/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#include <stdio.h>
diff --git a/testsuites/samples/pppd/init.c b/testsuites/samples/pppd/init.c
index a8daedc..e8bd7c3 100644
--- a/testsuites/samples/pppd/init.c
+++ b/testsuites/samples/pppd/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/testsuites/samples/ticker/init.c b/testsuites/samples/ticker/init.c
index 3f3cbd8..1b9ae96 100644
--- a/testsuites/samples/ticker/init.c
+++ b/testsuites/samples/ticker/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/samples/unlimited/init.c b/testsuites/samples/unlimited/init.c
index 002a973..0466e3d 100644
--- a/testsuites/samples/unlimited/init.c
+++ b/testsuites/samples/unlimited/init.c
@@ -13,6 +13,8 @@
#define CONFIGURE_INIT
+#define TEST_INIT
+
#include "system.h"
#include "tmacros.h"
#include <stdio.h>
diff --git a/testsuites/smptests/smp01/init.c b/testsuites/smptests/smp01/init.c
index c77a192..ef9d6b8 100644
--- a/testsuites/smptests/smp01/init.c
+++ b/testsuites/smptests/smp01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/smptests/smp02/init.c b/testsuites/smptests/smp02/init.c
index e70eca3..48d6148 100644
--- a/testsuites/smptests/smp02/init.c
+++ b/testsuites/smptests/smp02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/smptests/smp03/init.c b/testsuites/smptests/smp03/init.c
index 03eddb0..63383c4 100644
--- a/testsuites/smptests/smp03/init.c
+++ b/testsuites/smptests/smp03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/smptests/smp05/init.c b/testsuites/smptests/smp05/init.c
index 7211e8c..854c8fe 100644
--- a/testsuites/smptests/smp05/init.c
+++ b/testsuites/smptests/smp05/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/smptests/smp07/init.c b/testsuites/smptests/smp07/init.c
index 0dbf70b..9bf0529 100644
--- a/testsuites/smptests/smp07/init.c
+++ b/testsuites/smptests/smp07/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/smptests/smp08/init.c b/testsuites/smptests/smp08/init.c
index 8500392..fb58d70 100644
--- a/testsuites/smptests/smp08/init.c
+++ b/testsuites/smptests/smp08/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/smptests/smp09/init.c b/testsuites/smptests/smp09/init.c
index 6629064..4cb89de 100644
--- a/testsuites/smptests/smp09/init.c
+++ b/testsuites/smptests/smp09/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <rtems/cpuuse.h>
diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c
index eae6d70..c5a24c0 100644
--- a/testsuites/smptests/smpaffinity01/init.c
+++ b/testsuites/smptests/smpaffinity01/init.c
@@ -13,6 +13,8 @@
#define NUM_CPUS 4
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SMPAFFINITY 1";
diff --git a/testsuites/smptests/smpatomic01/init.c b/testsuites/smptests/smpatomic01/init.c
index 394cc3f..a780c69 100644
--- a/testsuites/smptests/smpatomic01/init.c
+++ b/testsuites/smptests/smpatomic01/init.c
@@ -18,6 +18,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/score/atomic.h>
#include <rtems/score/smpbarrier.h>
#include <rtems.h>
diff --git a/testsuites/smptests/smpcache01/init.c b/testsuites/smptests/smpcache01/init.c
index 73e30a1..ee752c7 100644
--- a/testsuites/smptests/smpcache01/init.c
+++ b/testsuites/smptests/smpcache01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/score/atomic.h>
#include <rtems/score/smpbarrier.h>
#include <rtems/score/smpimpl.h>
diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c
index 2818b91..2650f24 100644
--- a/testsuites/smptests/smpcapture01/init.c
+++ b/testsuites/smptests/smpcapture01/init.c
@@ -25,6 +25,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <rtems/captureimpl.h>
diff --git a/testsuites/smptests/smpcapture02/init.c b/testsuites/smptests/smpcapture02/init.c
index 9926fbb..efcb236 100644
--- a/testsuites/smptests/smpcapture02/init.c
+++ b/testsuites/smptests/smpcapture02/init.c
@@ -21,6 +21,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <bsp/irq.h>
#include <rtems/captureimpl.h>
diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c
index 5972959..a4128e4 100644
--- a/testsuites/smptests/smpclock01/init.c
+++ b/testsuites/smptests/smpclock01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems.h>
diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c
index 2a000a5..68ba68c 100644
--- a/testsuites/smptests/smpfatal01/init.c
+++ b/testsuites/smptests/smpfatal01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c
index fc25808..0b24245 100644
--- a/testsuites/smptests/smpfatal02/init.c
+++ b/testsuites/smptests/smpfatal02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/smptests/smpfatal03/init.c b/testsuites/smptests/smpfatal03/init.c
index 47f8598..8121fd2 100644
--- a/testsuites/smptests/smpfatal03/init.c
+++ b/testsuites/smptests/smpfatal03/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c
index 73ef701..93d6bf1 100644
--- a/testsuites/smptests/smpfatal04/init.c
+++ b/testsuites/smptests/smpfatal04/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c
index 6b0954a..b07c986 100644
--- a/testsuites/smptests/smpfatal05/init.c
+++ b/testsuites/smptests/smpfatal05/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/smptests/smpfatal06/init.c b/testsuites/smptests/smpfatal06/init.c
index 37cd9af..94e6cf7 100644
--- a/testsuites/smptests/smpfatal06/init.c
+++ b/testsuites/smptests/smpfatal06/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c
index 92f769a..f4adc32 100644
--- a/testsuites/smptests/smpfatal08/init.c
+++ b/testsuites/smptests/smpfatal08/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/smptests/smpipi01/init.c b/testsuites/smptests/smpipi01/init.c
index cc85388..b2f232e 100644
--- a/testsuites/smptests/smpipi01/init.c
+++ b/testsuites/smptests/smpipi01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/score/smpimpl.h>
#include <rtems/score/smpbarrier.h>
#include <rtems/counter.h>
diff --git a/testsuites/smptests/smpload01/init.c b/testsuites/smptests/smpload01/init.c
index 0e10235..778c3dc 100644
--- a/testsuites/smptests/smpload01/init.c
+++ b/testsuites/smptests/smpload01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <stdlib.h>
diff --git a/testsuites/smptests/smplock01/init.c b/testsuites/smptests/smplock01/init.c
index 0a37915..38a3d0a 100644
--- a/testsuites/smptests/smplock01/init.c
+++ b/testsuites/smptests/smplock01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/score/smplock.h>
#include <rtems/score/smplockmcs.h>
#include <rtems/score/smplockseq.h>
diff --git a/testsuites/smptests/smpmigration01/init.c b/testsuites/smptests/smpmigration01/init.c
index 6cde34b..7203350 100644
--- a/testsuites/smptests/smpmigration01/init.c
+++ b/testsuites/smptests/smpmigration01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTF
#include "tmacros.h"
diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c
index 4180f53..15e5d6e 100644
--- a/testsuites/smptests/smpmigration02/init.c
+++ b/testsuites/smptests/smpmigration02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <rtems/libcsupport.h>
#include <rtems/score/objectimpl.h>
diff --git a/testsuites/smptests/smpmrsp01/init.c b/testsuites/smptests/smpmrsp01/init.c
index cc95567..9da101e 100644
--- a/testsuites/smptests/smpmrsp01/init.c
+++ b/testsuites/smptests/smpmrsp01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/param.h>
#include <stdio.h>
diff --git a/testsuites/smptests/smpmutex01/init.c b/testsuites/smptests/smpmutex01/init.c
index c7059e8..ead95cf 100644
--- a/testsuites/smptests/smpmutex01/init.c
+++ b/testsuites/smptests/smpmutex01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SMPMUTEX 1";
diff --git a/testsuites/smptests/smpmutex02/init.c b/testsuites/smptests/smpmutex02/init.c
index 1604bb7..f902d88 100644
--- a/testsuites/smptests/smpmutex02/init.c
+++ b/testsuites/smptests/smpmutex02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <inttypes.h>
#include <string.h>
#include <stdio.h>
diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c
index 58e1db5..0178071 100644
--- a/testsuites/smptests/smppsxaffinity01/init.c
+++ b/testsuites/smptests/smppsxaffinity01/init.c
@@ -13,6 +13,8 @@
#define _GNU_SOURCE
+#define TEST_INIT
+
#include <tmacros.h>
#include <errno.h>
#include <pthread.h>
diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c
index 21a723d..1b4bd59 100644
--- a/testsuites/smptests/smppsxaffinity02/init.c
+++ b/testsuites/smptests/smppsxaffinity02/init.c
@@ -15,6 +15,8 @@
#define _GNU_SOURCE
+#define TEST_INIT
+
#include <tmacros.h>
#include <errno.h>
#include <pthread.h>
diff --git a/testsuites/smptests/smppsxmutex01/init.c b/testsuites/smptests/smppsxmutex01/init.c
index aeed75c..67ff99c 100644
--- a/testsuites/smptests/smppsxmutex01/init.c
+++ b/testsuites/smptests/smppsxmutex01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <errno.h>
#include <pthread.h>
diff --git a/testsuites/smptests/smppsxsignal01/init.c b/testsuites/smptests/smppsxsignal01/init.c
index 3676158..2c4687d 100644
--- a/testsuites/smptests/smppsxsignal01/init.c
+++ b/testsuites/smptests/smppsxsignal01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <pthread.h>
diff --git a/testsuites/smptests/smpschedaffinity01/init.c b/testsuites/smptests/smpschedaffinity01/init.c
index 778fda7..d25d7e0 100644
--- a/testsuites/smptests/smpschedaffinity01/init.c
+++ b/testsuites/smptests/smpschedaffinity01/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity02/init.c b/testsuites/smptests/smpschedaffinity02/init.c
index 9a8cfed..6e40c8e 100644
--- a/testsuites/smptests/smpschedaffinity02/init.c
+++ b/testsuites/smptests/smpschedaffinity02/init.c
@@ -21,6 +21,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity03/init.c b/testsuites/smptests/smpschedaffinity03/init.c
index a53b30c..4036217 100644
--- a/testsuites/smptests/smpschedaffinity03/init.c
+++ b/testsuites/smptests/smpschedaffinity03/init.c
@@ -15,6 +15,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity04/init.c b/testsuites/smptests/smpschedaffinity04/init.c
index c7a071f..2a504f9 100644
--- a/testsuites/smptests/smpschedaffinity04/init.c
+++ b/testsuites/smptests/smpschedaffinity04/init.c
@@ -15,6 +15,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c
index 1d69592..d2c897a 100644
--- a/testsuites/smptests/smpschedaffinity05/init.c
+++ b/testsuites/smptests/smpschedaffinity05/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <inttypes.h>
diff --git a/testsuites/smptests/smpschededf01/init.c b/testsuites/smptests/smpschededf01/init.c
index d6e68b5..2bfcadf 100644
--- a/testsuites/smptests/smpschededf01/init.c
+++ b/testsuites/smptests/smpschededf01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <rtems/cpuuse.h>
#include <rtems/printer.h>
diff --git a/testsuites/smptests/smpschededf02/init.c b/testsuites/smptests/smpschededf02/init.c
index e0c5182..17976fb 100644
--- a/testsuites/smptests/smpschededf02/init.c
+++ b/testsuites/smptests/smpschededf02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems.h>
diff --git a/testsuites/smptests/smpschededf03/init.c b/testsuites/smptests/smpschededf03/init.c
index 3302953..3a1f270 100644
--- a/testsuites/smptests/smpschededf03/init.c
+++ b/testsuites/smptests/smpschededf03/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems.h>
diff --git a/testsuites/smptests/smpschedsem01/init.c b/testsuites/smptests/smpschedsem01/init.c
index cae5d6e..75173e3 100644
--- a/testsuites/smptests/smpschedsem01/init.c
+++ b/testsuites/smptests/smpschedsem01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "tmacros.h"
diff --git a/testsuites/smptests/smpscheduler01/init.c b/testsuites/smptests/smpscheduler01/init.c
index 5df3281..9f0b5c1 100644
--- a/testsuites/smptests/smpscheduler01/init.c
+++ b/testsuites/smptests/smpscheduler01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <rtems/score/threadimpl.h>
diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c
index 5cd3783..1107fad 100644
--- a/testsuites/smptests/smpscheduler02/init.c
+++ b/testsuites/smptests/smpscheduler02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sched.h>
#include <limits.h>
diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c
index a4e9da1..2515e17 100644
--- a/testsuites/smptests/smpscheduler04/init.c
+++ b/testsuites/smptests/smpscheduler04/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <inttypes.h>
#include <string.h>
#include <stdio.h>
diff --git a/testsuites/smptests/smpsignal01/init.c b/testsuites/smptests/smpsignal01/init.c
index 52f2edb..af66c26 100644
--- a/testsuites/smptests/smpsignal01/init.c
+++ b/testsuites/smptests/smpsignal01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SMPSIGNAL 1";
diff --git a/testsuites/smptests/smpstrongapa01/init.c b/testsuites/smptests/smpstrongapa01/init.c
index 75ac79b..d59714f 100644
--- a/testsuites/smptests/smpstrongapa01/init.c
+++ b/testsuites/smptests/smpstrongapa01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems.h>
diff --git a/testsuites/smptests/smpswitchextension01/init.c b/testsuites/smptests/smpswitchextension01/init.c
index 3fad1d9..c415863 100644
--- a/testsuites/smptests/smpswitchextension01/init.c
+++ b/testsuites/smptests/smpswitchextension01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <stdio.h>
diff --git a/testsuites/smptests/smpthreadlife01/init.c b/testsuites/smptests/smpthreadlife01/init.c
index 5c2d106..f224dd9 100644
--- a/testsuites/smptests/smpthreadlife01/init.c
+++ b/testsuites/smptests/smpthreadlife01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems.h>
diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c
index a5ccaae..56212a4 100644
--- a/testsuites/smptests/smpunsupported01/init.c
+++ b/testsuites/smptests/smpunsupported01/init.c
@@ -17,6 +17,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SMPUNSUPPORTED 1";
diff --git a/testsuites/smptests/smpwakeafter01/init.c b/testsuites/smptests/smpwakeafter01/init.c
index 3d091f5..d677059 100644
--- a/testsuites/smptests/smpwakeafter01/init.c
+++ b/testsuites/smptests/smpwakeafter01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <stdio.h>
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index cf95c4a..f02d277 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -61,7 +61,6 @@ _SUBDIRS += spmrsp01
_SUBDIRS += spscheduler01
_SUBDIRS += spfatal28
_SUBDIRS += spthreadlife01
-_SUBDIRS += spprofiling01
_SUBDIRS += spcache01
_SUBDIRS += sptls03
_SUBDIRS += spcpucounter01
diff --git a/testsuites/sptests/sp01/init.c b/testsuites/sptests/sp01/init.c
index 4d73804..a726a02 100644
--- a/testsuites/sptests/sp01/init.c
+++ b/testsuites/sptests/sp01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c
index d7ff317..ffd330e 100644
--- a/testsuites/sptests/sp02/init.c
+++ b/testsuites/sptests/sp02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp03/init.c b/testsuites/sptests/sp03/init.c
index 1f02eb6..a5b6d80 100644
--- a/testsuites/sptests/sp03/init.c
+++ b/testsuites/sptests/sp03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp04/init.c b/testsuites/sptests/sp04/init.c
index e7bc793..3192579 100644
--- a/testsuites/sptests/sp04/init.c
+++ b/testsuites/sptests/sp04/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp05/init.c b/testsuites/sptests/sp05/init.c
index 7d95ee9..52db2ea 100644
--- a/testsuites/sptests/sp05/init.c
+++ b/testsuites/sptests/sp05/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp06/init.c b/testsuites/sptests/sp06/init.c
index e8379ae..60e7a41 100644
--- a/testsuites/sptests/sp06/init.c
+++ b/testsuites/sptests/sp06/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
index d5b606d..bfae5eb 100644
--- a/testsuites/sptests/sp07/init.c
+++ b/testsuites/sptests/sp07/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c
index 2364c70..88c1445 100644
--- a/testsuites/sptests/sp08/init.c
+++ b/testsuites/sptests/sp08/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/score/sysstate.h>
diff --git a/testsuites/sptests/sp11/init.c b/testsuites/sptests/sp11/init.c
index ee3f2e8..5b52ba9 100644
--- a/testsuites/sptests/sp11/init.c
+++ b/testsuites/sptests/sp11/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c
index 0b92004..fb7a5f8 100644
--- a/testsuites/sptests/sp12/init.c
+++ b/testsuites/sptests/sp12/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c
index ffa2d12..ed244bc 100644
--- a/testsuites/sptests/sp13/init.c
+++ b/testsuites/sptests/sp13/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp14/init.c b/testsuites/sptests/sp14/init.c
index b0cedc2..5e3ef23 100644
--- a/testsuites/sptests/sp14/init.c
+++ b/testsuites/sptests/sp14/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp15/init.c b/testsuites/sptests/sp15/init.c
index dcf8f95..e867a91 100644
--- a/testsuites/sptests/sp15/init.c
+++ b/testsuites/sptests/sp15/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp16/init.c b/testsuites/sptests/sp16/init.c
index 3b8543b..f9e5d0a 100644
--- a/testsuites/sptests/sp16/init.c
+++ b/testsuites/sptests/sp16/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp17/init.c b/testsuites/sptests/sp17/init.c
index 4f7cba8..0ee99c1 100644
--- a/testsuites/sptests/sp17/init.c
+++ b/testsuites/sptests/sp17/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c
index 5f39794..4c9448f 100644
--- a/testsuites/sptests/sp18/init.c
+++ b/testsuites/sptests/sp18/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/libcsupport.h>
#include <tmacros.h>
diff --git a/testsuites/sptests/sp19/init.c b/testsuites/sptests/sp19/init.c
index f1b75c4..9d8fea3 100644
--- a/testsuites/sptests/sp19/init.c
+++ b/testsuites/sptests/sp19/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c
index 9323524..0ffd75a 100644
--- a/testsuites/sptests/sp20/init.c
+++ b/testsuites/sptests/sp20/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
index da7c23e..28c8cb1 100644
--- a/testsuites/sptests/sp2038/init.c
+++ b/testsuites/sptests/sp2038/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <time.h>
diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c
index 0eb453c..9a2fec5 100644
--- a/testsuites/sptests/sp21/init.c
+++ b/testsuites/sptests/sp21/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/devnull.h>
#include <rtems/devzero.h>
diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c
index 23956e6..78e415d 100644
--- a/testsuites/sptests/sp22/init.c
+++ b/testsuites/sptests/sp22/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp23/init.c b/testsuites/sptests/sp23/init.c
index e0ee2f9..a6b52c6 100644
--- a/testsuites/sptests/sp23/init.c
+++ b/testsuites/sptests/sp23/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp24/init.c b/testsuites/sptests/sp24/init.c
index b0e7f15..8c50c3a 100644
--- a/testsuites/sptests/sp24/init.c
+++ b/testsuites/sptests/sp24/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp25/init.c b/testsuites/sptests/sp25/init.c
index e744e5c..ba4f65b 100644
--- a/testsuites/sptests/sp25/init.c
+++ b/testsuites/sptests/sp25/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp26/init.c b/testsuites/sptests/sp26/init.c
index 0ac7157..6df979c 100644
--- a/testsuites/sptests/sp26/init.c
+++ b/testsuites/sptests/sp26/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c
index bb4630d..a545914 100644
--- a/testsuites/sptests/sp27/init.c
+++ b/testsuites/sptests/sp27/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <tmacros.h>
diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
index e65fbe3..6f68275 100644
--- a/testsuites/sptests/sp29/init.c
+++ b/testsuites/sptests/sp29/init.c
@@ -8,6 +8,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <bsp.h>
diff --git a/testsuites/sptests/sp30/init.c b/testsuites/sptests/sp30/init.c
index 616e4cd..deb1873 100644
--- a/testsuites/sptests/sp30/init.c
+++ b/testsuites/sptests/sp30/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c
index 020ec25..34a9651 100644
--- a/testsuites/sptests/sp31/init.c
+++ b/testsuites/sptests/sp31/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp32/init.c b/testsuites/sptests/sp32/init.c
index 71cd46c..86068a3 100644
--- a/testsuites/sptests/sp32/init.c
+++ b/testsuites/sptests/sp32/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h> /* includes bsp.h, stdio, etc... */
const char rtems_test_name[] = "SP 32";
diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c
index 579cd65..d45d860 100644
--- a/testsuites/sptests/sp33/init.c
+++ b/testsuites/sptests/sp33/init.c
@@ -11,7 +11,8 @@
#include "config.h"
#endif
-#define CONFIGURE_INIT
+#define TEST_INIT
+
#include <tmacros.h> /* includes bsp.h, stdio, etc... */
const char rtems_test_name[] = "SP 33";
diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c
index 5000f69..d2bdd65 100644
--- a/testsuites/sptests/sp34/changepri.c
+++ b/testsuites/sptests/sp34/changepri.c
@@ -25,6 +25,8 @@
#define CONFIGURE_INIT
+#define TEST_INIT
+
#include <bsp.h>
#include <stdio.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c
index 8848348..69f3ca3 100644
--- a/testsuites/sptests/sp35/priinv.c
+++ b/testsuites/sptests/sp35/priinv.c
@@ -51,6 +51,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <stdio.h>
#include "tmacros.h"
@@ -232,7 +234,7 @@ rtems_isr LocalHwIsr(/*in*/ rtems_vector_number Vector)
/* Signal synchroniztion semaphore to invoke waiting task */
status = rtems_semaphore_release(LocalHwSync_S);
if (status != RTEMS_SUCCESSFUL) {
- fprintf( stderr, "LocalHwISR release %d\n", status );
+ printf( "LocalHwISR release %d\n", status );
while(1); /* Error */
}
diff --git a/testsuites/sptests/sp36/strict_order_mut.c b/testsuites/sptests/sp36/strict_order_mut.c
index db270ca..d49ee74 100644
--- a/testsuites/sptests/sp36/strict_order_mut.c
+++ b/testsuites/sptests/sp36/strict_order_mut.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <stdio.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c
index 08d6285..13e9a33 100644
--- a/testsuites/sptests/sp37/init.c
+++ b/testsuites/sptests/sp37/init.c
@@ -18,6 +18,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c
index d77d5d2..49c74c2 100644
--- a/testsuites/sptests/sp38/init.c
+++ b/testsuites/sptests/sp38/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
index 44e8d45..b923d9f 100644
--- a/testsuites/sptests/sp40/init.c
+++ b/testsuites/sptests/sp40/init.c
@@ -15,6 +15,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/ioimpl.h>
diff --git a/testsuites/sptests/sp41/init.c b/testsuites/sptests/sp41/init.c
index 04b855b..e08019a 100644
--- a/testsuites/sptests/sp41/init.c
+++ b/testsuites/sptests/sp41/init.c
@@ -13,6 +13,8 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/score/objectimpl.h>
diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
index f4be2a5..9260b7a 100644
--- a/testsuites/sptests/sp42/init.c
+++ b/testsuites/sptests/sp42/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <stdlib.h>
diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
index a002535..56c3985 100644
--- a/testsuites/sptests/sp43/init.c
+++ b/testsuites/sptests/sp43/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c
index 5b11ead..39b2f50 100644
--- a/testsuites/sptests/sp44/init.c
+++ b/testsuites/sptests/sp44/init.c
@@ -9,6 +9,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems.h>
#include <stdio.h>
diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c
index b8b43b4..20b6119 100644
--- a/testsuites/sptests/sp45/init.c
+++ b/testsuites/sptests/sp45/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 45";
diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c
index 55653e0..d66108a 100644
--- a/testsuites/sptests/sp46/init.c
+++ b/testsuites/sptests/sp46/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/cpuuse.h>
diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c
index 5d28303..2c2b637 100644
--- a/testsuites/sptests/sp47/init.c
+++ b/testsuites/sptests/sp47/init.c
@@ -6,6 +6,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 47";
diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c
index 53d8245..a6bfa9d 100644
--- a/testsuites/sptests/sp48/init.c
+++ b/testsuites/sptests/sp48/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/libcsupport.h>
diff --git a/testsuites/sptests/sp49/init.c b/testsuites/sptests/sp49/init.c
index 64db98e..0edbc4a 100644
--- a/testsuites/sptests/sp49/init.c
+++ b/testsuites/sptests/sp49/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 49";
diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c
index 58a7be7..abc5a75 100644
--- a/testsuites/sptests/sp50/init.c
+++ b/testsuites/sptests/sp50/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "pritime.h"
diff --git a/testsuites/sptests/sp51/init.c b/testsuites/sptests/sp51/init.c
index 1e8f9e5..51fa006 100644
--- a/testsuites/sptests/sp51/init.c
+++ b/testsuites/sptests/sp51/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 51";
diff --git a/testsuites/sptests/sp52/init.c b/testsuites/sptests/sp52/init.c
index f7629a5..3069e24 100644
--- a/testsuites/sptests/sp52/init.c
+++ b/testsuites/sptests/sp52/init.c
@@ -25,6 +25,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <string.h>
diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c
index 3b0d458..e39999c 100644
--- a/testsuites/sptests/sp54/init.c
+++ b/testsuites/sptests/sp54/init.c
@@ -18,6 +18,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 54";
diff --git a/testsuites/sptests/sp55/init.c b/testsuites/sptests/sp55/init.c
index ee06e84..ebc1264 100644
--- a/testsuites/sptests/sp55/init.c
+++ b/testsuites/sptests/sp55/init.c
@@ -17,6 +17,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 55";
diff --git a/testsuites/sptests/sp56/init.c b/testsuites/sptests/sp56/init.c
index c0ce3c0..c383420 100644
--- a/testsuites/sptests/sp56/init.c
+++ b/testsuites/sptests/sp56/init.c
@@ -17,6 +17,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 56";
diff --git a/testsuites/sptests/sp57/init.c b/testsuites/sptests/sp57/init.c
index 3003c2f..8e0be12 100644
--- a/testsuites/sptests/sp57/init.c
+++ b/testsuites/sptests/sp57/init.c
@@ -17,6 +17,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 57";
diff --git a/testsuites/sptests/sp58/init.c b/testsuites/sptests/sp58/init.c
index b611203..b5fd843 100644
--- a/testsuites/sptests/sp58/init.c
+++ b/testsuites/sptests/sp58/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <sys/types.h>
diff --git a/testsuites/sptests/sp59/init.c b/testsuites/sptests/sp59/init.c
index 4120761..100b540 100644
--- a/testsuites/sptests/sp59/init.c
+++ b/testsuites/sptests/sp59/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 59";
diff --git a/testsuites/sptests/sp60/init.c b/testsuites/sptests/sp60/init.c
index b015ac1..baa8f2c 100644
--- a/testsuites/sptests/sp60/init.c
+++ b/testsuites/sptests/sp60/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 60";
diff --git a/testsuites/sptests/sp62/init.c b/testsuites/sptests/sp62/init.c
index 7df64df..cbe6c92 100644
--- a/testsuites/sptests/sp62/init.c
+++ b/testsuites/sptests/sp62/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <unistd.h>
diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
index 6f1c837..a4d6639 100644
--- a/testsuites/sptests/sp63/init.c
+++ b/testsuites/sptests/sp63/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/score/heapimpl.h>
diff --git a/testsuites/sptests/sp64/init.c b/testsuites/sptests/sp64/init.c
index 153a9f2..76961f7 100644
--- a/testsuites/sptests/sp64/init.c
+++ b/testsuites/sptests/sp64/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/libcsupport.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c
index 09c64b9..f1fed6e 100644
--- a/testsuites/sptests/sp65/init.c
+++ b/testsuites/sptests/sp65/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <unistd.h>
diff --git a/testsuites/sptests/sp67/init.c b/testsuites/sptests/sp67/init.c
index 154e836..fe05da2 100644
--- a/testsuites/sptests/sp67/init.c
+++ b/testsuites/sptests/sp67/init.c
@@ -14,6 +14,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/score/watchdogimpl.h>
diff --git a/testsuites/sptests/sp68/init.c b/testsuites/sptests/sp68/init.c
index 5642203..9aa8dd2 100644
--- a/testsuites/sptests/sp68/init.c
+++ b/testsuites/sptests/sp68/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 68";
diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c
index c604c2d..83f93cd 100644
--- a/testsuites/sptests/sp69/init.c
+++ b/testsuites/sptests/sp69/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/cpuuse.h>
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sp70/init.c b/testsuites/sptests/sp70/init.c
index 721e3b9..eafdde5 100644
--- a/testsuites/sptests/sp70/init.c
+++ b/testsuites/sptests/sp70/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c
index eff6ba7..999a2e8 100644
--- a/testsuites/sptests/sp71/init.c
+++ b/testsuites/sptests/sp71/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sp72/init.c b/testsuites/sptests/sp72/init.c
index 5e2c8ab..b8561e0 100644
--- a/testsuites/sptests/sp72/init.c
+++ b/testsuites/sptests/sp72/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sp73/init.c b/testsuites/sptests/sp73/init.c
index 8db5024..261bf8b 100644
--- a/testsuites/sptests/sp73/init.c
+++ b/testsuites/sptests/sp73/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <inttypes.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/sp74/init.c b/testsuites/sptests/sp74/init.c
index 346c676..a1f9e56 100644
--- a/testsuites/sptests/sp74/init.c
+++ b/testsuites/sptests/sp74/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 74";
diff --git a/testsuites/sptests/sp75/init.c b/testsuites/sptests/sp75/init.c
index e699e76..667e461 100644
--- a/testsuites/sptests/sp75/init.c
+++ b/testsuites/sptests/sp75/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sp76/init.c b/testsuites/sptests/sp76/init.c
index daf55f1..f414080 100644
--- a/testsuites/sptests/sp76/init.c
+++ b/testsuites/sptests/sp76/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SP 76";
diff --git a/testsuites/sptests/sp77/init.c b/testsuites/sptests/sp77/init.c
index c6ccacc..f645209 100644
--- a/testsuites/sptests/sp77/init.c
+++ b/testsuites/sptests/sp77/init.c
@@ -7,6 +7,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/spassoc01/init.c b/testsuites/sptests/spassoc01/init.c
index ba3873a..959cd40 100644
--- a/testsuites/sptests/spassoc01/init.c
+++ b/testsuites/sptests/spassoc01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/spatomic01/init.c b/testsuites/sptests/spatomic01/init.c
index b5fa6c4..e034fcc 100644
--- a/testsuites/sptests/spatomic01/init.c
+++ b/testsuites/sptests/spatomic01/init.c
@@ -18,6 +18,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/score/atomic.h>
#include <stdio.h>
#include <rtems.h>
diff --git a/testsuites/sptests/spcache01/init.c b/testsuites/sptests/spcache01/init.c
index 52fa860..28cf8c0 100644
--- a/testsuites/sptests/spcache01/init.c
+++ b/testsuites/sptests/spcache01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <inttypes.h>
#include <setjmp.h>
#include <stdio.h>
diff --git a/testsuites/sptests/spcbssched01/init.c b/testsuites/sptests/spcbssched01/init.c
index be85bce..eb8a808 100644
--- a/testsuites/sptests/spcbssched01/init.c
+++ b/testsuites/sptests/spcbssched01/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spcbssched02/init.c b/testsuites/sptests/spcbssched02/init.c
index acaf7a7..3d92de2 100644
--- a/testsuites/sptests/spcbssched02/init.c
+++ b/testsuites/sptests/spcbssched02/init.c
@@ -20,6 +20,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spcbssched03/init.c b/testsuites/sptests/spcbssched03/init.c
index 5554915..7b21905 100644
--- a/testsuites/sptests/spcbssched03/init.c
+++ b/testsuites/sptests/spcbssched03/init.c
@@ -20,6 +20,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c
index 8fa7ea0..aa5f91d 100644
--- a/testsuites/sptests/spchain/init.c
+++ b/testsuites/sptests/spchain/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/chain.h>
diff --git a/testsuites/sptests/spclock_err01/init.c b/testsuites/sptests/spclock_err01/init.c
index 087c8d4..7e02e5e 100644
--- a/testsuites/sptests/spclock_err01/init.c
+++ b/testsuites/sptests/spclock_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spclock_err02/init.c b/testsuites/sptests/spclock_err02/init.c
index 7912ab8..d87da5c 100644
--- a/testsuites/sptests/spclock_err02/init.c
+++ b/testsuites/sptests/spclock_err02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/spcontext01/init.c b/testsuites/sptests/spcontext01/init.c
index e093c50..6d2adce 100644
--- a/testsuites/sptests/spcontext01/init.c
+++ b/testsuites/sptests/spcontext01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SPCONTEXT 1";
diff --git a/testsuites/sptests/spcoverage/init.c b/testsuites/sptests/spcoverage/init.c
index a80acec..31fdb4b 100644
--- a/testsuites/sptests/spcoverage/init.c
+++ b/testsuites/sptests/spcoverage/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SPCOVERAGE";
diff --git a/testsuites/sptests/spcpucounter01/init.c b/testsuites/sptests/spcpucounter01/init.c
index 92f2e15..1a582fa 100644
--- a/testsuites/sptests/spcpucounter01/init.c
+++ b/testsuites/sptests/spcpucounter01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <inttypes.h>
diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c
index b13be49..39518e2 100644
--- a/testsuites/sptests/spcpuset01/init.c
+++ b/testsuites/sptests/spcpuset01/init.c
@@ -6,6 +6,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include <rtems.h>
#include <stdlib.h>
diff --git a/testsuites/sptests/spedfsched01/init.c b/testsuites/sptests/spedfsched01/init.c
index 04fc5ca..303cdeb 100644
--- a/testsuites/sptests/spedfsched01/init.c
+++ b/testsuites/sptests/spedfsched01/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spedfsched02/init.c b/testsuites/sptests/spedfsched02/init.c
index aa2798c..0e7f54d 100644
--- a/testsuites/sptests/spedfsched02/init.c
+++ b/testsuites/sptests/spedfsched02/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spedfsched03/init.c b/testsuites/sptests/spedfsched03/init.c
index 0c2425a..6163f9a 100644
--- a/testsuites/sptests/spedfsched03/init.c
+++ b/testsuites/sptests/spedfsched03/init.c
@@ -20,6 +20,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spedfsched04/init.c b/testsuites/sptests/spedfsched04/init.c
index bcaced9..42b2b15 100644
--- a/testsuites/sptests/spedfsched04/init.c
+++ b/testsuites/sptests/spedfsched04/init.c
@@ -30,6 +30,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/cpuuse.h>
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c
index 1f64bc4..4b0eb9f 100644
--- a/testsuites/sptests/sperror01/init.c
+++ b/testsuites/sptests/sperror01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include <tmacros.h>
diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c
index 717deab..bb82b1d 100644
--- a/testsuites/sptests/sperror02/init.c
+++ b/testsuites/sptests/sperror02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include <tmacros.h>
diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c
index 9d80fe5..4e5a311 100644
--- a/testsuites/sptests/sperror03/init.c
+++ b/testsuites/sptests/sperror03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
#include "test_support.h"
diff --git a/testsuites/sptests/spevent_err03/init.c b/testsuites/sptests/spevent_err03/init.c
index b13960e..1a1d33d 100644
--- a/testsuites/sptests/spevent_err03/init.c
+++ b/testsuites/sptests/spevent_err03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/speventsystem01/init.c b/testsuites/sptests/speventsystem01/init.c
index 7fb2429..6a02b85 100644
--- a/testsuites/sptests/speventsystem01/init.c
+++ b/testsuites/sptests/speventsystem01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/speventtransient01/init.c b/testsuites/sptests/speventtransient01/init.c
index 91d6ecf..1473ea6 100644
--- a/testsuites/sptests/speventtransient01/init.c
+++ b/testsuites/sptests/speventtransient01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/spextensions01/init.c b/testsuites/sptests/spextensions01/init.c
index cf02855..e94419f 100644
--- a/testsuites/sptests/spextensions01/init.c
+++ b/testsuites/sptests/spextensions01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c
index 7d20438..ebfdb0b 100644
--- a/testsuites/sptests/spfatal26/init.c
+++ b/testsuites/sptests/spfatal26/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/sptests/spfatal30/init.c b/testsuites/sptests/spfatal30/init.c
index 1c4e1cb..d6b87da 100644
--- a/testsuites/sptests/spfatal30/init.c
+++ b/testsuites/sptests/spfatal30/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/sptests/spfatal31/init.c b/testsuites/sptests/spfatal31/init.c
index 0f14778..e276205 100644
--- a/testsuites/sptests/spfatal31/init.c
+++ b/testsuites/sptests/spfatal31/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index f9b2ed3..b6de0d6 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spfifo01/init.c b/testsuites/sptests/spfifo01/init.c
index 0e0f678..3c8dc48 100644
--- a/testsuites/sptests/spfifo01/init.c
+++ b/testsuites/sptests/spfifo01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/testsuites/sptests/spfifo02/init.c b/testsuites/sptests/spfifo02/init.c
index 6472401..671e6ff 100644
--- a/testsuites/sptests/spfifo02/init.c
+++ b/testsuites/sptests/spfifo02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c
index 5aa4800..7d94095 100644
--- a/testsuites/sptests/spfifo03/init.c
+++ b/testsuites/sptests/spfifo03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <tmacros.h>
#include <stdio.h>
diff --git a/testsuites/sptests/spfifo04/init.c b/testsuites/sptests/spfifo04/init.c
index 157b45c..b7966d1 100644
--- a/testsuites/sptests/spfifo04/init.c
+++ b/testsuites/sptests/spfifo04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <tmacros.h>
#include <stdio.h>
diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c
index ab3ed66..522a45b 100644
--- a/testsuites/sptests/spfifo05/init.c
+++ b/testsuites/sptests/spfifo05/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <tmacros.h>
#include <stdio.h>
diff --git a/testsuites/sptests/spfreechain01/init.c b/testsuites/sptests/spfreechain01/init.c
index 6efcd93..e741a9b 100644
--- a/testsuites/sptests/spfreechain01/init.c
+++ b/testsuites/sptests/spfreechain01/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/score/chainimpl.h>
#include <rtems/score/freechain.h>
diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c
index 114abeb..d17bb9a 100644
--- a/testsuites/sptests/spheapprot/init.c
+++ b/testsuites/sptests/spheapprot/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c
index 21e42e3..5dc587a 100644
--- a/testsuites/sptests/spinternalerror01/init.c
+++ b/testsuites/sptests/spinternalerror01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c
index 2ed4c95..b1a3468 100644
--- a/testsuites/sptests/spinternalerror02/init.c
+++ b/testsuites/sptests/spinternalerror02/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <rtems.h>
diff --git a/testsuites/sptests/spintr_err01/init.c b/testsuites/sptests/spintr_err01/init.c
index 9bc39bf..afc195e 100644
--- a/testsuites/sptests/spintr_err01/init.c
+++ b/testsuites/sptests/spintr_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
index b7cfee4..255f827 100644
--- a/testsuites/sptests/spintrcritical01/init.c
+++ b/testsuites/sptests/spintrcritical01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index 423e4b5..9015810 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c
index 1a7ed2d..efe30c2 100644
--- a/testsuites/sptests/spintrcritical08/init.c
+++ b/testsuites/sptests/spintrcritical08/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
#include <rtems/score/watchdogimpl.h>
diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c
index 87c1c1a..bb495f6 100644
--- a/testsuites/sptests/spintrcritical09/init.c
+++ b/testsuites/sptests/spintrcritical09/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c
index f7e372a..b22b938 100644
--- a/testsuites/sptests/spintrcritical10/init.c
+++ b/testsuites/sptests/spintrcritical10/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c
index 2a3f83a..ee37bac 100644
--- a/testsuites/sptests/spintrcritical11/init.c
+++ b/testsuites/sptests/spintrcritical11/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical13/init.c b/testsuites/sptests/spintrcritical13/init.c
index 7069938..cd27854 100644
--- a/testsuites/sptests/spintrcritical13/init.c
+++ b/testsuites/sptests/spintrcritical13/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c
index 72e4832..5c8e46f 100644
--- a/testsuites/sptests/spintrcritical15/init.c
+++ b/testsuites/sptests/spintrcritical15/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c
index 3657c06..c34828a 100644
--- a/testsuites/sptests/spintrcritical16/init.c
+++ b/testsuites/sptests/spintrcritical16/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical18/init.c b/testsuites/sptests/spintrcritical18/init.c
index f621d21..fa2ee6c 100644
--- a/testsuites/sptests/spintrcritical18/init.c
+++ b/testsuites/sptests/spintrcritical18/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical20/init.c b/testsuites/sptests/spintrcritical20/init.c
index 1697df4..8c1f376 100644
--- a/testsuites/sptests/spintrcritical20/init.c
+++ b/testsuites/sptests/spintrcritical20/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
#include <rtems/score/threadimpl.h>
diff --git a/testsuites/sptests/spintrcritical21/init.c b/testsuites/sptests/spintrcritical21/init.c
index faa48f7..d5cf8e1 100644
--- a/testsuites/sptests/spintrcritical21/init.c
+++ b/testsuites/sptests/spintrcritical21/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c
index 7412bde..c95929e 100644
--- a/testsuites/sptests/spintrcritical22/init.c
+++ b/testsuites/sptests/spintrcritical22/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
#include <rtems/rtems/semimpl.h>
diff --git a/testsuites/sptests/spintrcritical23/init.c b/testsuites/sptests/spintrcritical23/init.c
index f71de71..019446d 100644
--- a/testsuites/sptests/spintrcritical23/init.c
+++ b/testsuites/sptests/spintrcritical23/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <intrcritical.h>
diff --git a/testsuites/sptests/spintrcritical24/init.c b/testsuites/sptests/spintrcritical24/init.c
index 8f60c1c..6303f9e 100644
--- a/testsuites/sptests/spintrcritical24/init.c
+++ b/testsuites/sptests/spintrcritical24/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/testsuites/sptests/splinkersets01/init.c b/testsuites/sptests/splinkersets01/init.c
index 4e19c6e..90d44d6 100644
--- a/testsuites/sptests/splinkersets01/init.c
+++ b/testsuites/sptests/splinkersets01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include "splinkersets01.h"
diff --git a/testsuites/sptests/spmkdir/init.c b/testsuites/sptests/spmkdir/init.c
index 6b016e3..debe988 100644
--- a/testsuites/sptests/spmkdir/init.c
+++ b/testsuites/sptests/spmkdir/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/testsuites/sptests/spmountmgr01/init.c b/testsuites/sptests/spmountmgr01/init.c
index 2330ca8..798838e 100644
--- a/testsuites/sptests/spmountmgr01/init.c
+++ b/testsuites/sptests/spmountmgr01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <errno.h>
diff --git a/testsuites/sptests/spmrsp01/init.c b/testsuites/sptests/spmrsp01/init.c
index bf144a9..2c01c2c 100644
--- a/testsuites/sptests/spmrsp01/init.c
+++ b/testsuites/sptests/spmrsp01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <rtems/libcsupport.h>
diff --git a/testsuites/sptests/spmsgq_err01/init.c b/testsuites/sptests/spmsgq_err01/init.c
index 2453772..80a0c54 100644
--- a/testsuites/sptests/spmsgq_err01/init.c
+++ b/testsuites/sptests/spmsgq_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
#define MESSAGE_SIZE (sizeof(long) * 4)
diff --git a/testsuites/sptests/spmsgq_err02/init.c b/testsuites/sptests/spmsgq_err02/init.c
index 2ed5057..e64660e 100644
--- a/testsuites/sptests/spmsgq_err02/init.c
+++ b/testsuites/sptests/spmsgq_err02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spmutex01/init.c b/testsuites/sptests/spmutex01/init.c
index b9d4a05..fd490e4 100644
--- a/testsuites/sptests/spmutex01/init.c
+++ b/testsuites/sptests/spmutex01/init.c
@@ -27,6 +27,8 @@
#include <pthread.h>
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SPMUTEX 1";
diff --git a/testsuites/sptests/spnsext01/init.c b/testsuites/sptests/spnsext01/init.c
index 1a10736..4ff2067 100644
--- a/testsuites/sptests/spnsext01/init.c
+++ b/testsuites/sptests/spnsext01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SPNSEXT 1";
diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c
index 620185c..25ea114 100644
--- a/testsuites/sptests/spobjgetnext/init.c
+++ b/testsuites/sptests/spobjgetnext/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sppagesize/init.c b/testsuites/sptests/sppagesize/init.c
index 04d735b..010c1c4 100644
--- a/testsuites/sptests/sppagesize/init.c
+++ b/testsuites/sptests/sppagesize/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems.h>
#include <limits.h>
diff --git a/testsuites/sptests/sppartition_err01/init.c b/testsuites/sptests/sppartition_err01/init.c
index 39ee700..f53ebd2 100644
--- a/testsuites/sptests/sppartition_err01/init.c
+++ b/testsuites/sptests/sppartition_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spport_err01/init.c b/testsuites/sptests/spport_err01/init.c
index 20e6673..a6c95fc 100644
--- a/testsuites/sptests/spport_err01/init.c
+++ b/testsuites/sptests/spport_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c
index 0f5c2a7..3d9b001 100644
--- a/testsuites/sptests/spprintk/init.c
+++ b/testsuites/sptests/spprintk/init.c
@@ -22,6 +22,8 @@
#undef RTEMS_PRINTFLIKE
#define RTEMS_PRINTFLIKE(_a, _b)
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include <tmacros.h>
diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c
index 88cf5e0..509d05f 100644
--- a/testsuites/sptests/spprivenv01/init.c
+++ b/testsuites/sptests/spprivenv01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <rtems/libio_.h>
diff --git a/testsuites/sptests/spprofiling01/init.c b/testsuites/sptests/spprofiling01/init.c
index 60f6bd5..5e7e741 100644
--- a/testsuites/sptests/spprofiling01/init.c
+++ b/testsuites/sptests/spprofiling01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/profiling.h>
#include <rtems/bspIo.h>
#include <rtems.h>
diff --git a/testsuites/sptests/spqreslib/init.c b/testsuites/sptests/spqreslib/init.c
index d00b623..2db540c 100644
--- a/testsuites/sptests/spqreslib/init.c
+++ b/testsuites/sptests/spqreslib/init.c
@@ -16,6 +16,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spratemon_err01/init.c b/testsuites/sptests/spratemon_err01/init.c
index ccc2361..92bf1f7 100644
--- a/testsuites/sptests/spratemon_err01/init.c
+++ b/testsuites/sptests/spratemon_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c
index 746b36e..6cb6ea0 100644
--- a/testsuites/sptests/sprbtree01/init.c
+++ b/testsuites/sptests/sprbtree01/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/rbtree.h>
#include <rtems/score/rbtreeimpl.h>
diff --git a/testsuites/sptests/spregion_err01/init.c b/testsuites/sptests/spregion_err01/init.c
index 6dd8db6..27fc326 100644
--- a/testsuites/sptests/spregion_err01/init.c
+++ b/testsuites/sptests/spregion_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sprmsched01/init.c b/testsuites/sptests/sprmsched01/init.c
index f806605..2bdc44d 100644
--- a/testsuites/sptests/sprmsched01/init.c
+++ b/testsuites/sptests/sprmsched01/init.c
@@ -31,6 +31,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/cpuuse.h>
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sprmsched02/init.c b/testsuites/sptests/sprmsched02/init.c
index 4ee58ab..235e916 100644
--- a/testsuites/sptests/sprmsched02/init.c
+++ b/testsuites/sptests/sprmsched02/init.c
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/cpuuse.h>
#include <tmacros.h>
#include <rtems/rtems/ratemonimpl.h>
diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c
index 9840a3e..0fc1a89 100644
--- a/testsuites/sptests/spscheduler01/init.c
+++ b/testsuites/sptests/spscheduler01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <rtems/libcsupport.h>
diff --git a/testsuites/sptests/spsem01/init.c b/testsuites/sptests/spsem01/init.c
index 924f4c0..e0a7b93 100644
--- a/testsuites/sptests/spsem01/init.c
+++ b/testsuites/sptests/spsem01/init.c
@@ -6,6 +6,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#include <rtems.h>
#include <stdio.h>
diff --git a/testsuites/sptests/spsem02/init.c b/testsuites/sptests/spsem02/init.c
index d5fb47b..f41f1ef 100644
--- a/testsuites/sptests/spsem02/init.c
+++ b/testsuites/sptests/spsem02/init.c
@@ -6,6 +6,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#include <rtems.h>
#include <stdio.h>
diff --git a/testsuites/sptests/spsem03/init.c b/testsuites/sptests/spsem03/init.c
index 859f996..90f116e 100644
--- a/testsuites/sptests/spsem03/init.c
+++ b/testsuites/sptests/spsem03/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SPSEM 3";
diff --git a/testsuites/sptests/spsem_err01/init.c b/testsuites/sptests/spsem_err01/init.c
index 39a366b..a1ed0e8 100644
--- a/testsuites/sptests/spsem_err01/init.c
+++ b/testsuites/sptests/spsem_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spsem_err02/init.c b/testsuites/sptests/spsem_err02/init.c
index 4c0acb9..48894dd 100644
--- a/testsuites/sptests/spsem_err02/init.c
+++ b/testsuites/sptests/spsem_err02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spsignal_err01/init.c b/testsuites/sptests/spsignal_err01/init.c
index 6f8cd3e..6a8e6d0 100644
--- a/testsuites/sptests/spsignal_err01/init.c
+++ b/testsuites/sptests/spsignal_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spsimplesched01/init.c b/testsuites/sptests/spsimplesched01/init.c
index 6bac9c3..87d8010 100644
--- a/testsuites/sptests/spsimplesched01/init.c
+++ b/testsuites/sptests/spsimplesched01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SPSIMPLESCHED 1";
diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c
index 884a3ab..4e78ab5 100644
--- a/testsuites/sptests/spsimplesched02/init.c
+++ b/testsuites/sptests/spsimplesched02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems/score/threadimpl.h>
diff --git a/testsuites/sptests/spsimplesched03/init.c b/testsuites/sptests/spsimplesched03/init.c
index 2f352af..e077364 100644
--- a/testsuites/sptests/spsimplesched03/init.c
+++ b/testsuites/sptests/spsimplesched03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SPSIMPLESCHED 3";
diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c
index c26ba06..569594c 100644
--- a/testsuites/sptests/spsize/init.c
+++ b/testsuites/sptests/spsize/init.c
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spstdthreads01/init.c b/testsuites/sptests/spstdthreads01/init.c
index 4a9953c..9f147da 100644
--- a/testsuites/sptests/spstdthreads01/init.c
+++ b/testsuites/sptests/spstdthreads01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <threads.h>
diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c
index 4a26fdb..9df4509 100644
--- a/testsuites/sptests/spstkalloc/init.c
+++ b/testsuites/sptests/spstkalloc/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SPSTKALLOC";
diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c
index ae78b41..cd818f2 100644
--- a/testsuites/sptests/spstkalloc02/init.c
+++ b/testsuites/sptests/spstkalloc02/init.c
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
const char rtems_test_name[] = "SPSTKALLOC 2";
diff --git a/testsuites/sptests/spsysinit01/init.c b/testsuites/sptests/spsysinit01/init.c
index f3e0e3f..80b5065 100644
--- a/testsuites/sptests/spsysinit01/init.c
+++ b/testsuites/sptests/spsysinit01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c
index 815579a..63d18dc 100644
--- a/testsuites/sptests/spsyslock01/init.c
+++ b/testsuites/sptests/spsyslock01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/lock.h>
diff --git a/testsuites/sptests/sptask_err01/init.c b/testsuites/sptests/sptask_err01/init.c
index b57e751..52e6010 100644
--- a/testsuites/sptests/sptask_err01/init.c
+++ b/testsuites/sptests/sptask_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sptask_err02/init.c b/testsuites/sptests/sptask_err02/init.c
index dfdaf39..8468792 100644
--- a/testsuites/sptests/sptask_err02/init.c
+++ b/testsuites/sptests/sptask_err02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sptask_err03/init.c b/testsuites/sptests/sptask_err03/init.c
index d28a601..203bb1d 100644
--- a/testsuites/sptests/sptask_err03/init.c
+++ b/testsuites/sptests/sptask_err03/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sptask_err04/init.c b/testsuites/sptests/sptask_err04/init.c
index c9af611..a9e4ef7 100644
--- a/testsuites/sptests/sptask_err04/init.c
+++ b/testsuites/sptests/sptask_err04/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/sptasknopreempt01/init.c b/testsuites/sptests/sptasknopreempt01/init.c
index 4bd49b1..159e21b 100644
--- a/testsuites/sptests/sptasknopreempt01/init.c
+++ b/testsuites/sptests/sptasknopreempt01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SPTASKNOPREEMPT 1";
diff --git a/testsuites/sptests/spthreadlife01/init.c b/testsuites/sptests/spthreadlife01/init.c
index 8bf26b9..04712c9 100644
--- a/testsuites/sptests/spthreadlife01/init.c
+++ b/testsuites/sptests/spthreadlife01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems.h>
#include <rtems/libcsupport.h>
diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c
index 0b30754..13fb36c 100644
--- a/testsuites/sptests/spthreadq01/init.c
+++ b/testsuites/sptests/spthreadq01/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <rtems.h>
diff --git a/testsuites/sptests/sptimecounter01/init.c b/testsuites/sptests/sptimecounter01/init.c
index 179590d..d5e7e7a 100644
--- a/testsuites/sptests/sptimecounter01/init.c
+++ b/testsuites/sptests/sptimecounter01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define TESTS_USE_PRINTK
#include "tmacros.h"
diff --git a/testsuites/sptests/sptimecounter02/init.c b/testsuites/sptests/sptimecounter02/init.c
index 4f8de6a..3d24ff4 100644
--- a/testsuites/sptests/sptimecounter02/init.c
+++ b/testsuites/sptests/sptimecounter02/init.c
@@ -20,6 +20,8 @@
#define _KERNEL
+#define TEST_INIT
+
#include <sys/time.h>
#include <sys/timetc.h>
diff --git a/testsuites/sptests/sptimecounter03/init.c b/testsuites/sptests/sptimecounter03/init.c
index 3b57d95..d6303ba 100644
--- a/testsuites/sptests/sptimecounter03/init.c
+++ b/testsuites/sptests/sptimecounter03/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/test.h>
#include <rtems/bsd.h>
diff --git a/testsuites/sptests/sptimecounter04/init.c b/testsuites/sptests/sptimecounter04/init.c
index 72f2a13..481f556 100644
--- a/testsuites/sptests/sptimecounter04/init.c
+++ b/testsuites/sptests/sptimecounter04/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <time.h>
#include <rtems.h>
#include <rtems/test.h>
diff --git a/testsuites/sptests/sptimer_err01/init.c b/testsuites/sptests/sptimer_err01/init.c
index 35a6d7a..1350bc9 100644
--- a/testsuites/sptests/sptimer_err01/init.c
+++ b/testsuites/sptests/sptimer_err01/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sptimer_err02/init.c b/testsuites/sptests/sptimer_err02/init.c
index ad25a16..a385ab9 100644
--- a/testsuites/sptests/sptimer_err02/init.c
+++ b/testsuites/sptests/sptimer_err02/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
diff --git a/testsuites/sptests/sptimerserver01/init.c b/testsuites/sptests/sptimerserver01/init.c
index 88f1fb3..0690012 100644
--- a/testsuites/sptests/sptimerserver01/init.c
+++ b/testsuites/sptests/sptimerserver01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
const char rtems_test_name[] = "SPTIMERSERVER 1";
diff --git a/testsuites/sptests/sptimespec01/init.c b/testsuites/sptests/sptimespec01/init.c
index 945bd21..7115b8b 100644
--- a/testsuites/sptests/sptimespec01/init.c
+++ b/testsuites/sptests/sptimespec01/init.c
@@ -10,6 +10,8 @@
* http://www.rtems.org/license/LICENSE.
*/
+#define TEST_INIT
+
#include <tmacros.h>
#include "test_support.h"
#include <rtems/timespec.h>
diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c
index ba662aa..9bbf976 100644
--- a/testsuites/sptests/sptls01/init.c
+++ b/testsuites/sptests/sptls01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/sptls02/init.cc b/testsuites/sptests/sptls02/init.cc
index 86e3158..fbdf53e 100644
--- a/testsuites/sptests/sptls02/init.cc
+++ b/testsuites/sptests/sptls02/init.cc
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <stdio.h>
#include <stdlib.h>
diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c
index 1487595..71f2bea 100644
--- a/testsuites/sptests/sptls03/init.c
+++ b/testsuites/sptests/sptls03/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/score/thread.h>
#include "tmacros.h"
diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c
index 3b08fb5..6e5e155 100644
--- a/testsuites/sptests/spwatchdog/init.c
+++ b/testsuites/sptests/spwatchdog/init.c
@@ -19,6 +19,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c
index 5131ebc..8386daa 100644
--- a/testsuites/sptests/spwkspace/init.c
+++ b/testsuites/sptests/spwkspace/init.c
@@ -13,6 +13,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <tmacros.h>
#include <string.h>
diff --git a/testsuites/support/include/buffer_test_io.h b/testsuites/support/include/buffer_test_io.h
index 464d578..dff312d 100644
--- a/testsuites/support/include/buffer_test_io.h
+++ b/testsuites/support/include/buffer_test_io.h
@@ -13,14 +13,6 @@ extern "C" {
#endif
/*
- * Uncomment this to get buffered test output. When commented out,
- * test output behaves as it always has and is printed using stdio.
- */
-
-/* #define TESTS_BUFFER_OUTPUT */
-/* #define TESTS_USE_PRINTK */
-
-/*
* Test states. No state string is an expected pass.
*/
#if (TEST_STATE_EXPECTED_FAIL && TEST_STATE_USER_INPUT) || \
@@ -78,46 +70,62 @@ extern "C" {
} while (0)
#if defined(TEST_STATE_STRING)
- #define TEST_BEGIN() printk(TEST_BEGIN_STRING); printk(TEST_STATE_STRING);
+ #define TEST_BEGIN() \
+ do { \
+ printk("\n"); \
+ printk(TEST_BEGIN_STRING); \
+ printk(TEST_STATE_STRING); \
+ } while (0)
#else
- #define TEST_BEGIN() printk(TEST_BEGIN_STRING)
+ #define TEST_BEGIN() \
+ do { \
+ printk("\n"); \
+ printk(TEST_BEGIN_STRING); \
+ } while (0)
#endif
- #define TEST_END() printk(TEST_END_STRING)
+ #define TEST_END() \
+ do { \
+ printk( "\n" ); \
+ printk(TEST_END_STRING); \
+ printk( "\n" ); \
+ } while (0)
/*
* BUFFER TEST OUTPUT
*/
-#elif defined(TESTS_BUFFER_OUTPUT)
+#else
#include <stdio.h>
#include <stdlib.h>
+ #define TEST_PRINT__FORMAT(_fmtpos, _appos) \
+ __attribute__((__format__(__printf__, _fmtpos, _appos)))
+
#define _TEST_OUTPUT_BUFFER_SIZE 2048
+
extern char _test_output_buffer[_TEST_OUTPUT_BUFFER_SIZE];
- void _test_output_append(char *);
+
+ void _test_output_printf(const char *, ...) TEST_PRINT__FORMAT(1, 2);
+ void _test_output_append(const char *);
void _test_output_flush(void);
#define rtems_test_exit(_s) \
do { \
+ fflush(stdout); \
+ fflush(stderr); \
_test_output_flush(); \
exit(_s); \
} while (0)
#undef printf
- #define printf(...) \
- do { \
- char _buffer[128]; \
- sprintf( _buffer, __VA_ARGS__); \
- _test_output_append( _buffer ); \
- } while (0)
+ #define printf(...) _test_output_printf( __VA_ARGS__ )
#undef puts
#define puts(_string) \
do { \
- char _buffer[128]; \
- sprintf( _buffer, "%s\n", _string ); \
- _test_output_append( _buffer ); \
+ _test_output_append( _string ); \
+ _test_output_append( "\n" ); \
} while (0)
#undef putchar
@@ -132,132 +140,78 @@ extern "C" {
/* we write to stderr when there is a pause() */
#define FLUSH_OUTPUT() _test_output_flush()
- #if defined(TEST_INIT) || defined(CONFIGURE_INIT)
+ #if defined(TEST_STATE_STRING)
+ #define TEST_BEGIN() \
+ do { \
+ _test_output_append( "\n" ); \
+ _test_output_printf(TEST_BEGIN_STRING); \
+ _test_output_append(TEST_STATE_STRING); \
+ _test_output_append( "\n" ); \
+ } while (0)
+ #else
+ #define TEST_BEGIN() \
+ do { \
+ _test_output_append( "\n" ); \
+ _test_output_printf(TEST_BEGIN_STRING); \
+ _test_output_append( "\n" ); \
+ } while (0)
+ #endif
+
+ #define TEST_END() \
+ do { \
+ _test_output_append( "\n" ); \
+ _test_output_printf(TEST_END_STRING); \
+ _test_output_append( "\n" ); \
+ } while (0)
+
+ /*
+ * Inline the tests this way because adding the code to the support directory
+ * requires all the makefile files to changed.
+ */
+ #if defined(TEST_INIT)
char _test_output_buffer[_TEST_OUTPUT_BUFFER_SIZE];
int _test_output_buffer_index = 0;
- void _test_output_append(char *_buffer)
+ void _test_output_printf(const char* format, ...)
{
- char *p;
-
- for ( p=_buffer ; *p ; p++ ) {
- _test_output_buffer[_test_output_buffer_index++] = *p;
- _test_output_buffer[_test_output_buffer_index] = '\0';
- #if 0
- if ( *p == '\n' ) {
- fprintf( stderr, "BUFFER -- %s", _test_output_buffer );
- _test_output_buffer_index = 0;
- _test_output_buffer[0] = '\0';
- }
- #endif
- if ( _test_output_buffer_index >= (_TEST_OUTPUT_BUFFER_SIZE - 80) )
- _test_output_flush();
- }
+ va_list args;
+ char* in;
+ size_t size;
+ bool lf;
+ va_start(args, format);
+ in = _test_output_buffer + _test_output_buffer_index;
+ size = vsniprintf(in,
+ _TEST_OUTPUT_BUFFER_SIZE - _test_output_buffer_index,
+ format, args);
+ lf = memchr(in, '\n', size);
+ _test_output_buffer_index += size;
+ if ( lf || _test_output_buffer_index >= (_TEST_OUTPUT_BUFFER_SIZE - 80) )
+ _test_output_flush();
+ va_end(args);
}
- #include <termios.h>
- #include <unistd.h>
+ void _test_output_append(const char *_buffer)
+ {
+ char* in;
+ size_t size;
+ bool lf;
+ in = _test_output_buffer + _test_output_buffer_index;
+ size = strlcpy(in, _buffer, _TEST_OUTPUT_BUFFER_SIZE - _test_output_buffer_index);
+ lf = memchr(in, '\n', size);
+ if ( lf || _test_output_buffer_index >= (_TEST_OUTPUT_BUFFER_SIZE - 80) )
+ _test_output_flush();
+ }
void _test_output_flush(void)
{
- fprintf( stderr, "%s", _test_output_buffer );
+ printk( _test_output_buffer );
_test_output_buffer_index = 0;
- tcdrain( 2 );
+ _test_output_buffer[0] = '\0';
}
- #endif
-
-#elif defined(TESTS_USE_PRINTF)
-
- #include <stdio.h>
- #include <stdlib.h>
-
- #define rtems_test_exit(_s) \
- do { \
- exit(_s); \
- } while (0)
-
- #define FLUSH_OUTPUT() \
- do { \
- fflush(stdout); \
- } while (0)
-
- #if defined(TEST_STATE_STRING)
- #define TEST_BEGIN() printf(TEST_BEGIN_STRING); printf(TEST_STATE_STRING)
- #else
- #define TEST_BEGIN() printf(TEST_BEGIN_STRING)
#endif
- #define TEST_END() printf(TEST_END_STRING)
-
-/*
- * USE IPRINT
- */
-#else
-
- #include <stdio.h>
- #include <stdlib.h>
-
- /* do not use iprintf if strict ansi mode */
- #if defined(_NEWLIB_VERSION) && !defined(__STRICT_ANSI__)
- #define asprintf asiprintf
- #define asnprintf asniprintf
- #define dprintf diprintf
- #define fprintf fiprintf
- #define sprintf siprintf
- #define snprintf sniprintf
- #define vasprintf vasiprintf
- #define vasnprintf vasniprintf
- #define vdprintf vdiprintf
- #define vfprintf vfiprintf
- #define vprintf viprintf
- #define vsprintf vsiprintf
- #define vsnprintf vsniprintf
-
- #undef printf
- #define printf(...) \
- do { \
- fiprintf( stderr, __VA_ARGS__ ); \
- } while (0)
- #else
- #undef printf
- #define printf(...) \
- do { \
- fprintf( stderr, __VA_ARGS__ ); \
- } while (0)
- #endif
-
- #undef puts
- #define puts(_s) \
- do { \
- printf( "%s\n", _s ); \
- } while (0)
-
- #undef putchar
- #define putchar(_c) \
- do { \
- printf( "%c", _c ); \
- } while (0)
-
- #define rtems_test_exit(_s) \
- do { \
- exit(_s); \
- } while (0)
-
- #define FLUSH_OUTPUT() \
- do { \
- fflush(stdout); \
- } while (0)
-
- #if defined(TEST_STATE_STRING)
- #define TEST_BEGIN() fiprintf(stderr, TEST_BEGIN_STRING); fiprintf(stderr, TEST_STATE_STRING)
- #else
- #define TEST_BEGIN() fiprintf(stderr, TEST_BEGIN_STRING)
- #endif
-
- #define TEST_END() fiprintf( stderr, TEST_END_STRING)
-
#endif
#ifdef __cplusplus
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index 2b267ca..e041866 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -37,7 +37,7 @@ extern "C" {
#define FOREVER 1 /* infinite loop */
-#ifdef CONFIGURE_INIT
+#ifdef TEST_INIT
#define TEST_EXTERN
#else
#define TEST_EXTERN extern
diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 98f9f05..84aa206 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index b376150..827baba 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index 42126ac..f364292 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 7be2afd..8df1010 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index d1485e2..19b94e2 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index a784f9c..3f68d5f 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index a14f1a8..f79dfe5 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index a86322c..acf65d4 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index ff81571..3d8ab19 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index f7e4d27..42615ab 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index 01beb79..5ba13f7 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index dcd84c6..ea499c5 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index eac1b8b..00a5a0e 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 8a7a5d7..69faff3 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index c3afd68..d91f67d 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index c4aa255..0c63b26 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index 15c51a1..123d165 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index ca607f5..9267ff9 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index 8f07df1..cf909fb 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index ed9c204..b30cb82 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index d7d6163..464ac4b 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index eb45486..999963a 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 249d627..5e9dc5c 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 21de600..1360ba9 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index 7777b51..c9f781b 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 9d157e9..e0b09b8 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include <rtems.h>
#include "system.h"
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index c89c095..7f50030 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -17,6 +17,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index f157209..ec09c0b 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index ef889cb..5176a06 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c
index 022cdaf..d7ff99a 100644
--- a/testsuites/tmtests/tm30/init.c
+++ b/testsuites/tmtests/tm30/init.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <bsp.h>
#include <coverhd.h>
#include <tmacros.h>
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index e13181f..6476de5 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -12,6 +12,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tmcontext01/init.c b/testsuites/tmtests/tmcontext01/init.c
index 2651847..9b76921 100644
--- a/testsuites/tmtests/tmcontext01/init.c
+++ b/testsuites/tmtests/tmcontext01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include <rtems/counter.h>
#include <rtems.h>
diff --git a/testsuites/tmtests/tmfine01/init.c b/testsuites/tmtests/tmfine01/init.c
index 31843ce..80000a7 100644
--- a/testsuites/tmtests/tmfine01/init.c
+++ b/testsuites/tmtests/tmfine01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <sys/lock.h>
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index bc73f8b..0137bee 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -11,6 +11,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#define CONFIGURE_INIT
#include "system.h"
diff --git a/testsuites/tmtests/tmtimer01/init.c b/testsuites/tmtests/tmtimer01/init.c
index 6b94304..2189707 100644
--- a/testsuites/tmtests/tmtimer01/init.c
+++ b/testsuites/tmtests/tmtimer01/init.c
@@ -16,6 +16,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#include <stdio.h>
More information about the vc
mailing list