From 98c6d501452f02264ff148a1b8479e420c81562d Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 19 Oct 2017 16:39:16 +1100
Subject: 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/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 ++
 182 files changed, 363 insertions(+), 3 deletions(-)

(limited to 'testsuites/sptests')

diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index cf95c4a9f6..f02d277142 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 4d73804dbb..a726a02461 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 d7ff317497..ffd330e77f 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 1f02eb666d..a5b6d8038a 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 e7bc79393d..31925795e8 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 7d95ee9775..52db2eaa03 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 e8379ae8f9..60e7a41137 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 d5b606d12a..bfae5eb487 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 2364c70287..88c1445627 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 ee3f2e82e7..5b52ba9760 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 0b9200440b..fb7a5f8d07 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 ffa2d1285d..ed244bcb1e 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 b0cedc264e..5e3ef2360b 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 dcf8f95ace..e867a913d1 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 3b8543b7c0..f9e5d0a97b 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 4f7cba8142..0ee99c105e 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 5f39794318..4c9448fcee 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 f1b75c406a..9d8fea373d 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 932352444f..0ffd75a32c 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 da7c23ef5d..28c8cb1375 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 0eb453c974..9a2fec5b72 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 23956e6c30..78e415d74e 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 e0ee2f97a0..a6b52c6ec6 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 b0e7f15628..8c50c3a9e7 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 e744e5cfb6..ba4f65b932 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 0ac7157e7c..6df979c352 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 bb4630d2de..a5459140f4 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 e65fbe3d45..6f68275626 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 616e4cd2a4..deb1873843 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 020ec255be..34a96519cc 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 71cd46c001..86068a35c9 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 579cd65e11..d45d860899 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 5000f693d3..d2bdd65ace 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 8848348758..69f3ca399b 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 db270caf41..d49ee74248 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 08d6285d3d..13e9a33cd3 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 d77d5d2a1c..49c74c2e6d 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 44e8d45a03..b923d9f194 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 04b855b352..e08019aea2 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 f4be2a5ca2..9260b7af39 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 a0025353ec..56c3985995 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 5b11eadda5..39b2f50392 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 b8b43b4df4..20b6119fc2 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 55653e0b3a..d66108aa2e 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 5d28303f19..2c2b637c38 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 53d8245c23..a6bfa9da19 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 64db98e11f..0edbc4a558 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 58a7be7501..abc5a75745 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 1e8f9e5ceb..51fa0064ab 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 f7629a5d11..3069e24d4e 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 3b0d4589a9..e39999c6b6 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 ee06e84d76..ebc1264d4d 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 c0ce3c007c..c383420126 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 3003c2fa9c..8e0be12c52 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 b61120320e..b5fd843586 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 4120761acd..100b5408fb 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 b015ac1244..baa8f2cc4b 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 7df64df0d6..cbe6c92bef 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 6f1c837d84..a4d66391a0 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 153a9f25f4..76961f71f9 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 09c64b9d0b..f1fed6e4f0 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 154e836f41..fe05da224f 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 5642203b74..9aa8dd2091 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 c604c2de06..83f93cde26 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 721e3b91a1..eafdde5c40 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 eff6ba72d0..999a2e8626 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 5e2c8ab91d..b8561e0b22 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 8db5024fc5..261bf8bad2 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 346c67662c..a1f9e5647c 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 e699e766c6..667e4616f2 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 daf55f1ede..f414080155 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 c6ccacc3bc..f645209194 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 ba3873ac0e..959cd40e6c 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 b5fa6c4a7a..e034fcc423 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 52fa860b93..28cf8c00c3 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 be85bce85c..eb8a808d2a 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 acaf7a723d..3d92de2d68 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 55549151b8..7b219054ca 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 8fa7ea087d..aa5f91d2d1 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 087c8d4a05..7e02e5e277 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 7912ab8b21..d87da5c2c3 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 e093c50618..6d2adce685 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 a80acec7fe..31fdb4bd62 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 92f2e15c72..1a582fa615 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 b13be4913d..39518e279b 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 04fc5ca79c..303cdebc80 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 aa2798c251..0e7f54dbf0 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 0c2425a37c..6163f9a43f 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 bcaced994c..42b2b15cb6 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 1f64bc4649..4b0eb9f0a6 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 717deabeab..bb82b1d069 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 9d80fe5f0e..4e5a311132 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 b13960e16d..1a1d33d0f4 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 7fb2429bc2..6a02b85384 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 91d6ecfc18..1473ea67c9 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 cf02855f89..e94419f9e9 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 7d204389b8..ebfdb0bce9 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 1c4e1cb1c8..d6b87da223 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 0f147783df..e276205e20 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 f9b2ed37c1..b6de0d6401 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 0e0f67815b..3c8dc480ee 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 64724016a3..671e6ff5fe 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 5aa48004ec..7d940951dd 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 157b45c786..b7966d12f1 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 ab3ed66f96..522a45b428 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 6efcd93762..e741a9b058 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 114abebc20..d17bb9a105 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 21e42e358b..5dc587aaff 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 2ed4c955d8..b1a34680a4 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 9bc39bf4dc..afc195e7ed 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 b7cfee42f8..255f827484 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 423e4b5fa7..9015810a35 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 1a7ed2d2e5..efe30c2c9e 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 87c1c1aab3..bb495f6073 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 f7e372a46b..b22b93849a 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 2a3f83a315..ee37bacfe7 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 7069938191..cd278542df 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 72e4832769..5c8e46ff0a 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 3657c0607f..c34828ac45 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 f621d21280..fa2ee6c120 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 1697df426a..8c1f3760ac 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 faa48f717c..d5cf8e1aab 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 7412bdef7e..c95929e2e8 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 f71de71099..019446d029 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 8f60c1ce70..6303f9e91c 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 4e19c6e846..90d44d6afb 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 6b016e3f1c..debe9881ef 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 2330ca82ba..798838ecba 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 bf144a9775..2c01c2c91e 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 24537725dc..80a0c54f7a 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 2ed5057007..e64660ebe2 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 b9d4a05f73..fd490e47b0 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 1a10736611..4ff2067592 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 620185c1f3..25ea1145e6 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 04d735b84b..010c1c4a5d 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 39ee700daa..f53ebd2955 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 20e66737b9..a6c95fca7d 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 0f5c2a7e24..3d9b00149f 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 88cf5e07af..509d05ff19 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 60f6bd50ed..5e7e7411d3 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 d00b623043..2db540c9bc 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 ccc2361295..92bf1f70b9 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 746b36ee3a..6cb6ea0fdf 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 6dd8db63cf..27fc3266a9 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 f806605ec8..2bdc44db6c 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 4ee58ab5ec..235e91636b 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 9840a3ebc4..0fc1a891fe 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 924f4c052d..e0a7b93db4 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 d5fb47b255..f41f1ef74a 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 859f996629..90f116ee43 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 39a366b41a..a1ed0e851f 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 4c0acb9039..48894dd5d8 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 6f8cd3ef60..6a8e6d0692 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 6bac9c367a..87d801097c 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 884a3abf6f..4e78ab5eb7 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 2f352af88b..e0773647dc 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 c26ba06c70..569594ce6d 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 4a9953cf8a..9f147daca6 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 4a26fdb9a6..9df45095f1 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 ae78b41480..cd818f2020 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 f3e0e3f6a5..80b5065c06 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 815579a0d9..63d18dca1e 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 b57e751aa6..52e601017a 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 dfdaf396d0..84687928ae 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 d28a601418..203bb1da4c 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 c9af611d27..a9e4ef766d 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 4bd49b1d82..159e21bc0e 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 8bf26b9b72..04712c9f45 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 0b307542cf..13fb36c76f 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 179590d538..d5e7e7a73c 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 4f8de6a034..3d24ff4a2e 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 3b57d95a12..d6303ba62f 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 72f2a138d5..481f556520 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 35a6d7a1dd..1350bc9df3 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 ad25a16926..a385ab98fd 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 88f1fb3cf3..0690012f01 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 945bd217ed..7115b8babb 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 ba662aa832..9bbf97693d 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 86e3158dc9..fbdf53ec70 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 1487595981..71f2bea799 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 3b08fb57e5..6e5e155a00 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 5131ebc189..8386daad2d 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>
-- 
cgit v1.2.3